diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-07-05 21:02:02 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-07-05 21:02:02 +0000 |
commit | c5dcbdef4dc42c85061c3366ff326dd65b80857a (patch) | |
tree | a41a075b453536d292e79f7eefb5007f52935199 /solenv/inc/unxirxm3.mk | |
parent | ceaf66a74b70355c0cff9fa2b13a89b6a1537230 (diff) |
INTEGRATION: CWS ause058 (1.8.328); FILE MERGED
2006/06/26 12:30:53 hjs 1.8.328.2: RESYNC: (1.8-1.9); FILE MERGED
2006/06/13 16:21:21 hjs 1.8.328.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
Diffstat (limited to 'solenv/inc/unxirxm3.mk')
-rw-r--r-- | solenv/inc/unxirxm3.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/unxirxm3.mk b/solenv/inc/unxirxm3.mk index 5690c728f06c..19e8e90f0291 100644 --- a/solenv/inc/unxirxm3.mk +++ b/solenv/inc/unxirxm3.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxirxm3.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: hr $ $Date: 2006-06-19 17:14:17 $ +# last change: $Author: kz $ $Date: 2006-07-05 22:02:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -54,7 +54,7 @@ ARCH_FLAGS*= CC= cc CXX= CC -CFLAGS= -c $(INCLUDE) +CFLAGS= -c CDEFS+= -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR CFLAGSCC=$(ARCH_FLAGS) CFLAGSCXX= -LANG:ansi-for-init-scope=OFF -LANG:std=ON -LANG:libc_in_namespace_std=ON $(ARCH_FLAGS) |