INTEGRATION: CWS jl15 (1.154.26); FILE MERGED

2004/12/01 09:41:48 jl 1.154.26.2: RESYNC: (1.154-1.156); FILE MERGED
2004/11/30 15:45:59 jl 1.154.26.1: #i35985# introducing CSC and VBC macros
This commit is contained in:
Kurt Zenker 2004-12-16 10:40:19 +00:00
parent 7ab3ddef6e
commit 7d8fc5560f

View file

@ -2,9 +2,9 @@
# #
# $RCSfile: settings.mk,v $ # $RCSfile: settings.mk,v $
# #
# $Revision: 1.157 $ # $Revision: 1.158 $
# #
# last change: $Author: hr $ $Date: 2004-12-10 18:03:38 $ # last change: $Author: kz $ $Date: 2004-12-16 11:40:19 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
@ -1134,6 +1134,8 @@ CPPUMAKER*=cppumaker
JAVAMAKER*=javamaker JAVAMAKER*=javamaker
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
CLIMAKER*=climaker CLIMAKER*=climaker
CSC*=csc
VBC*=vbc
.ENDIF .ENDIF
RDBMAKER*=rdbmaker RDBMAKER*=rdbmaker