Kaydet (Commit) e4610ffd authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

remove PCH support in dmake-module

üst 992757cc
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -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"
......@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -38,11 +38,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -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
......@@ -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])
......
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -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"
......
......@@ -38,11 +38,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -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)
......
......@@ -37,11 +37,3 @@ TARGET=embeddedobj
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -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
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -32,10 +32,6 @@ TARGET=oslall
ENABLE_EXCEPTIONS=TRUE
USE_LDUMP2=TRUE
PROJECTPCH4DLL=TRUE
PROJECTPCH=cont_pch
PROJECTPCHSOURCE=cont_pch
MULTITHREAD_OBJ=TRUE
# --- Settings -----------------------------------------------------
......
......@@ -35,10 +35,6 @@ TARGET=cpposl
.ENDIF
USE_LDUMP2=TRUE
PROJECTPCH4DLL=TRUE
PROJECTPCH=cont_pch
PROJECTPCHSOURCE=cont_pch
TARGETTYPE=CUI
ENABLE_EXCEPTIONS=TRUE
......
......@@ -32,10 +32,6 @@ TARGET=cpposl
ENABLE_EXCEPTIONS=TRUE
USE_LDUMP2=TRUE
PROJECTPCH4DLL=TRUE
PROJECTPCH=cont_pch
PROJECTPCHSOURCE=cont_pch
MULTITHREAD_OBJ=TRUE
# --- Settings -----------------------------------------------------
......
......@@ -32,10 +32,6 @@ TARGET=cpprtl
ENABLE_EXCEPTIONS=TRUE
USE_LDUMP2=TRUE
PROJECTPCH4DLL=TRUE
PROJECTPCH=cont_pch
PROJECTPCHSOURCE=cont_pch
TARGETTYPE=CUI
# --- Settings -----------------------------------------------------
......
......@@ -28,8 +28,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=accessories
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=activex
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=base
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=binfilter
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=calc
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=canvas
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=crashrep
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=draw
TARGETTYPE=CUI
......
......@@ -29,8 +29,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=extensions
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=gnome
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=graphicfilter
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=impress
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=javafilter
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=kde
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=math
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=update
TARGETTYPE=CUI
......
......@@ -26,8 +26,6 @@
#*************************************************************************
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=ooo
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=python
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=quickstart
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=testtool
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=winexpext
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=writer
TARGETTYPE=CUI
......
......@@ -27,8 +27,6 @@
PRJ=..$/..
PRJPCH=
PRJNAME=scp2
TARGET=xsltfilter
TARGETTYPE=CUI
......
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
This diff is collapsed.
......@@ -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
......
......@@ -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
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -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
......@@ -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 ?
......
......@@ -37,11 +37,3 @@ TARGET=inc
# --- Targets -------------------------------------------------------
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
......@@ -38,10 +38,3 @@ TARGET=inc
.INCLUDE : target.mk
.IF "$(ENABLE_PCH)"!=""
ALLTAR : \
$(SLO)$/precompiled.pch \
$(SLO)$/precompiled_ex.pch
.ENDIF # "$(ENABLE_PCH)"!=""
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment