strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS configure22 (1.43.236); FILE MERGED

Browse source 
2007/11/14 21:10:06 rene 1.43.236.2: RESYNC: (1.43-1.44); FILE MERGED
2007/10/15 22:46:22 rene 1.43.236.1: #i79874# STLport5 support for configure
This commit is contained in:
Kurt Zenker 2007-12-12 12:19:31 +00:00
parent 2866a2e513
commit a8e9f22092
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
solenv/inc/unxlngi4.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: unxlngi4.mk,v $
#
# $Revision: 1.44 $
# $Revision: 1.45 $
#
# last change: $Author: vg $ $Date: 2007-10-15 12:40:36 $
# last change: $Author: kz $ $Date: 2007-12-12 13:19:31 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -44,7 +44,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"
@ -189,8 +189,13 @@ STDSHLCUIMT+=-ldl -lpthread -lm
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
.IF "$(STLPORT_VER)" >= "500"
LIBSTLPORT=$(DYNAMIC) -lstlport -lstdc++
LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
.ELSE
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
.ENDIF
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)