summaryrefslogtreecommitdiff
path: root/solenv/inc/unxmacxp.mk
diff options
context:
space:
mode:
authorPatrick Luby <pluby@openoffice.org>2001-03-02 05:16:03 +0000
committerPatrick Luby <pluby@openoffice.org>2001-03-02 05:16:03 +0000
commitb2351891a4411e7cca7ff7d218fb330ff967199e (patch)
tree81412177d9383a6682419415613e4f65d57c1fc9 /solenv/inc/unxmacxp.mk
parent7bef5fd3b67764fa146d3eb8d12210ce971dd170 (diff)
More fine tuning of static data member automation for Mac OS X
Diffstat (limited to 'solenv/inc/unxmacxp.mk')
-rw-r--r--solenv/inc/unxmacxp.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
index 9e27f54a5d7e..0bf30e47bc17 100644
--- a/solenv/inc/unxmacxp.mk
+++ b/solenv/inc/unxmacxp.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: unxmacxp.mk,v $
#
-# $Revision: 1.25 $
+# $Revision: 1.26 $
#
-# last change: $Author: pluby $ $Date: 2001-02-28 23:40:27 $
+# last change: $Author: pluby $ $Date: 2001-03-02 06:16:03 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -124,14 +124,15 @@ CFLAGSNOOPT=
.ENDIF
CFLAGSOUTOBJ=-o
-SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(LB)$/*$(DLLPOST) 2>/dev/null")
+SOLARVERSHLLIBS=$(shell -/bin/sh -c "ls $(SOLARLIBDIR)$/*$(DLLPOST) $(LB)$/*$(DLLPOST) $(MISC)$/*$(DLLPOST) 2>/dev/null")
.IF "$(STLPORT4)"!=""
SOLARVERSHLLIBS+=$(shell -/bin/sh -c "ls $(STLPORT4)$/lib$/*$(DLLPOST) 2>/dev/null")
.ENDIF
LINK=cc
LINKFLAGS=-dynamic -framework System -framework Cocoa -lcc_dynamic -lstdc++ \
- $(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i)
+ $(foreach,i,$(SOLARVERSHLLIBS) -dylib_file @executable_path$/$(i:f):$i) \
+ -L$(MISC)
LINKFLAGSAPPGUI=-Wl,-u,__objcInit
LINKFLAGSSHLGUI=-dynamiclib -install_name '@executable_path$/$(@:f)' \
-Wl,-U,___progname -Wl,-U,_environ