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

#90760# removed VCL variable checking and VCL define

Browse source
This commit is contained in:
Hans-Joachim Lankenau 2001-11-02 12:19:43 +00:00
parent 6e24b42174
commit 83d32504af
10 changed files with 15 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
solenv/inc/_tg_app.mk
View file

@ -12,13 +12,11 @@ APP1STACKN=$(LINKFLAGSTACK)$(APP1STACK)
.ELSE
APP1STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP1NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP1OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP1DEF=$(APP1DEF)
@ -210,13 +208,11 @@ APP2STACKN=$(LINKFLAGSTACK)$(APP2STACK)
.ELSE
APP2STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP2NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP2OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP2DEF=$(APP2DEF)
@ -408,13 +404,11 @@ APP3STACKN=$(LINKFLAGSTACK)$(APP3STACK)
.ELSE
APP3STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP3NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP3OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP3DEF=$(APP3DEF)
@ -606,13 +600,11 @@ APP4STACKN=$(LINKFLAGSTACK)$(APP4STACK)
.ELSE
APP4STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP4NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP4OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP4DEF=$(APP4DEF)
@ -804,13 +796,11 @@ APP5STACKN=$(LINKFLAGSTACK)$(APP5STACK)
.ELSE
APP5STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP5NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP5OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP5DEF=$(APP5DEF)
@ -1002,13 +992,11 @@ APP6STACKN=$(LINKFLAGSTACK)$(APP6STACK)
.ELSE
APP6STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP6NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP6OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP6DEF=$(APP6DEF)
@ -1200,13 +1188,11 @@ APP7STACKN=$(LINKFLAGSTACK)$(APP7STACK)
.ELSE
APP7STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP7NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP7OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP7DEF=$(APP7DEF)
@ -1398,13 +1384,11 @@ APP8STACKN=$(LINKFLAGSTACK)$(APP8STACK)
.ELSE
APP8STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP8NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP8OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP8DEF=$(APP8DEF)
@ -1596,13 +1580,11 @@ APP9STACKN=$(LINKFLAGSTACK)$(APP9STACK)
.ELSE
APP9STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP9NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP9OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP9DEF=$(APP9DEF)
@ -1794,13 +1776,11 @@ APP10STACKN=$(LINKFLAGSTACK)$(APP10STACK)
.ELSE
APP10STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP10NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP10OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP10DEF=$(APP10DEF)

14
solenv/inc/os2.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: os2.mk,v $
#
# $Revision: 1.2 $
# $Revision: 1.3 $
#
# last change: $Author: mh $ $Date: 2000-10-30 06:00:04 $
# last change: $Author: hjs $ $Date: 2001-11-02 13:18:46 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -184,15 +184,7 @@ CFLAGSOPT=/O+ /Oi+ /Oc+
CFLAGSNOOPT=/O-
CFLAGSOUTOBJ=/Fo
.IF "$(vcl)"!=""
CDEFS+=-DVCL -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
.ENDIF
.IF "$(so3)"!=""
CDEFS+=-DSO3
.ENDIF
.IF "$(old_chaos)"!=""
CDEFS+=-DOLD_CHAOS
.ENDIF
CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
LINK=ilink
#LINKFLAGS=/PACKCODE:8192 /ALIGN:16 /NOD /NOE /NOI /MAP /NOFREE

15
solenv/inc/settings.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: settings.mk,v $
#
# $Revision: 1.81 $
# $Revision: 1.82 $
#
# last change: $Author: hjs $ $Date: 2001-11-02 12:00:24 $
# last change: $Author: hjs $ $Date: 2001-11-02 13:18:53 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -391,11 +391,6 @@ solarlang*=$(SOLARLANG)
SOLARLANG:=$(solarlang)
.ENDIF
.IF "$(VCL)" != ""
vcl=$(VCL)
DONT_USE_OLE2=TRUE
.ENDIF
.IF "$(wall)"!=""
COMPILER_WARN_ALL=TRUE
.ENDIF # "$(wall)"!=""
@ -1125,9 +1120,6 @@ RSCEXTINC=.
.IF "$(DEBUG)" != ""
RSCDEFS+= -DDEBUG
.ENDIF
.IF "$(VCL)"!=""
RSCDEFS+= -DVCL
.ENDIF
.IF "$(OLD_CHAOS)"!=""
RSCDEFS+= -DOLD_CHAOS
.ENDIF
@ -1193,9 +1185,6 @@ COMID=$(COM)
# --- Neues Environment erweitern ----------------------------------
CDEFS+= -DSUPD=$(UPD) -DBUILD=$(BUILD)
.IF "$(VCL)" != ""
CDEFS+= -DVCL
.ENDIF
.IF "$(OLD_CHAOS)"!=""
CDEFS+= -DOLD_CHAOS
.ENDIF

84
solenv/inc/target.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: target.mk,v $
#
# $Revision: 1.81 $
# $Revision: 1.82 $
#
# last change: $Author: hjs $ $Date: 2001-11-02 12:00:24 $
# last change: $Author: hjs $ $Date: 2001-11-02 13:19:02 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -190,8 +190,7 @@ something_wrong_with_objects :
# - ALL -
# -------
# Bei VCL werden keine Resouren an die Apps geklemmt
.IF "$(VCL)" != ""
# with VCL no resources are appended to the application
APP1RES=
APP2RES=
APP3RES=
@ -201,8 +200,8 @@ APP6RES=
APP7RES=
APP8RES=
APP9RES=
# Leider gibt es auch Applikationen die nicht VCLApp's sind, und Resourcen nicht von
# VCL beziehen
# unfortunatly there are some applications which don't VCL resources but have
# resources of their own
.IF "$(APP1NOSVRES)" != ""
APP1RES=$(APP1NOSVRES)
.ENDIF
@ -212,7 +211,6 @@ APP2RES=$(APP2NOSVRES)
.IF "$(APP3NOSVRES)" != ""
APP3RES=$(APP3NOSVRES)
.ENDIF
.ENDIF
.IF "$(NO_APP)"!=""
APP1TARGET=
@ -467,11 +465,7 @@ SRC1TARGET=$(SRS)$/$(SRS1NAME).srs
.ENDIF
.IF "$(SRS1FILES)"!=""
.IF "$(VCL)" != ""
SRS1TARGET=$(BIN)$/$(RES1TARGET).res
.ELSE
SRS1TARGET=$(RES)$/$(RES1TARGET).res
.ENDIF
.ENDIF
.IF "$(SRC2FILES)"!=""
@ -479,11 +473,7 @@ SRC2TARGET=$(SRS)$/$(SRS2NAME).srs
.ENDIF
.IF "$(SRS2FILES)"!=""
.IF "$(VCL)" != ""
SRS2TARGET=$(BIN)$/$(RES2TARGET).res
.ELSE
SRS2TARGET=$(RES)$/$(RES2TARGET).res
.ENDIF
.ENDIF
.IF "$(SRC3FILES)"!=""
@ -491,11 +481,7 @@ SRC3TARGET=$(SRS)$/$(SRS3NAME).srs
.ENDIF
.IF "$(SRS3FILES)"!=""
.IF "$(VCL)" != ""
SRS3TARGET=$(BIN)$/$(RES3TARGET).res
.ELSE
SRS3TARGET=$(RES)$/$(RES3TARGET).res
.ENDIF
.ENDIF
.IF "$(SRC4FILES)"!=""
@ -503,11 +489,7 @@ SRC4TARGET=$(SRS)$/$(SRS4NAME).srs
.ENDIF
.IF "$(SRS1FILES)"!=""
.IF "$(VCL)" != ""
SRS4TARGET=$(BIN)$/$(RES4TARGET).res
.ELSE
SRS4TARGET=$(RES)$/$(RES4TARGET).res
.ENDIF
.ENDIF
.IF "$(SRC5FILES)"!=""
@ -515,11 +497,7 @@ SRC5TARGET=$(SRS)$/$(SRS5NAME).srs
.ENDIF
.IF "$(SRS5FILES)"!=""
.IF "$(VCL)" != ""
SRS5TARGET=$(BIN)$/$(RES5TARGET).res
.ELSE
SRS5TARGET=$(RES)$/$(RES5TARGET).res
.ENDIF
.ENDIF
.IF "$(SRC6FILES)"!=""
@ -527,11 +505,7 @@ SRC6TARGET=$(SRS)$/$(SRS6NAME).srs
.ENDIF
.IF "$(SRS6FILES)"!=""
.IF "$(VCL)" != ""
SRS6TARGET=$(BIN)$/$(RES6TARGET).res
.ELSE
SRS6TARGET=$(RES)$/$(RES6TARGET).res
.ENDIF
.ENDIF
.IF "$(SRC7FILES)"!=""
@ -539,11 +513,7 @@ SRC7TARGET=$(SRS)$/$(SRS7NAME).srs
.ENDIF
.IF "$(SRS7FILES)"!=""
.IF "$(VCL)" != ""
SRS7TARGET=$(BIN)$/$(RES7TARGET).res
.ELSE
SRS7TARGET=$(RES)$/$(RES7TARGET).res
.ENDIF
.ENDIF
.IF "$(SRC8FILES)"!=""
@ -551,11 +521,7 @@ SRC8TARGET=$(SRS)$/$(SRS8NAME).srs
.ENDIF
.IF "$(SRS8FILES)"!=""
.IF "$(VCL)" != ""
SRS8TARGET=$(BIN)$/$(RES8TARGET).res
.ELSE
SRS8TARGET=$(RES)$/$(RES8TARGET).res
.ENDIF
.ENDIF
.IF "$(SRC9FILES)"!=""
@ -563,11 +529,7 @@ SRC9TARGET=$(SRS)$/$(SRS9NAME).srs
.ENDIF
.IF "$(SRS9FILES)"!=""
.IF "$(VCL)" != ""
SRS9TARGET=$(BIN)$/$(RES9TARGET).res
.ELSE
SRS9TARGET=$(RES)$/$(RES9TARGET).res
.ENDIF
.ENDIF
.IF "$(SOLAR_JAVA)"!=""
@ -1542,7 +1504,6 @@ LIB9ARCHIV=
.IF "$(RESLIB1NAME)" != ""
RESLIB1 ?= TNR!:=1
.IF "$(VCL)" != ""
.IF "$(NO_REC_RES)"!=""
.IF "$(common_build_reslib)"!=""
RESLIB1TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB1NAME)$(UPD)LANGEXT.res
@ -1553,14 +1514,10 @@ RESLIB1TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB1TARGETN:s/LANGEXT/$i/))
.ELSE # "$(NO_REC_RES)"!=""
RESLIB1TARGETN=$(BIN)$/$(RESLIB1NAME)$(UPD)$(LANGEXT).res
.ENDIF # "$(NO_REC_RES)"!=""
.ELSE
RESLIB1TARGETN=$(BIN)$/$(RESLIB1NAME)$(UPD)$(LANGEXT).dll
.ENDIF
.ENDIF
.IF "$(RESLIB2NAME)" != ""
RESLIB2 ?= TNR!:=2
.IF "$(VCL)" != ""
.IF "$(NO_REC_RES)"!=""
.IF "$(common_build_reslib)"!=""
RESLIB2TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB2NAME)$(UPD)LANGEXT.res
@ -1571,14 +1528,10 @@ RESLIB2TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB2TARGETN:s/LANGEXT/$i/))
.ELSE # "$(NO_REC_RES)"!=""
RESLIB2TARGETN=$(BIN)$/$(RESLIB2NAME)$(UPD)$(LANGEXT).res
.ENDIF # "$(NO_REC_RES)"!=""
.ELSE
RESLIB2TARGETN=$(BIN)$/$(RESLIB2NAME)$(UPD)$(LANGEXT).dll
.ENDIF
.ENDIF
.IF "$(RESLIB3NAME)" != ""
RESLIB3 ?= TNR!:=3
.IF "$(VCL)" != ""
.IF "$(NO_REC_RES)"!=""
.IF "$(common_build_reslib)"!=""
RESLIB3TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB3NAME)$(UPD)LANGEXT.res
@ -1589,14 +1542,10 @@ RESLIB3TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB3TARGETN:s/LANGEXT/$i/))
.ELSE # "$(NO_REC_RES)"!=""
RESLIB3TARGETN=$(BIN)$/$(RESLIB3NAME)$(UPD)$(LANGEXT).res
.ENDIF # "$(NO_REC_RES)"!=""
.ELSE
RESLIB3TARGETN=$(BIN)$/$(RESLIB3NAME)$(UPD)$(LANGEXT).dll
.ENDIF
.ENDIF
.IF "$(RESLIB4NAME)" != ""
RESLIB4 ?= TNR!:=4
.IF "$(VCL)" != ""
.IF "$(NO_REC_RES)"!=""
.IF "$(common_build_reslib)"!=""
RESLIB4TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB4NAME)$(UPD)LANGEXT.res
@ -1607,14 +1556,10 @@ RESLIB4TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB4TARGETN:s/LANGEXT/$i/))
.ELSE # "$(NO_REC_RES)"!=""
RESLIB4TARGETN=$(BIN)$/$(RESLIB4NAME)$(UPD)$(LANGEXT).res
.ENDIF # "$(NO_REC_RES)"!=""
.ELSE
RESLIB4TARGETN=$(BIN)$/$(RESLIB4NAME)$(UPD)$(LANGEXT).dll
.ENDIF
.ENDIF
.IF "$(RESLIB5NAME)" != ""
RESLIB5 ?= TNR!:=5
.IF "$(VCL)" != ""
.IF "$(NO_REC_RES)"!=""
.IF "$(common_build_reslib)"!=""
RESLIB5TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB5NAME)$(UPD)LANGEXT.res
@ -1625,14 +1570,10 @@ RESLIB5TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB5TARGETN:s/LANGEXT/$i/))
.ELSE # "$(NO_REC_RES)"!=""
RESLIB5TARGETN=$(BIN)$/$(RESLIB5NAME)$(UPD)$(LANGEXT).res
.ENDIF # "$(NO_REC_RES)"!=""
.ELSE
RESLIB5TARGETN=$(BIN)$/$(RESLIB5NAME)$(UPD)$(LANGEXT).dll
.ENDIF
.ENDIF
.IF "$(RESLIB6NAME)" != ""
RESLIB6 ?= TNR!:=6
.IF "$(VCL)" != ""
.IF "$(NO_REC_RES)"!=""
.IF "$(common_build_reslib)"!=""
RESLIB6TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB6NAME)$(UPD)LANGEXT.res
@ -1643,14 +1584,10 @@ RESLIB6TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB6TARGETN:s/LANGEXT/$i/))
.ELSE # "$(NO_REC_RES)"!=""
RESLIB6TARGETN=$(BIN)$/$(RESLIB6NAME)$(UPD)$(LANGEXT).res
.ENDIF # "$(NO_REC_RES)"!=""
.ELSE
RESLIB6TARGETN=$(BIN)$/$(RESLIB6NAME)$(UPD)$(LANGEXT).dll
.ENDIF
.ENDIF
.IF "$(RESLIB7NAME)" != ""
RESLIB7 ?= TNR!:=7
.IF "$(VCL)" != ""
.IF "$(NO_REC_RES)"!=""
.IF "$(common_build_reslib)"!=""
RESLIB7TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB7NAME)$(UPD)LANGEXT.res
@ -1661,14 +1598,10 @@ RESLIB7TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB7TARGETN:s/LANGEXT/$i/))
.ELSE # "$(NO_REC_RES)"!=""
RESLIB7TARGETN=$(BIN)$/$(RESLIB7NAME)$(UPD)$(LANGEXT).res
.ENDIF # "$(NO_REC_RES)"!=""
.ELSE
RESLIB7TARGETN=$(BIN)$/$(RESLIB7NAME)$(UPD)$(LANGEXT).dll
.ENDIF
.ENDIF
.IF "$(RESLIB8NAME)" != ""
RESLIB8 ?= TNR!:=8
.IF "$(VCL)" != ""
.IF "$(NO_REC_RES)"!=""
.IF "$(common_build_reslib)"!=""
RESLIB8TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB8NAME)$(UPD)LANGEXT.res
@ -1679,14 +1612,10 @@ RESLIB8TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB8TARGETN:s/LANGEXT/$i/))
.ELSE # "$(NO_REC_RES)"!=""
RESLIB8TARGETN=$(BIN)$/$(RESLIB8NAME)$(UPD)$(LANGEXT).res
.ENDIF # "$(NO_REC_RES)"!=""
.ELSE
RESLIB8TARGETN=$(BIN)$/$(RESLIB8NAME)$(UPD)$(LANGEXT).dll
.ENDIF
.ENDIF
.IF "$(RESLIB9NAME)" != ""
RESLIB9 ?= TNR!:=9
.IF "$(VCL)" != ""
.IF "$(NO_REC_RES)"!=""
.IF "$(common_build_reslib)"!=""
RESLIB9TARGETN=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/$(RESLIB9NAME)$(UPD)LANGEXT.res
@ -1697,9 +1626,6 @@ RESLIB9TARGETN!:=$(foreach,i,$(alllangext) $(RESLIB9TARGETN:s/LANGEXT/$i/))
.ELSE # "$(NO_REC_RES)"!=""
RESLIB9TARGETN=$(BIN)$/$(RESLIB9NAME)$(UPD)$(LANGEXT).res
.ENDIF # "$(NO_REC_RES)"!=""
.ELSE
RESLIB9TARGETN=$(BIN)$/$(RESLIB9NAME)$(UPD)$(LANGEXT).dll
.ENDIF
.ENDIF
.IF "$(INDPRESLIB1NAME)"!=""

6
solenv/inc/tg_app.mk
View file

@ -2,9 +2,9 @@
#
# $RCSfile: tg_app.mk,v $
#
# $Revision: 1.30 $
# $Revision: 1.31 $
#
# last change: $Author: hjs $ $Date: 2001-10-23 15:07:29 $
# last change: $Author: hjs $ $Date: 2001-11-02 13:19:11 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -107,13 +107,11 @@ APP$(TNR)STACKN=$(LINKFLAGSTACK)$(APP$(TNR)STACK)
.ELSE
APP$(TNR)STACKN=
.ENDIF
.IF "$(VCL)" != ""
.IF "$(APP$(TNR)NOSAL)"==""
.IF "$(TARGETTYPE)" == "GUI"
APP$(TNR)OBJS+= $(STDOBJVCL)
.ENDIF
.ENDIF
.ENDIF
.IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC"
USE_APP$(TNR)DEF=$(APP$(TNR)DEF)

3
solenv/inc/tg_srs.mk
View file

@ -184,8 +184,6 @@ SRS1 SRS2 SRS3 SRS4 SRS5 SRS6 SRS7 SRS8 SRS9:
@+dmake "$(SRS$(TNR)TARGET)" MULTI_SRS_FLAG=true TNR:=$(TNR) $(MFLAGS) $(CALLMACROS)
.ENDIF # "$(GUI)" != "MAC"
.ELSE
.IF "$(VCL)" == ""
.ELSE
$(SRS$(TNR)TARGET): $(SRS$(TNR)FILES) $(SRS$(TNR)DEPN)
@echo ------------------------------
@echo Making: $@
@ -204,6 +202,5 @@ $(SRS$(TNR)TARGET): $(SRS$(TNR)FILES) $(SRS$(TNR)DEPN)
.ELSE # "$(GUI)" != "MAC"
+$(RSC) -r $(RSC_RES_CHARSET) -fs$(SRS$(TNR)TARGET) -fo$(RES)$/$(RES$(TNR)TARGET).res -I$(SOLARENV)$/res -I$(INPATH)$/res -I$(RSCEXTINC) -I"$(INCLUDE:s/inc/inc:/)" -I$(SOLARINCDIR)$/ $(RSCDEFS) $(RSCUPDVERMAC) $(RSC$(TNR)HEADER) $(SRS$(TNR)FILES)
.ENDIF # "$(GUI)" != "MAC"
.ENDIF # "$(VCL)" == ""
.ENDIF # "$(MULTI_SRS_FLAG)" == ""

2
solenv/inc/unxaixp.mk
View file

@ -9,7 +9,7 @@ CC= xlC_r
cc= xlc_r
CFLAGS= -c -qlanglvl=extended -qchars=signed
CFLAGS+= $(INCLUDE)
CDEFS+= -DVCL -D_PTHREADS
CDEFS+= -D_PTHREADS
CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
CFLAGSCC=
CFLAGSCXX=

1
solenv/inc/unxirgm.mk
View file

@ -16,7 +16,6 @@ cc= gcc
#CC= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523
CC= g++ -c
CFLAGS= $(INCLUDE)
CDEFS+= -DVCL
CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
# CFLAGS+= -D__STL_NATIVE_INCLUDE_PATH=/usr/include -D__STL_NATIVE_C_INCLUDE_PATH=/usr/include
# CFLAGS+= -D_STL_NATIVE_INCLUDE_PATH=/usr/include -D_STL_NATIVE_C_INCLUDE_PATH=/usr/include

2
solenv/inc/unxirxm.mk
View file

@ -14,7 +14,7 @@ AFLAGS=
cc= cc -KPIC -c -n32
CC= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523
CFLAGS= $(INCLUDE)
CDEFS+= -DVCL -D_PTHREADS
CDEFS+=-D_PTHREADS
CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
# 1009 ...nested comment is not allowed...
# 1021 ...type qualifiers are meaningless in this declaration...

2
solenv/inc/unxirxm3.mk
View file

@ -16,7 +16,7 @@ cc= cc -KPIC -c -n32
#CC= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523
CC= CC -KPIC -c -n32 -ansi -ptused -OPT:Olimit=20523
CFLAGS= $(INCLUDE)
CDEFS+= -DVCL -D_PTHREADS
CDEFS+=-D_PTHREADS
CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
# CFLAGS+= -D__STL_NATIVE_INCLUDE_PATH=/usr/include -D__STL_NATIVE_C_INCLUDE_PATH=/usr/include
# CFLAGS+= -D_STL_NATIVE_INCLUDE_PATH=/usr/include -D_STL_NATIVE_C_INCLUDE_PATH=/usr/include