INTEGRATION: CWS configure22 (1.28.104); FILE MERGED

2007/10/15 22:46:22 rene 1.28.104.1: #i79874# STLport5 support for configure
This commit is contained in:
Kurt Zenker 2007-12-12 12:20:00 +00:00
parent 0c93e271f7
commit f7d5777d91

View file

@ -4,9 +4,9 @@
#
# $RCSfile: unxlngppc.mk,v $
#
# $Revision: 1.28 $
# $Revision: 1.29 $
#
# last change: $Author: hr $ $Date: 2007-07-31 13:06:33 $
# last change: $Author: kz $ $Date: 2007-12-12 13:19:59 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -46,7 +46,7 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
# _PTHREADS is needed for the stl
CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DPOWERPC -DPPC
CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER) -DPOWERPC -DPPC
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@ -182,8 +182,13 @@ STDLIBCUIMT=-ldl -lpthread -lm
STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
STDSHLCUIMT=-ldl -lpthread -lm
.IF "$(STLPORT_VER)" >= "500"
LIBSTLPORT=$(DYNAMIC) -lstlport
LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
.ELSE
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
.ENDIF
# name of library manager
LIBMGR=ar