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

INTEGRATION: CWS oooicons (1.152.18); FILE MERGED

Browse source 
2004/10/08 12:39:00 hjs 1.152.18.1: #i35193# changed image location; changed customizing
This commit is contained in:
Oliver Bolte 2004-11-19 10:42:23 +00:00
parent c4403f3294
commit 01f1c00720
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
solenv/inc/settings.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: settings.mk,v $
#
# $Revision: 1.155 $
# $Revision: 1.156 $
#
# last change: $Author: obo $ $Date: 2004-11-17 16:05:54 $
# last change: $Author: obo $ $Date: 2004-11-19 11:42:23 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -1073,16 +1073,17 @@ RSCDEFS=-D$(GUI) -D$(GVER) -D$(COM) -D$(CVER) -DSUPD=$(UPD) $(JAVADEF)
RSCDEFS+=-DBUILD_SPECIAL=$(BUILD_SPECIAL)
.ENDIF
RSCDEFIMG*=default_images
.IF "$(rscres)"!=""
RSCRES=$(rscres)
.ENDIF
.IF "$(RSCRES)"!=""
RSCGLOINC=$(RSCRES)
.ELSE
RSCGLOINC=$(SOLARSRC)$/res
RSCGLOINC=$(SOLARSRC)$/$(RSCDEFIMG)$/res
.ENDIF
RSCLOCINC=$(PRJ)$/win$/res
RSCLOCINC=$(PRJ)$/res
RSCEXTINC=.
.IF "$(DEBUG)" != ""
@ -1179,12 +1180,8 @@ LINKFLAGS+=$(LINKFLAGSPROF)
JAVAFLAGS+=$(JAVAFLAGSDEBUG)
CDEFS+= $(CDEFSDEBUG)
CFLAGS+= $(CFLAGSDEBUG)
.IF "$(COM)"=="WTC"
LINK+= $(LINKFLAGSDEBUG)
.ELSE
LINKFLAGS+= $(LINKFLAGSDEBUG)
.ENDIF
.ENDIF
.IF "$(dbgutil)"!=""
CDEFS+=$(CDEFSDBGUTIL)