diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-27 17:02:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-08-27 17:02:09 +0000 |
| commit | 1316ac547a6ea858d1840a6fa598382736227066 (patch) | |
| tree | 72abdb18451f72ebc8da8d03495e2bee042b1edd /vcl/util | |
| parent | 74438689c7f156f8979109abd7f195ea5318132b (diff) | |
#101685#,#i6886#: merge OOO_STABLE_1_PORTS (1.33.6.1-1.33.6.1.2.1) -> HEAD
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 4e17bee4f581..a09424b8dbbb 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.38 $ +# $Revision: 1.39 $ # -# last change: $Author: hdu $ $Date: 2002-08-27 11:27:17 $ +# last change: $Author: hr $ $Date: 2002-08-27 18:02:09 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -268,6 +268,19 @@ LINKFLAGSSHL += /ENTRY:LibMain@12 .IF "$(GUI)"=="UNX" +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS += -ldl -lstdc++ -lstlport_gcc +.ENDIF + +.IF "$(GUIBASE)"=="aqua" +SHL1STDLIBS += -framework Cocoa +.ENDIF + +.IF "$(GUIBASE)"=="unx" +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS += -lXext +.ENDIF + # Solaris .IF "$(OS)"=="SOLARIS" @@ -277,21 +290,15 @@ SHL1STDLIBS += -lXp Xext -lSM -lICE -lX11 SHL1STDLIBS += -lXext -lSM -lICE -lX11 .ENDIF # "$(USE_XPRINT)" == "TRUE" -# MacOSX -.ELSE # "$(OS)"=="SOLARIS" -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS += -framework Cocoa - # Others -.ELSE # "$(OS)"=="MACOSX" - +.ELSE # "$(OS)"=="SOLARIS" .IF "$(USE_XPRINT)" == "TRUE" SHL1STDLIBS += -lXp -lXext -lSM -lICE -lX11 .ELSE SHL1STDLIBS += -lXext -lSM -lICE -lX11 .ENDIF # "$(USE_XPRINT)" == "TRUE" -.ENDIF # "$(OS)"=="MACOSX" .ENDIF # "$(OS)"=="SOLARIS" +.ENDIF # "$(GUIBASE)"=="unx" .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" SHL1STDLIBS += -laudio |