From 62b9f120f0607682c5cfc75a125ccd997a52ade1 Mon Sep 17 00:00:00 2001
From: Patrick Luby <pluby@openoffice.org>
Date: Thu, 14 Dec 2000 06:24:56 +0000
Subject: Updated to SRC614

---
 solenv/inc/unxmacxp.mk | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'solenv/inc/unxmacxp.mk')

diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
index 04a3b3a4633a..c7386deeb1f2 100644
--- a/solenv/inc/unxmacxp.mk
+++ b/solenv/inc/unxmacxp.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: unxmacxp.mk,v $
 #
-#   $Revision: 1.15 $
+#   $Revision: 1.16 $
 #
-#   last change: $Author: pluby $ $Date: 2000-11-17 16:37:19 $
+#   last change: $Author: pluby $ $Date: 2000-12-14 07:24:56 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -68,14 +68,12 @@ AFLAGS=
 LINKOUTPUT_FILTER=
 
 # _PTHREADS is needed for the stl
-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY -DSTLPORT_VERSION=321 -D_USE_NAMESPACE=1
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY -DSTLPORT_VERSION=400 -D_USE_NAMESPACE=1
 
 # Temporary settings to enable VCL test code. These should be deleted once
 # VCL development is complete.
-.IF "$(BUILD_SOSL)"!=""
 dbgutil=true
 product=
-.ENDIF
 
 .IF "$(SOLAR_JAVA)"!=""
 JAVADEF=-DSOLAR_JAVA
@@ -140,6 +138,13 @@ STDLIBCUIMT=
 STDSHLGUIMT=
 STDSHLCUIMT=
 
+LIBSTLPORT=-lstlport_gcc
+.IF "$(STLPORT4)"!=""
+LIBSTLPORTST=$(STLPORT4)$/lib/libstlport_gcc.a
+.ELSE
+LIBSTLPORTST=$(SOLARVERSION)$/$(INPATH)$/lib/libstlport_gcc.a
+.ENDIF
+
 LIBMGR=libtool
 LIBFLAGS=-o
 
-- 
cgit