diff options
| author | Oliver Schneider <oliver@assarbad.net> | 2015-11-09 01:03:49 +0300 |
|---|---|---|
| committer | Oliver Schneider <oliver@assarbad.net> | 2015-11-09 01:03:49 +0300 |
| commit | 35861301093da54e4b7f5112c0660a678467c92f (patch) | |
| tree | 507760552cf2bf3f60be42f674130c07779328d2 /src/actions | |
| parent | 8f7c5ef2c61da06038f4d8314af64b4b548757b5 (diff) | |
| parent | c04a1a0f6c98c119febb3e1ac479dfe38dcaa279 (diff) | |
Merge with upstream
--HG--
branch : WDS-build
Diffstat (limited to 'src/actions')
| -rw-r--r-- | src/actions/make/make_cpp.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/actions/make/make_cpp.lua b/src/actions/make/make_cpp.lua index 4caf055..2761810 100644 --- a/src/actions/make/make_cpp.lua +++ b/src/actions/make/make_cpp.lua @@ -239,7 +239,7 @@ _p(' ALL_CPPFLAGS += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), " ")) - _p(' ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions))) + _p(' ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions))) _p(' ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CFLAGS)%s', make.list(cc.getcxxflags(cfg))) _p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s', @@ -274,7 +274,7 @@ -- $(LIBS) moved to end (http://sourceforge.net/p/premake/bugs/279/) local tool = iif(cfg.language == "C", "CC", "CXX") - _p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)', tool) + _p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)', tool) end end @@ -358,5 +358,5 @@ function cpp.buildcommand(iscfile, objext) local flags = iif(iscfile, '$(CC) $(ALL_CFLAGS)', '$(CXX) $(ALL_CXXFLAGS)') - _p('\t$(SILENT) %s $(FORCE_INCLUDE) -o "$@" -MF $(@:%%.%s=%%.d) -c "$<"', flags, objext) + _p('\t$(SILENT) %s $(FORCE_INCLUDE) -o "$@" -MF "$(@:%%.%s=%%.d)" -c "$<"', flags, objext) end |