AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Patch 3401184: Fix Gmake LDFLAGS generation order (Adam Petrone)

Browse Source
This commit is contained in:
Jason Perkins 2011-10-26 15:54:52 -04:00
parent ac6867c35b
commit 2fef34701e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.hgignore
View File

@ -29,4 +29,5 @@ Makefile
*.bbprojectsettings *.bbprojectsettings
Scratchpad.txt Scratchpad.txt
Unix Worksheet.worksheet Unix Worksheet.worksheet
project.bbprojectdata project.bbprojectdata
Premake4.tmproj

1
CHANGES.txt
View File

@ -36,6 +36,7 @@
* Patch 3372345: Gmake action's PCHs don't work with Mingw (Martin Ridgers) * Patch 3372345: Gmake action's PCHs don't work with Mingw (Martin Ridgers)
* Patch 3317329: Support vstudio CompileAs for mixed-language projects (xpol) * Patch 3317329: Support vstudio CompileAs for mixed-language projects (xpol)
* Patch 3337372: Improved precompiled header support (Anders Ericsson) * Patch 3337372: Improved precompiled header support (Anders Ericsson)
* Patch 3401184: Fix Gmake LDFLAGS generation order (Adam Petrone)
------- -------

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

@ -257,7 +257,10 @@
_p(' CPPFLAGS += %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), " ")) _p(' CPPFLAGS += %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), " "))
_p(' CFLAGS += $(CPPFLAGS) $(ARCH) %s', table.concat(table.join(cc.getcflags(cfg), cfg.buildoptions), " ")) _p(' CFLAGS += $(CPPFLAGS) $(ARCH) %s', table.concat(table.join(cc.getcflags(cfg), cfg.buildoptions), " "))
_p(' CXXFLAGS += $(CFLAGS) %s', table.concat(cc.getcxxflags(cfg), " ")) _p(' CXXFLAGS += $(CFLAGS) %s', table.concat(cc.getcxxflags(cfg), " "))
_p(' LDFLAGS += %s', table.concat(table.join(cc.getldflags(cfg), cfg.linkoptions, cc.getlibdirflags(cfg)), " "))
-- Patch #3401184 changed the order
_p(' LDFLAGS += %s', table.concat(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions), " "))
_p(' RESFLAGS += $(DEFINES) $(INCLUDES) %s', _p(' RESFLAGS += $(DEFINES) $(INCLUDES) %s',
table.concat(table.join(cc.getdefines(cfg.resdefines), table.concat(table.join(cc.getdefines(cfg.resdefines),
cc.getincludedirs(cfg.resincludedirs), cfg.resoptions), " ")) cc.getincludedirs(cfg.resincludedirs), cfg.resoptions), " "))