diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 12:55:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 12:55:43 +0000 |
| commit | 642749076c057d561fa8fa894575afb5ab06ddf6 (patch) | |
| tree | 81ca58ed255aa6bda995c8e59af887b020862449 /solenv/inc/unxmacx.mk | |
| parent | c2c7c3475fe7fd4d2fdd0929954aebbb8cfbc8a6 (diff) | |
INTEGRATION: CWS aquavcl02 (1.18.10); FILE MERGED
2007/07/12 19:29:43 ericb 1.18.10.1: #i79553# modify linking for MacOSX builds (initialy for testtool build)
Diffstat (limited to 'solenv/inc/unxmacx.mk')
| -rw-r--r-- | solenv/inc/unxmacx.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index eaeb45e2a..c79166b7d 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxmacx.mk,v $ # -# $Revision: 1.19 $ +# $Revision: 1.20 $ # -# last change: $Author: hr $ $Date: 2007-08-03 12:28:15 $ +# last change: $Author: hr $ $Date: 2007-08-03 13:55:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -231,14 +231,16 @@ STDSLOCUI= .IF "$(GUIBASE)" == "aqua" STDLIBCUIMT=CPPRUNTIME -lm - STDSHLGUIMT=-lpthread CPPRUNTIME -lm -framework CoreFoundation -framework Carbon + STDLIBGUIMT=-framework Carbon -lpthread CPPRUNTIME -lm + STDSHLCUIMT=-lpthread CPPRUNTIME -lm + STDSHLGUIMT=-framework Carbon -framework CoreFoundation -lpthread CPPRUNTIME -lm PSPLIB=-lpsp .ELSE - STDLIBCUIMT=-lX11 CPPRUNTIME -lm + STDLIBCUIMT= CPPRUNTIME -lm + STDLIBGUIMT=-lX11 -lpthread CPPRUNTIME -lm + STDSHLCUIMT=-lpthread CPPRUNTIME -lm STDSHLGUIMT=-lX11 -lXext -lpthread CPPRUNTIME -lm -framework CoreFoundation .ENDIF -STDLIBGUIMT=-lpthread CPPRUNTIME -lm -STDSHLCUIMT=-lpthread CPPRUNTIME -lm LIBMGR=ar LIBFLAGS=-r |