xenia-project/premake-core
1
0
Fork 0
mirror of https://github.com/xenia-project/premake-core.git synced 2024-11-30 07:00:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix makefile PCH tab problem

Browse Source
This commit is contained in:
Manu Evans 2017-11-06 17:53:59 -08:00
parent 66362c08c0
commit 0ebb85ba87
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gmake2/gmake2_cpp.lua
View File

@ -717,11 +717,11 @@
local cmd = iif(p.languages.isc(cfg.language), "$(CC) -x c-header $(ALL_CFLAGS)", "$(CXX) -x c++-header $(ALL_CXXFLAGS)")
_p('\t$(SILENT) %s -o "$@" -MF "$(@:%%.gch=%%.d)" -c "$<"', cmd)
_p('$(PCH_PLACEHOLDER): $(GCH) | $(OBJDIR)')
_p('\tifeq (posix,$(SHELLTYPE))')
_p('\t\t$(SILENT) touch "$@"')
_p('\telse')
_p('\t\t$(SILENT) echo $null >> "$@"')
_p('\tendif')
_p('ifeq (posix,$(SHELLTYPE))')
_p('\t$(SILENT) touch "$@"')
_p('else')
_p('\t$(SILENT) echo $null >> "$@"')
_p('endif')
_p('else')
_p('$(OBJECTS): | $(OBJDIR)')
_p('endif')

20
modules/gmake2/tests/test_gmake2_pch.lua
View File

@ -102,11 +102,11 @@ $(GCH): $(PCH) | $(OBJDIR)
@echo $(notdir $<)
$(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
$(PCH_PLACEHOLDER): $(GCH) | $(OBJDIR)
ifeq (posix,$(SHELLTYPE))
$(SILENT) touch "$@"
else
$(SILENT) echo $null >> "$@"
endif
ifeq (posix,$(SHELLTYPE))
$(SILENT) touch "$@"
else
$(SILENT) echo $null >> "$@"
endif
else
$(OBJECTS): | $(OBJDIR)
endif
@ -129,11 +129,11 @@ $(GCH): $(PCH) | $(OBJDIR)
@echo $(notdir $<)
$(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
$(PCH_PLACEHOLDER): $(GCH) | $(OBJDIR)
ifeq (posix,$(SHELLTYPE))
$(SILENT) touch "$@"
else
$(SILENT) echo $null >> "$@"
endif
ifeq (posix,$(SHELLTYPE))
$(SILENT) touch "$@"
else
$(SILENT) echo $null >> "$@"
endif
else
$(OBJECTS): | $(OBJDIR)
endif