INTEGRATION: CWS cmcfixes23 (1.12.92); FILE MERGED

2005/11/29 13:56:44 cmc 1.12.92.1: #i44027# enable building out of the box with ntpl
This commit is contained in:
Oliver Bolte 2006-01-20 09:51:30 +00:00
parent 3c26721023
commit 30e046a73d

View file

@ -4,9 +4,9 @@
#
# $RCSfile: unxlngs3904.mk,v $
#
# $Revision: 1.12 $
# $Revision: 1.13 $
#
# last change: $Author: kz $ $Date: 2005-10-05 11:35:59 $
# last change: $Author: obo $ $Date: 2006-01-20 10:51:30 $
#
# 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+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
# this is a platform with JAVA support
.IF "$(SOLAR_JAVA)"!=""