ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

remove PCH support in dmake-module

Browse Source
This commit is contained in:
Norbert Thiebaud
2011-11-27 12:26:12 -06:00
parent 992757cc5e
commit e4610ffd2d
68 changed files with 38 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessibility/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
autodoc/source/mkinc/fullcpp.mk
-14
View File
@@ -39,17 +39,3 @@ CFLAGS+= -GR
"$(OS)"=="DRAGONFLY" || $(COM) == "GCC"
CFLAGSCXX+= -frtti
.ENDIF
# Precompiled Headers
.IF "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT"
PCH_NAME=autodoc
.IF "$(debug)"==""
CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
.ELSE
CFLAGS+= -YX"precomp.h" -Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd
.ENDIF
.ENDIF # "$(NP_LOCALBUILD)"!="" && "$(GUI)"=="WNT"
bridges/inc/makefile.mk
-7
View File
@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
cli_ure/inc/makefile.mk
-8
View File
@@ -38,11 +38,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
codemaker/inc/makefile.mk
-7
View File
@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
configmgr/inc/makefile.mk
-3
View File
@@ -33,6 +33,3 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE: settings.mk
.INCLUDE: target.mk
.IF "$(ENABLE_PCH)" != ""
ALLTAR: $(SLO)/precompiled.pch $(SLO)/precompiled_ex.pch
.ENDIF
configure.in
+1 -1
View File
@@ -2639,7 +2639,7 @@ AC_SUBST(HYPH_SYSTEM_DIR)
AC_SUBST(THES_SYSTEM_DIR)
dnl ===================================================================
dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
dnl ENABLE_PCH i now a no-op
dnl ===================================================================
AC_MSG_CHECKING([whether to enable pch feature])
AC_MSG_RESULT([no, obsolete])
connectivity/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
cosv/source/fullcpp.mk
-12
View File
@@ -36,18 +36,6 @@
# RTTI
CFLAGS+= -GR
.IF "$(NP_LOCALBUILD)"!=""
# Precompiled Headers
PCH_NAME= cosv
.IF "$(DBG_LEVEL)"<"2"
CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
.ELSE
CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBUILD
.ENDIF
.ENDIF
.ENDIF
.IF "$(COM)"=="GCC"
cppu/inc/makefile.mk
-8
View File
@@ -38,11 +38,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
cppuhelper/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
desktop/qa/deployment_misc/makefile.mk
-6
View File
@@ -37,12 +37,6 @@ VISIBILITY_HIDDEN := TRUE
CFLAGSCXX += $(CPPUNIT_CFLAGS)
# TODO: On Windows, test_dp_version.cxx fails due to BOOL redefinition between
# windef.h and tools/solar.h caused by including "precompiled_desktop.hxx"; this
# hack to temporarily disable PCH will become unnecessary with the fix for issue
# 112600:
CFLAGSCXX += -DDISABLE_PCH_HACK
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_dp_version.obj
SHL1STDLIBS = $(CPPUNITLIB) $(DEPLOYMENTMISCLIB) $(SALLIB)
embeddedobj/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=embeddedobj
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
extensions/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
filter/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
fpicker/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
idlc/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
io/inc/makefile.mk
-9
View File
@@ -38,12 +38,3 @@ TARGET=inc
.ENDIF # L10N_framework
.INCLUDE : target.mk
.IF "$(L10N_framework)"==""
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
.ENDIF # L10N_framework
javaunohelper/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
jvmfwk/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
l10ntools/inc/makefile.mk
-7
View File
@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
lingucomponent/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
odk/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
registry/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
sal/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
sal/osl/all/makefile.mk
-4
View File
@@ -32,10 +32,6 @@ TARGET=oslall
ENABLE_EXCEPTIONS=TRUE
USE_LDUMP2=TRUE
PROJECTPCH4DLL=TRUE
PROJECTPCH=cont_pch
PROJECTPCHSOURCE=cont_pch
MULTITHREAD_OBJ=TRUE
# --- Settings -----------------------------------------------------
sal/osl/unx/makefile.mk
-4
View File
@@ -35,10 +35,6 @@ TARGET=cpposl
.ENDIF
USE_LDUMP2=TRUE
PROJECTPCH4DLL=TRUE
PROJECTPCH=cont_pch
PROJECTPCHSOURCE=cont_pch
TARGETTYPE=CUI
ENABLE_EXCEPTIONS=TRUE
sal/osl/w32/makefile.mk
-4
View File
@@ -32,10 +32,6 @@ TARGET=cpposl
ENABLE_EXCEPTIONS=TRUE
USE_LDUMP2=TRUE
PROJECTPCH4DLL=TRUE
PROJECTPCH=cont_pch
PROJECTPCHSOURCE=cont_pch
MULTITHREAD_OBJ=TRUE
# --- Settings -----------------------------------------------------
sal/rtl/source/makefile.mk
-4
View File
@@ -32,10 +32,6 @@ TARGET=cpprtl
ENABLE_EXCEPTIONS=TRUE
USE_LDUMP2=TRUE
PROJECTPCH4DLL=TRUE
PROJECTPCH=cont_pch
PROJECTPCHSOURCE=cont_pch
TARGETTYPE=CUI
# --- Settings -----------------------------------------------------
scp2/source/accessories/makefile.mk
-2
View File
@@ -28,8 +28,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=accessories
TARGETTYPE=CUI
scp2/source/activex/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=activex
TARGETTYPE=CUI
scp2/source/base/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=base
TARGETTYPE=CUI
scp2/source/binfilter/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=binfilter
TARGETTYPE=CUI
scp2/source/calc/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=calc
TARGETTYPE=CUI
scp2/source/canvas/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=canvas
TARGETTYPE=CUI
scp2/source/crashrep/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=crashrep
TARGETTYPE=CUI
scp2/source/draw/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=draw
TARGETTYPE=CUI
scp2/source/extensions/makefile.mk
-2
View File
@@ -29,8 +29,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=extensions
TARGETTYPE=CUI
scp2/source/gnome/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=gnome
TARGETTYPE=CUI
scp2/source/graphicfilter/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=graphicfilter
TARGETTYPE=CUI
scp2/source/impress/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=impress
TARGETTYPE=CUI
scp2/source/javafilter/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=javafilter
TARGETTYPE=CUI
scp2/source/kde/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=kde
TARGETTYPE=CUI
scp2/source/math/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=math
TARGETTYPE=CUI
scp2/source/onlineupdate/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=update
TARGETTYPE=CUI
scp2/source/ooo/makefile.mk
-2
View File
@@ -26,8 +26,6 @@
#*************************************************************************
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=ooo
TARGETTYPE=CUI
scp2/source/python/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=python
TARGETTYPE=CUI
scp2/source/quickstart/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=quickstart
TARGETTYPE=CUI
scp2/source/testtool/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=testtool
TARGETTYPE=CUI
scp2/source/winexplorerext/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=winexpext
TARGETTYPE=CUI
scp2/source/writer/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=writer
TARGETTYPE=CUI
scp2/source/xsltfilter/makefile.mk
-2
View File
@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=xsltfilter
TARGETTYPE=CUI
sdext/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
shell/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
solenv/inc/rules.mk
+37 -81
View File
@@ -32,11 +32,11 @@ $(OBJ)/%.obj : %.cxx
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(noadjust)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(noadjust)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(noadjust)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(noadjust)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@-$(RM) $@
@@ -56,9 +56,9 @@ $(OBJ)/%.obj : %.cpp
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@-$(RM) $@
@@ -78,9 +78,9 @@ $(OBJ)/%.obj : %.cc
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@$(RM) $@
@@ -91,70 +91,26 @@ $(OBJ)/%.obj : %.cc
.ENDIF
.ENDIF
.IF "$(ENABLE_PCH)"!=""
PCHOUTDIR=$(SLO)/pch
PCHEXOUTDIR=$(SLO)/pch_ex
$(SLO)/precompiled.% .PHONY:
-$(MKDIRHIER) $(SLO)/pch
.IF "$(COM)"=="MSC"
$(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
.ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
$(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
@echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx
.ELSE # "$(COM)"=="MSC"
@$(TOUCH) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
.ENDIF # "$(COM)"=="MSC"
@echo USED_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF$(CFLAGSAPPEND)> $(INCCOM)/pch.mk
$(SLO)/precompiled_ex.% .PHONY:
-$(MKDIRHIER) $(SLO)/pch_ex
.IF "$(COM)"=="MSC"
$(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
.ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
$(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
@echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx
.ELSE # "$(COM)"=="MSC"
@$(TOUCH) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
.ENDIF # "$(COM)"=="MSC"
@echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)/pch_ex.mk
.INCLUDE .IGNORE : $(INCCOM)/pch.mk
.INCLUDE .IGNORE : $(INCCOM)/pch_ex.mk
.ENDIF # "$(ENABLE_PCH)"!=""
$(SLO)/%.obj : %.cxx
@echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
.IF "$(ENABLE_PCH)"!=""
# just a helper var
@noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
# cleanup first
@noop $(assign ACT_PCH_SWITCHES:=$(NULL))
# eq: first string is a copy of the compile line,
# second generated by pch creation
# use pch with exception support
@noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_EXCEPTIONS_PCHFLAGS)),$(strip $(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_EXCEPTIONS_PCH) $(NULL)))
# use pch without exception support
@noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_PCHFLAGS)),$(strip $(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_PCH) $(NULL)))
.ENDIF # "$(ENABLE_PCH)"!=""
.IF "$(GUI)"=="UNX"
.IF "$(TEST)"!=""
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E $(CFLAGSINCXX)$(PWD)/$*.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
$(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE # "$(GUI)"=="UNX"
@@-$(RM) $@
.IF "$(COM)"=="GCC"
$(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
$(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
.ELSE
$(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
.ENDIF # "$(COM)"=="GCC"
$(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(GUI)"=="UNX"
.IF "$(nodep)"==""
# fixme: write to file
@@ -170,9 +126,9 @@ $(SLO)/%.obj : %.cpp
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE
@@ -196,9 +152,9 @@ $(SLO)/%.obj : $(MISC)/%.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE
@@ -221,9 +177,9 @@ $(SLO)/%.obj : $(MISC)/%.cc
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cc
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE
@@ -238,9 +194,9 @@ $(OBJ)/%.obj : $(MISC)/%.cxx
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE
@@ -263,11 +219,11 @@ $(OBJ)/%.obj : %.c
.ELSE
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(noadjust)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(noadjust)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(noadjust)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(noadjust)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ENDIF
.ELSE
@@ -290,9 +246,9 @@ $(OBJ)/%.obj : $(MISC)/%.c
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@-$(RM) $@
@@ -312,9 +268,9 @@ $(SLO)/%.obj : $(MISC)/%.c
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@-$(RM) $@
@@ -335,9 +291,9 @@ $(SLO)/%.obj : %.c
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
$(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
$(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
@$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
.ELSE
@@-$(RM) $@
@@ -518,20 +474,20 @@ $(MISC)/o_%.dpcc : %.m
$(MISC)/s_%.dpcc : $(MISC)/%.m
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
.IF "$(GUI)"=="UNX"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
.ELSE # "$(GUI)"=="UNX"
.ELSE # "$(GUI)"=="UNX"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(GUI)"=="UNX"
@echo $@ : $(SLO)/$(<:b).obj >> $@
$(MISC)/o_%.dpcc : $(MISC)/%.m
@@-$(RM) $@
.IF "$(GUI)"=="UNX"
.IF "$(GUI)"=="UNX"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
.ELSE # "$(GUI)"=="UNX"
.ELSE # "$(GUI)"=="UNX"
$(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
.ENDIF # "$(GUI)"=="UNX"
.ENDIF # "$(GUI)"=="UNX"
@echo $@ : $(OBJ)/$(<:b).obj >> $@
# dependency dummy for *.s files
solenv/inc/settings.mk
-4
View File
@@ -38,10 +38,6 @@ force_dmake_to_error
# --- common tool makros --------------------------------------
.IF "$(USE_PCH)"!=""
ENABLE_PCH=TRUE
.ENDIF # "$(USE_PCH)"!=""
.INCLUDE : unitools.mk
.INCLUDE : minor.mk
solenv/inc/unxgcc.mk
-5
View File
@@ -99,10 +99,6 @@ CFLAGSCXX+=-Wno-deprecated-declarations
CFLAGSCXX += -D_GLIBCXX_DEBUG
.ENDIF # !PRODUCT
CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
# Compiler flags for compiling static object in multi threaded environment with graphical user interface
CFLAGSOBJGUIMT=
# Compiler flags for compiling static object in multi threaded environment with character user interface
@@ -268,4 +264,3 @@ RCSETVERSION=
# platform specific identifier for shared libs
DLLPRE=lib
DLLPOST=.so
PCHPOST=.gch
solenv/inc/unxiosr.mk
-2
View File
@@ -106,8 +106,6 @@ LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
DLLPRE=lib
# We don't use dynamic shared libraries on iOS
DLLPOST=.a
# Precompiled header file extension
PCHPOST=.gch
STDLIBCUIMT=-framework UIKit -framework Foundation -framework CoreText -framework CoreGraphics -framework CoreFoundation -Xlinker -objc_abi_version -Xlinker 2
STDLIBGUIMT=$(STDLIBCUIMT)
solenv/inc/unxmacx.mk
-7
View File
@@ -132,11 +132,6 @@ CFLAGSDBGUTIL=
# Flag to specify output file to compiler/linker
CFLAGSOUTOBJ=-o
# Flags to enable precompiled headers
CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
CFLAGS_USE_PCH=-I$(SLO)/pch -DPRECOMPILED_HEADERS -Winvalid-pch
CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
# ---------------------------------
# Optimization flags
# ---------------------------------
@@ -216,8 +211,6 @@ LINKFLAGSOPT=
DLLPRE=lib
# File extension to identify dynamic shared libraries on MacOS X
DLLPOST=.dylib
# Precompiled header file extension
PCHPOST=.gch
# We don't use mapping on MacOS X
#LINKVERSIONMAPFLAG=-Wl,--version-script
solenv/inc/wntgcci.mk
-6
View File
@@ -55,10 +55,6 @@ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
PICSWITCH:=
CFLAGS_CREATE_PCH=-x c++-header -I$(INCPCH) -DPRECOMPILED_HEADERS
CFLAGS_USE_PCH=-I$(SLO)$/pch -DPRECOMPILED_HEADERS -Winvalid-pch
CFLAGS_USE_EXCEPTIONS_PCH=-I$(SLO)$/pch_ex -DPRECOMPILED_HEADERS -Winvalid-pch
CFLAGSOBJGUIST=
CFLAGSOBJCUIST=
CFLAGSOBJGUIMT=-D_MT
@@ -169,8 +165,6 @@ RCLINK=
RCLINKFLAGS=
RCSETVERSION=
PCHPOST=.gch
ADVAPI32LIB=-ladvapi32
SHELL32LIB=-lshell32
GDI32LIB=-lgdi32
solenv/inc/wntmsc.mk
-12
View File
@@ -124,16 +124,6 @@ CFLAGS_NO_EXCEPTIONS=
CDEFS+=-DBOOST_MEM_FN_ENABLE_CDECL
.ENDIF
# with the current debug switches PCH won't work
# anyway. so keep the existing .pch intact and don't
# touch it
.IF "$(debug)"!=""
ENABLE_PCH:=
.ENDIF "$(debug)"!=""
CFLAGS_CREATE_PCH=-I$(INCPCH) -Fo$(SLO)/pchname.obj -Ycprecompiled_$(PRJNAME).hxx -DPRECOMPILED_HEADERS
CFLAGS_USE_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
CFLAGS_USE_EXCEPTIONS_PCH=-I$(INCPCH) -Yuprecompiled_$(PRJNAME).hxx -Fp$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) -DPRECOMPILED_HEADERS
.IF "$(CALL_CDECL)"=="TRUE"
CFLAGSCALL=-Gd
.ELSE # "$(CALL_CDECL)"=="TRUE"
@@ -333,8 +323,6 @@ MT=mt.exe
MTFLAGS=$(NOLOGO)
PCHPOST=.pch
CSC*=$(FLIPCMD) csc
VBC*=vbc
stoc/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
store/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
testtools/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
ucb/inc/makefile.mk
-9
View File
@@ -37,12 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(L10N_framework)"==""
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
.ENDIF # L10N_framework
udm/source/mkinc/fullcpp.mk
-16
View File
@@ -31,9 +31,6 @@
# Has to be included AFTER settings.mk !
# Precompiled header:
.IF "$(GUI)"=="WNT"
# RTTI
@@ -41,19 +38,6 @@
CFLAGS+= -GR
.ENDIF
.IF "$(NP_LOCALBUILD)"!=""
# Precompiled Headers
PCH_NAME= udm
.IF "$(DBG_LEVEL)"<"2"
CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pch
.ELSE
CFLAGS+= -YX"precomp.h" /Fp$(PRJ)$/$(INPATH)$/misc$/$(PCH_NAME).pcd -DNP_LOCALBUILD
.ENDIF
.ENDIF
.ENDIF
# Or should we simple check for $(COM)==GCC ?
xmerge/inc/makefile.mk
-8
View File
@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
xmlhelp/inc/makefile.mk
-7
View File
@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""