diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-03 16:37:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-03 16:37:44 +0000 |
| commit | 8243c64b9ef5d535fa967d6fa62645440eed4fb8 (patch) | |
| tree | ce1bea3f6399fb964c937d6b1b7fe449c27071b1 /solenv/inc/unxsogs.mk | |
| parent | 26e3276bdaa3222d2b971aaafcb1babb7e58f5b2 (diff) | |
INTEGRATION: CWS solarisgcc02 (1.7.172); FILE MERGED
2005/02/28 21:00:27 pjanik 1.7.172.2: RESYNC: (1.7-1.8); FILE MERGED
2005/02/15 20:38:08 pjanik 1.7.172.1: #i42562#: Add visibility support, misc changes.
Patch contributed by Taniguchi Yasuaki (JCA).
Diffstat (limited to 'solenv/inc/unxsogs.mk')
| -rw-r--r-- | solenv/inc/unxsogs.mk | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk index ff43645bd..0413ae5aa 100644 --- a/solenv/inc/unxsogs.mk +++ b/solenv/inc/unxsogs.mk @@ -2,9 +2,9 @@ # # $RCSfile: unxsogs.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hr $ $Date: 2005-02-11 15:31:55 $ +# last change: $Author: kz $ $Date: 2005-03-03 17:37:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -60,19 +60,16 @@ # #************************************************************************* -# mk file fuer unxsogs -ASM= -AFLAGS= +# mk file for unxsogs +ASM=/usr/ccs/bin/as +AFLAGS=-P SOLAR_JAVA=TRUE JAVAFLAGSDEBUG=-g # _PTHREADS is needed for the stl -CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=400 - -CVER=C295 -CDEFS+=-DCVER=$(CVER) -CDEFS+=-D_USE_NAMESPACE=1 +CDEFS+=-D_PTHREADS -D_REENTRANT -DSYSV -DSUN -DSUN4 -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=400 -D_USE_NAMESPACE=1 + .IF "$(SOLAR_JAVA)"!="" JAVADEF=-DSOLAR_JAVA @@ -93,7 +90,6 @@ CFLAGS_NO_EXCEPTIONS=-fno-exceptions CFLAGSCXX= -pipe PICSWITCH:=-fPIC -#STDOBJVCL=$(L)$/salmain.o CFLAGSOBJGUIST= CFLAGSOBJCUIST= CFLAGSOBJGUIMT= @@ -104,7 +100,7 @@ CFLAGSPROF= CFLAGSDEBUG=-g CFLAGSDBGUTIL= CFLAGSOPT=-O2 -CFLAGSNOOPT=-O +CFLAGSNOOPT= CFLAGSOUTOBJ=-o STATIC = -Wl,-Bstatic @@ -123,22 +119,30 @@ LINKFLAGSOPT= LINKVERSIONMAPFLAG=-Wl,--version-script +# enable visibility define in "sal/types.h" +.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" +CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE +.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" + # Reihenfolge der libs NICHT egal! STDLIBCPP=-lstdc++ +STDOBJVCL=$(L)$/salmain.o STDOBJGUI= STDSLOGUI= STDOBJCUI= STDSLOCUI= -STDLIBGUIST=-lnsl -lsocket -ldl -lm -STDLIBCUIST=-lnsl -lsocket -ldl -lm -STDLIBGUIMT=-lpthread -ldl -lm -STDLIBCUIMT=-lpthread -ldl -lm +STDLIBGUIST=$(DYNAMIC) -lstdc++ -lm +STDLIBCUIST=$(DYNAMIC) -lstdc++ -lm +STDLIBGUIMT=$(DYNAMIC) -lpthread -lthread -lstdc++ -lm +STDLIBCUIMT=$(DYNAMIC) -lpthread -lthread -lstdc++ -lm # libraries for linking shared libraries -STDSHLGUIMT=-lpthread -lnsl -lsocket -ldl -lm -STDSHLCUIMT=-lpthread -ldl -lm +STDSHLGUIST=$(DYNAMIC) -lstdc++ -lm +STDSHLCUIST=$(DYNAMIC) -lstdc++ -lm +STDSHLGUIMT=$(DYNAMIC) -lpthread -lthread -lstdc++ -lm +STDSHLCUIMT=$(DYNAMIC) -lpthread -lthread -lstdc++ -lm STDLIBGUIST+=-lX11 STDLIBGUIMT+=-lX11 @@ -162,6 +166,6 @@ RCLINK= RCLINKFLAGS= RCSETVERSION= -DLLPOSTFIX=ss +DLLPOSTFIX=sogs DLLPRE=lib DLLPOST=.so |