diff options
| -rw-r--r-- | .hgignore | 3 | ||||
| -rw-r--r-- | CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/actions/make/make_cpp.lua | 5 |
3 files changed, 7 insertions, 2 deletions
@@ -29,4 +29,5 @@ Makefile *.bbprojectsettings Scratchpad.txt Unix Worksheet.worksheet -project.bbprojectdata
\ No newline at end of file +project.bbprojectdata +Premake4.tmproj
\ No newline at end of file diff --git a/CHANGES.txt b/CHANGES.txt index 65ed451..9d48fa8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -36,6 +36,7 @@ * Patch 3372345: Gmake action's PCHs don't work with Mingw (Martin Ridgers) * Patch 3317329: Support vstudio CompileAs for mixed-language projects (xpol) * Patch 3337372: Improved precompiled header support (Anders Ericsson) +* Patch 3401184: Fix Gmake LDFLAGS generation order (Adam Petrone) ------- diff --git a/src/actions/make/make_cpp.lua b/src/actions/make/make_cpp.lua index 75d2ced..f50eb93 100644 --- a/src/actions/make/make_cpp.lua +++ b/src/actions/make/make_cpp.lua @@ -257,7 +257,10 @@ _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(' 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', table.concat(table.join(cc.getdefines(cfg.resdefines), cc.getincludedirs(cfg.resincludedirs), cfg.resoptions), " ")) |