diff options
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Executable.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 91 | ||||
| -rw-r--r-- | solenv/gbuild/PrecompiledHeaders.mk | 78 | ||||
| -rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 93 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 45 | ||||
| -rw-r--r-- | solenv/gbuild/templates/Library.mk | 4 |
11 files changed, 2 insertions, 327 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 25859843602d..afae72e17b09 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -207,7 +207,6 @@ $(eval $(foreach method,\ add_asmobject \ add_asmobjects \ add_package_headers \ - add_precompiled_header \ add_sdi_headers \ add_cflags \ set_cflags \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 786e7422c4ff..60841a0a20d9 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -106,7 +106,6 @@ $(eval $(foreach method,\ use_externals \ add_package_headers \ add_sdi_headers \ - add_precompiled_header \ add_nativeres \ ,\ $(call gb_Executable_forward_to_Linktarget,$(method))\ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 7c55ec024eec..82daae1d97a6 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -148,7 +148,6 @@ $(eval $(foreach method,\ use_externals \ add_package_headers \ add_sdi_headers \ - add_precompiled_header \ export_objects_list \ add_nativeres \ ,\ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 96d5cc763641..c094bb424b54 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -64,9 +64,8 @@ endif # LinkTarget/headers # LinkTarget/dep joined dep file AsmObject/dep CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep ObjCxxObject/dep # | LinkTarget/headers -# LinkTarget/headers all headers available LinkTarget/external_headers PCH +# LinkTarget/headers all headers available LinkTarget/external_headers # including own generated own generated headers -# PCH precompiled headers (win) LinkTarget/external_headers # LinkTarget/external_headers all external headers avail. header files of linked libs # # CObject plain c compile | LinkTarget/headers @@ -144,42 +143,12 @@ gb_CxxObject_get_source = $(1)/$(2).cxx # defined by platform # gb_CxxObject__command -# Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget) -# are the same as the T_CXXFLAGS and DEFS we want to use for this object. This -# should usually be the case. The DEFS/T_CXXFLAGS would have too be manually -# overridden for one object file for them to differ. PCH_CXXFLAGS/PCH_DEFS -# should never be overridden on an object -- they should be the same as for the -# whole linktarget. In general it should be cleaner to use a static library -# compiled with different flags and link that in rather than mixing different -# flags in one linktarget. -define gb_CxxObject__set_pchflags -ifeq ($(gb_ENABLE_PCH),$(true)) -ifneq ($(strip $$(PCH_NAME)),) -ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS))) -$$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME)) -else -ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS))) -$$@ : PCHFLAGS := $$(call gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME)) -else -$$(info No precompiled header available for $$*.) -$$(info precompiled header flags ( ex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_EXCEPTIONFLAGS))) -$$(info precompiled header flags (noex) : $$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) $$(gb_LinkTarget_NOEXCEPTIONFLAGS))) -$$(info . object flags : $$(sort $$(T_CXXFLAGS) $$(DEFS))) -$$@ : PCHFLAGS := -endif -endif -endif -endif -endef - $(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SRCDIR),%) - $(eval $(gb_CxxObject__set_pchflags)) $(call gb_CxxObject__command,$@,$*,$<,$(call gb_CxxObject_get_dep_target,$*)) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_CxxObject_get_dep_target,%) : $(call gb_CxxObject_get_target,%) $(if $(wildcard $@),touch $@,\ - $(eval $(gb_CxxObject__set_pchflags))\ $(call gb_Object__command_dep,$@,$(call gb_CxxObject_get_target,$*))) endif @@ -445,9 +414,6 @@ $(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_h # Explanation of some of the variables: # - AUXTARGETS are the additionally generated files that need to be cleaned out # on clean. -# - PCH_CXXFLAGS and PCH_DEFS are the flags that the precompiled headers will -# be compiled with. They should never be overridden in a single object -# files. # - TARGETTYPE is the type of linktarget as some platforms need very different # command to link different targettypes. # @@ -486,15 +452,11 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS) $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS) $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS) $(OBJCFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) -$(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) @@ -504,9 +466,6 @@ $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := $(call gb_LinkTarget_get_target,$(1)) : LIBS := $(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := -$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS := -$(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : PDBFILE := $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS := $(call gb_LinkTarget_get_target,$(1)) : NATIVERES := @@ -523,16 +482,13 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : YACCOBJECTS := $(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) $(CFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS) $(OBJCFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : T_YACCFLAGS := $$(gb_LinkTarget_YYACFLAGS) $(YACCFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME := $(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS := endif @@ -541,11 +497,8 @@ endef define gb_LinkTarget_add_defs $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS += $(2) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS += $(2) endif endef @@ -556,12 +509,9 @@ $$(call gb_Output_error,\ else $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : DEFS := $(2) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $(2) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $(2) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $(2) endif endif @@ -591,11 +541,8 @@ endef define gb_LinkTarget_add_cxxflags $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS += $(2) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS += $(2) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2) endif endef @@ -606,11 +553,8 @@ $$(call gb_Output_error,\ else $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $(2) -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $(2) ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $(2) -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $(2) endif endif @@ -972,39 +916,6 @@ $(call gb_LinkTarget__add_internal_headers,$(1),$(foreach sdi,$(2),$(call gb_Sdi $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach sdi,$(2),$(call gb_SdiTarget_get_clean_target,$(sdi))) endef -define gb_LinkTarget__add_precompiled_header_impl -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_PrecompiledHeader_get_target,$(3))) -$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_PrecompiledHeader_get_clean_target,$(3)) -$(call gb_PrecompiledHeader_get_target,$(3)) : $(2).cxx - -$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_NoexPrecompiledHeader_get_target,$(3))) -$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_NoexPrecompiledHeader_get_clean_target,$(3)) -$(call gb_NoexPrecompiledHeader_get_target,$(3)) : $(2).cxx - -$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3) -$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $(call gb_PrecompiledHeader_get_target,$(3)).obj $(call gb_NoexPrecompiledHeader_get_target,$(3)).obj - -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS = $$(DEFS) -ifeq ($(gb_FULLDEPS),$(true)) --include \ - $(call gb_PrecompiledHeader_get_dep_target,$(3)) \ - $(call gb_NoexPrecompiledHeader_get_dep_target,$(3)) -$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(DEFS) -DPRECOMPILED_HEADERS -$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS = $$(DEFS) -endif - -endef - -define gb_LinkTarget_add_precompiled_header -ifeq ($(gb_ENABLE_PCH),$(true)) -$(call gb_LinkTarget__add_precompiled_header_impl,$(1),$(2),$(notdir $(2))) -endif - -endef - define gb_LinkTarget_add_external_headers $(call gb_LinkTarget_get_headers_target,$(1) : |$(call gb_Package_get_target,$(2))) endef diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk deleted file mode 100644 index 9e32630f492e..000000000000 --- a/solenv/gbuild/PrecompiledHeaders.mk +++ /dev/null @@ -1,78 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -# PrecompiledHeader class - -ifeq ($(gb_ENABLE_PCH),$(true)) - -# gb_PrecompiledHeader_get_enableflags defined by platform -ifeq ($(gb_DEBUGLEVEL),2) -gb_PrecompiledHeader_DEBUGDIR := debug -gb_NoexPrecompiledHeader_DEBUGDIR := debug -else -gb_PrecompiledHeader_DEBUGDIR := nodebug -gb_NoexPrecompiledHeader_DEBUGDIR := nodebug -endif - -$(call gb_PrecompiledHeader_get_dep_target,%) : - $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $@) && \ - echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@) - -$(call gb_NoexPrecompiledHeader_get_dep_target,%) : - $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $@) && \ - echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@) - -$(call gb_PrecompiledHeader_get_target,%) : - $(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE)) - -$(call gb_NoexPrecompiledHeader_get_target,%) : - $(call gb_NoexPrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE)) - -.PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_NoExPrecompiledHeader_get_clean_target,%) -$(call gb_PrecompiledHeader_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),PCH,1) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_PrecompiledHeader_get_target,$*) \ - $(call gb_PrecompiledHeader_get_target,$*).obj \ - $(call gb_PrecompiledHeader_get_target,$*).pdb \ - $(call gb_PrecompiledHeader_get_dep_target,$*)) - - -$(call gb_NoexPrecompiledHeader_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),PCH,1) - -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_NoexPrecompiledHeader_get_target,$*) \ - $(call gb_NoexPrecompiledHeader_get_target,$*).obj \ - $(call gb_NoexPrecompiledHeader_get_target,$*).pdb \ - $(call gb_NoexPrecompiledHeader_get_dep_target,$*)) -endif - -# vim: set noet sw=4: diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index c71847786cdd..23ceef49d62b 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -113,7 +113,6 @@ $(eval $(foreach method,\ use_externals \ add_package_headers \ add_sdi_headers \ - add_precompiled_header \ ,\ $(call gb_StaticLibrary_forward_to_Linktarget,$(method))\ )) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index afd79ba48aa6..20af9ebdc61c 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -99,14 +99,10 @@ gb_LinkTarget_get_objects_list = $(WORKDIR)/LinkTarget/$(1).objectlist gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1) gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1) gb_Module_get_target = $(WORKDIR)/Module/$(1) -gb_NoexPrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d -gb_NoexPrecompiledHeader_get_target = $(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR)/$(1).hxx.pch gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1) gb_Package_get_target = $(WORKDIR)/Package/$(1) -gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d -gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1) gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst @@ -161,10 +157,8 @@ $(eval $(call gb_Helper_make_clean_targets,\ JunitTest \ LinkTarget \ Module \ - NoexPrecompiledHeader \ PackagePart \ Package \ - PrecompiledHeader \ Pyuno \ RdbTarget \ ResTarget \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 0d0bad3c0475..03f395af2dbc 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -116,12 +116,6 @@ ifneq ($(gb_DEBUGLEVEL),0) gb_SYMBOL := $(true) endif -ifneq ($(strip $(ENABLE_PCH)),) -gb_ENABLE_PCH := $(true) -else -gb_ENABLE_PCH := $(false) -endif - # for clean, setuplocal and removelocal goals we switch off dependencies ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables help debugrun,$(MAKECMDGOALS)),) gb_FULLDEPS := $(false) @@ -282,7 +276,6 @@ include $(foreach class, \ Package \ CustomTarget \ ExternalLib \ - PrecompiledHeaders \ Pyuno \ RdbTarget \ CppunitTest \ @@ -396,7 +389,6 @@ INTERACTIVE VARIABLES: 3... = symbols + no optimizations + extra debug output (usually extremely verbose). Levels > 2 are not used very much. - ENABLE_PCH If not empty, use precompiled headers (Windows only). YACCFLAGS Add as flags for YACC parser generator invocation. CPPFLAGS Add as preprocessor flags for C/C++/ObjC/ObjC++ compilation. CFLAGS Add as compiler flags for plain C compilation. diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 6c50a9cbe18a..688d53dc8e63 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -88,11 +88,6 @@ endif gb_LinkTarget_EXCEPTIONFLAGS += \ -fno-enforce-eh-specs \ -gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) - - -gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS) - gb_LinkTarget_LDFLAGS := \ -Wl,--export-all-symbols \ -Wl,--enable-stdcall-fixup \ @@ -139,94 +134,6 @@ $(call gb_Helper_abbreviate_dirs,\ endef -# PrecompiledHeader class - -gb_PrecompiledHeader_EXT := .gch - -gb_PrecompiledHeader_get_enableflags = -I$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR) \ - -DPRECOMPILED_HEADERS \ - -Winvalid-pch \ - -ifeq ($(gb_FULLDEPS),$(true)) -define gb_PrecompiledHeader__command_deponcompile -$(call gb_Helper_abbreviate_dirs,\ - $(OUTDIR_FOR_BUILD)/bin/makedepend \ - $(4) $(5) \ - -I$(dir $(3)) \ - $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \ - $(3) \ - -f - \ - | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ - -v OBJECTFILE=$(1) \ - -v OUTDIR=$(OUTDIR)/ \ - -v WORKDIR=$(WORKDIR)/ \ - -v SRCDIR=$(SRCDIR)/ \ - -v REPODIR=$(REPODIR)/ \ - > $(call gb_PrecompiledHeader_get_dep_target,$(2))) -endef -else -gb_PrecompiledHeader__command_deponcompile = -endif - -define gb_PrecompiledHeader__command -$(call gb_Output_announce,$(2),$(true),PCH,1) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \ - $(gb_CXX) \ - -x c++-header \ - $(4) $(5) \ - -I$(dir $(3)) \ - $(6) \ - -c $(3) \ - -o$(1)) -$(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) - -endef - -# NoexPrecompiledHeader class - -gb_NoexPrecompiledHeader_EXT := .gch - -gb_NoexPrecompiledHeader_get_enableflags = -I$(WORKDIR)/NoexPrecompiledHeader/$(gb_NoexPrecompiledHeader_DEBUGDIR) \ - -Winvalid-pch \ - -ifeq ($(gb_FULLDEPS),$(true)) -define gb_NoexPrecompiledHeader__command_deponcompile -$(call gb_Helper_abbreviate_dirs,\ - $(OUTDIR_FOR_BUILD)/bin/makedepend \ - $(4) $(5) \ - -I$(dir $(3)) \ - $(filter-out -I$(COMPATH)% -I$(JAVA_HOME),$(6)) \ - $(3) \ - -f - \ - | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ - -v OBJECTFILE=$(1) \ - -v OUTDIR=$(OUTDIR)/ \ - -v WORKDIR=$(WORKDIR)/ \ - -v SRCDIR=$(SRCDIR)/ \ - -v REPODIR=$(REPODIR)/ \ - > $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) -endef -else -gb_NoexPrecompiledHeader__command_deponcompile = -endif - -define gb_NoexPrecompiledHeader__command -$(call gb_Output_announce,$(2),$(true),PCH,1) -$(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \ - $(gb_CXX) \ - -x c++-header \ - $(4) $(5) \ - -I$(dir $(3)) \ - $(6) \ - -c $(3) \ - -o$(1)) -$(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6)) - -endef - - # AsmObject class gb_AsmObject_get_source = $(1)/$(2).s diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 16694b34a1b4..3051f5d1f407 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -204,14 +204,9 @@ gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ -EHa \ -gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) - - gb_LinkTarget_NOEXCEPTIONFLAGS := \ -DEXCEPTIONS_OFF \ -gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS) - gb_LinkTarget_LDFLAGS := \ -MACHINE:IX86 \ -MANIFEST \ @@ -294,7 +289,6 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(DEFS) \ $(T_CFLAGS) \ -Fd$(PDBFILE) \ - $(PCHFLAGS) \ $(gb_COMPILERDEPFLAGS) \ -I$(realpath $(dir $(3))) \ $(INCLUDE) \ @@ -313,7 +307,6 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(DEFS) \ $(T_CXXFLAGS) \ -Fd$(PDBFILE) \ - $(PCHFLAGS) \ $(gb_COMPILERDEPFLAGS) \ -I$(realpath $(dir $(3))) \ $(INCLUDE_STL) $(INCLUDE) \ @@ -322,42 +315,6 @@ $(call gb_Helper_abbreviate_dirs_native,\ endef -# PrecompiledHeader class - -gb_PrecompiledHeader_get_enableflags = -Yu$(1).hxx \ - -Fp$(call gb_PrecompiledHeader_get_target,$(1)) - -define gb_PrecompiledHeader__command -$(call gb_Output_announce,$(2),$(true),PCH,1) -$(call gb_Helper_abbreviate_dirs_native,\ - mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \ - $(gb_CXX) \ - $(4) $(5) -Fd$(PDBFILE) \ - $(gb_COMPILERDEPFLAGS) \ - -I$(realpath $(dir $(3))) \ - $(6) \ - -c $(realpath $(3)) \ - -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(1),$(call gb_PrecompiledHeader_get_dep_target,$(2)),$(realpath $(3))) -endef - -# NoexPrecompiledHeader class - -gb_NoexPrecompiledHeader_get_enableflags = -Yu$(1).hxx \ - -Fp$(call gb_NoexPrecompiledHeader_get_target,$(1)) - -define gb_NoexPrecompiledHeader__command -$(call gb_Output_announce,$(2),$(true),PCH,1) -$(call gb_Helper_abbreviate_dirs_native,\ - mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \ - $(gb_CXX) \ - $(4) $(5) -Fd$(PDBFILE) \ - $(gb_COMPILERDEPFLAGS) \ - -I$(realpath $(dir $(3))) \ - $(6) \ - -c $(realpath $(3)) \ - -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(1),$(call gb_NoexPrecompiledHeader,$(2)),$(realpath $(3))) -endef - # AsmObject class gb_AsmObject_get_source = $(1)/$(2).asm @@ -396,7 +353,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \ - $(PCHOBJS) $(NATIVERES))) && \ + $(NATIVERES))) && \ $(gb_LINK) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \ diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk index 249bbdfced2c..164617b28349 100644 --- a/solenv/gbuild/templates/Library.mk +++ b/solenv/gbuild/templates/Library.mk @@ -35,10 +35,6 @@ $(eval $(call gb_Library_Library,LIB)) # learn more about TYPE in the Package.mk template $(eval $(call gb_Library_add_package_headers,LIB,MODULE_TYPE)) -# for platforms supporting PCH: declare the location of the pch file -# this is the name of the cxx file (without extension) -$(eval $(call gb_Library_add_precompiled_header,LIB,$(SRCDIR)/MODULE/PCH_FILE)) - # in case UNO services are exported: declare location of component file $(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE)) |