diff options
| author | Patrick Luby <pluby@openoffice.org> | 2001-02-10 20:33:58 +0000 |
|---|---|---|
| committer | Patrick Luby <pluby@openoffice.org> | 2001-02-10 20:33:58 +0000 |
| commit | f188ae888c9b2ba8fa8bb988822c8194b8eb7cc6 (patch) | |
| tree | 1e3f04b771452fe3dbb5c617eaf792817b6c0a0f /registry | |
| parent | ee9c8683b60ac11f971e52677d5966aaf191306c (diff) | |
Consolidated common Mac OS X static data member initializations into vos project
Diffstat (limited to 'registry')
| -rw-r--r-- | registry/prj/d.lst | 2 | ||||
| -rw-r--r-- | registry/source/makefile.mk | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/registry/prj/d.lst b/registry/prj/d.lst index 6dcd5c955b60..603341fe8857 100644 --- a/registry/prj/d.lst +++ b/registry/prj/d.lst @@ -15,4 +15,4 @@ mkdir: %_DEST%\inc%_EXT%\registry ..\%__SRC%\bin\regview %_DEST%\bin%_EXT%\regview ..\version.mk %_DEST%\inc%_EXT%\registry\version.mk -dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\libreg*.dylib; fi" +dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi" diff --git a/registry/source/makefile.mk b/registry/source/makefile.mk index ed5cb347db2f..b260c1f7d9f8 100644 --- a/registry/source/makefile.mk +++ b/registry/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: svesik $ $Date: 2001-02-02 14:04:43 $ +# last change: $Author: pluby $ $Date: 2001-02-10 21:33:58 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -82,12 +82,6 @@ SLOFILES= \ $(SLO)$/reflread.obj \ $(SLO)$/reflwrit.obj - -# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC" || "$(OS)"=="MACOSX" -SLOFILES+=$(SLO)$/staticmb.obj -.ENDIF - # ------------------------------------------------------------------ .INCLUDE : target.mk |