strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ause058 (1.191.4); FILE MERGED

Browse source 
2006/06/26 12:30:47 hjs 1.191.4.4: RESYNC: (1.191-1.192); FILE MERGED
2006/06/14 08:22:08 hjs 1.191.4.3: #i59802# enhanced dmake version checking
2006/06/13 16:21:19 hjs 1.191.4.2: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006/06/12 16:35:41 hjs 1.191.4.1: #i63235# useless URD stuff removed
This commit is contained in:
Kurt Zenker 2006-07-05 20:57:12 +00:00
parent 3e3e8c5f5b
commit 3792d0c9b7
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
solenv/inc/settings.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: settings.mk,v $
#
# $Revision: 1.194 $
# $Revision: 1.195 $
#
# last change: $Author: kz $ $Date: 2006-07-05 21:01:38 $
# last change: $Author: kz $ $Date: 2006-07-05 21:57:12 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -34,12 +34,12 @@
#*************************************************************************
MKFILENAME:=SETTINGS.MK
# check for new dmake features
.IF 400<=200
dmake_test_version:
@+echo dmake version too old!
force_dmake_to_error
# smaller/greater arithmetic's like ".IF 400<=200" are an OOo extention to
# the initial dmake 4.1PL0 (unfortunately called 4.10) version and are
# tested implicitly by the construction below.
.IF $(MAKEVERSION:s/-cvs//:s/.//:s/410/41/)<=42
.ERROR : ; @echo Forced error: dmake version 4.3 or newer is needed!
force_dmake_to_error
.ENDIF
.IF "$(USE_COMMENT)"!=""
@ -772,7 +772,6 @@ INCGUI=$(PRJ)$/$(GUIBASE)$/inc
INCCOM=$(OUT)$/inc
INCCOMX=$(OUT)$/inc
INCUNOIDL=$(INCCOM)$/$(PRJNAME)
I={$(INCLUDE)}
INCDEPN=. $(INCGUI) $(INCLOCAL) $(INC)
.IF "$(PRJINC)"!=""
INCLOCPRJ=$(foreach,i,$(PRJINC) $i$/inc)
@ -1005,8 +1004,6 @@ RSCDEFS+= -DDEBUG
# additional image sets
CUSTOM_IMAGE_SETS=hicontrast industrial crystal
UNOIDL=unoidl
# settings for mozilla idl compiler
XPIDL=xpidl
XPIDL_LINK=xpt_link