AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Patch 3372345: Gmake action's PCHs don't work with Mingw (Martin Ridgers)

Browse Source
This commit is contained in:
Jason Perkins 2011-10-20 16:44:09 -04:00
parent 2a0a79c243
commit 7c3716fc77
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -33,6 +33,7 @@
* Patch 3035550: Make/Distcc outputs dependencies to wrong location
* Patch 3138574: NoImportLib ignored in Windows makefiles dependencies (rjmyst3)
* Patch 3367641: Remove warnings in Xcode 4
* Patch 3372345: Gmake action's PCHs don't work with Mingw (Martin Ridgers)
-------

4
src/actions/make/make_cpp.lua
View File

@ -280,7 +280,11 @@
_p('ifneq (,$(PCH))')
_p('$(GCH): $(PCH)')
_p('\t@echo $(notdir $<)')
_p('ifeq (posix,$(SHELLTYPE))')
_p('\t-$(SILENT) cp $< $(OBJDIR)')
_p('else')
_p('\t$(SILENT) xcopy /D /Y /Q "$(subst /,\\,$<)" "$(subst /,\\,$(OBJDIR))" 1>nul')
_p('endif')
cpp.buildcommand(prj.language == "C")
_p('endif')
_p('')

8
tests/actions/make/test_make_pch.lua
View File

@ -68,7 +68,11 @@
ifneq (,$(PCH))
$(GCH): $(PCH)
@echo $(notdir $<)
ifeq (posix,$(SHELLTYPE))
-$(SILENT) cp $< $(OBJDIR)
else
$(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul
endif
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<"
endif
]]
@ -83,7 +87,11 @@ endif
ifneq (,$(PCH))
$(GCH): $(PCH)
@echo $(notdir $<)
ifeq (posix,$(SHELLTYPE))
-$(SILENT) cp $< $(OBJDIR)
else
$(SILENT) xcopy /D /Y /Q "$(subst /,\,$<)" "$(subst /,\,$(OBJDIR))" 1>nul
endif
$(SILENT) $(CC) $(CFLAGS) -o "$@" -MF $(@:%.o=%.d) -c "$<"
endif
]]