diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:19:44 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:19:44 +0000 |
| commit | 0c93e271f7e07daa0c6efe3798390419ee4b7ba1 (patch) | |
| tree | 5001a443c177fd2ebffa9fc36aa35106437c3ca4 /solenv/inc/unxlngi6.mk | |
| parent | a8e9f22092f217d80415884a668d91527c04d322 (diff) | |
INTEGRATION: CWS configure22 (1.40.34); FILE MERGED
2007/11/14 21:10:27 rene 1.40.34.2: RESYNC: (1.40-1.41); FILE MERGED
2007/10/15 22:46:22 rene 1.40.34.1: #i79874# STLport5 support for configure
Diffstat (limited to 'solenv/inc/unxlngi6.mk')
| -rw-r--r-- | solenv/inc/unxlngi6.mk | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/solenv/inc/unxlngi6.mk b/solenv/inc/unxlngi6.mk index c20bb26d6d95..81988d7e867d 100644 --- a/solenv/inc/unxlngi6.mk +++ b/solenv/inc/unxlngi6.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxlngi6.mk,v $ # -# $Revision: 1.41 $ +# $Revision: 1.42 $ # -# last change: $Author: vg $ $Date: 2007-10-15 12:41:01 $ +# last change: $Author: kz $ $Date: 2007-12-12 13:19:44 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -45,7 +45,7 @@ JAVAFLAGSDEBUG=-g #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" # _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 +CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) # enable visibility define in "sal/types.h" .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" @@ -212,11 +212,21 @@ STDSHLCUIMT+=-ldl -lpthread -lm LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive .IF "$(USE_STLP_DEBUG)" != "" +.IF "$(STLPORT_VER)" >= "500" +LIBSTLPORT=$(DYNAMIC) -lstlportstlg +LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC) +.ELSE LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC) +.ENDIF .ELSE # "$(USE_STLP_DEBUG)" != "" +.IF "$(STLPORT_VER)" >= "500" +LIBSTLPORT=$(DYNAMIC) -lstlport +LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC) +.ELSE LIBSTLPORT=$(DYNAMIC) -lstlport_gcc LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) +.ENDIF .ENDIF # "$(USE_STLP_DEBUG)" != "" #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) |