INTEGRATION: CWS geordi2q11 (1.139.4); FILE MERGED

2003/12/16 16:14:11 hr 1.139.4.1: #111934#: join CWS ooo111fix1
This commit is contained in:
Vladimir Glazounov 2003-12-17 17:06:05 +00:00
parent f264d409f9
commit eb79a0408e

View file

@ -2,9 +2,9 @@
#
# $RCSfile: settings.mk,v $
#
# $Revision: 1.140 $
# $Revision: 1.141 $
#
# last change: $Author: vg $ $Date: 2003-12-16 11:38:04 $
# last change: $Author: vg $ $Date: 2003-12-17 18:06:05 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -975,6 +975,10 @@ CDEFS= -D$(OS) -D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -D$(CPUNAME)
CDEFS+=$(CDEFS_PRESET)
.ENDIF
.IF "$(COM)"=="GCC"
CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
.ENDIF
.IF "$(TIMELOG)" != ""
CDEFS+=-DTIMELOG
.ENDIF