more work on pch

solenv/gbuild/pch.mk

@@ -37,7 +37,8 @@ else
 gb_PrecompiledHeader_DEBUGDIR := nodebug
 endif
 
-$(call gb_PrecompiledHeader_get_target,%) :
+$(call gb_PrecompiledHeader_get_target,%) \
+$(call gb_PrecompiledHeader_get_noex_target,%) :
 	$(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(PCH_EXCEPTIONFLAGS),$(INCLUDE_STL) $(INCLUDE))
 
 .PHONY : $(call gb_PrecompiledHeader_get_clean_target,%)

solenv/gbuild/platform/windows.mk

@@ -262,9 +262,9 @@ endef
 gb_PrecompiledHeader_get_enableflags = -Yu$(patsubst %.pch,%,$(notdir $(1))) -Fp$(1)
 
 define gb_PrecompiledHeader__command
-$(call gb_Helper_announce,Compiling pch $(1) ...)
+$(call gb_Helper_announce,Compiling pch $(3) ...)
 $(call gb_Helper_abbreviate_dirs_native,\
-	mkdir -p $(dir $(1)) && \
+	mkdir -p $(dir $(1)) $(dir $(subst PrecompiledHeader,Dep/PrecompiledHeader,$(1)).d) && \
 	C="$(gb_CXX) \
 		$(4) $(5) \
 		-I$(dir $(3)) \
@@ -272,8 +272,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		-c $(3) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1)" && \
 	E=$$($$C) || (R=$$? && echo $$C && echo $$E 1>&2 && $$(exit $$R)))
-endef
-#$(call gb_Helper_abbreviate_dirs_native,\
+$(call gb_Helper_abbreviate_dirs_native,\
 	$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
 		$(4) $(5) \
 		-I$(dir $(3)) \
@@ -285,7 +284,8 @@ endef
 		-v OUTDIR=$(OUTDIR)/ \
 		-v WORKDIR=$(WORKDIR)/ \
 		-v SRCDIR=$(SRCDIR)/ \
-	> $(call gb_PrecompiledHeader_get_dep_target,$(1)))
+	> $(subst PrecompiledHeader,Dep/PrecompiledHeader,$(1)).d)
+endef
 
 # LinkTarget class
 

solenv/gbuild/target_names.mk

@@ -79,7 +79,7 @@ gb_AllLangResTarget_get_target = $(OUTDIR)/misc/AllLangRes/$(1)
 gb_PackagePart_get_target = $(OUTDIR)/$(1)
 gb_Package_get_target = $(OUTDIR)/misc/Package/$(1)
 gb_Module_get_target = $(OUTDIR)/misc/Module/$(1)
-gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/ex/$(1).hxx.pch
 gb_PrecompiledHeader_get_noex_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/noex/$(1).hxx.pch
 
 $(eval $(call gb_Helper_make_clean_targets,\