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

INTEGRATION: CWS configure22 (1.15.104); FILE MERGED

Browse source 
2007/12/01 19:11:54 rene 1.15.104.2: RESYNC: (1.15-1.16); FILE MERGED
2007/10/15 22:46:22 rene 1.15.104.1: #i79874# STLport5 support for configure
This commit is contained in:
Kurt Zenker 2007-12-12 12:20:39 +00:00
parent eb672b837b
commit 388a1f0941
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/unxlngr.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: unxlngr.mk,v $
#
# $Revision: 1.16 $
# $Revision: 1.17 $
#
# last change: $Author: ihi $ $Date: 2007-11-26 18:00:27 $
# last change: $Author: kz $ $Date: 2007-12-12 13:20:39 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -47,7 +47,7 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
# _PTHREADS is needed for the stl
CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DARM32 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DARM32 -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"
@ -187,8 +187,13 @@ LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
.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)