summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/genie/src/actions/make/make_cpp.lua
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/genie/src/actions/make/make_cpp.lua')
-rw-r--r--3rdparty/genie/src/actions/make/make_cpp.lua13
1 files changed, 5 insertions, 8 deletions
diff --git a/3rdparty/genie/src/actions/make/make_cpp.lua b/3rdparty/genie/src/actions/make/make_cpp.lua
index d4f5c3b351a..4492ac2bbd2 100644
--- a/3rdparty/genie/src/actions/make/make_cpp.lua
+++ b/3rdparty/genie/src/actions/make/make_cpp.lua
@@ -5,7 +5,7 @@
--
premake.make.cpp = { }
- premake.make.undefine = { }
+ premake.make.override = { }
local cpp = premake.make.cpp
local make = premake.make
@@ -174,10 +174,7 @@
_p(' config=%s', _MAKE.esc(premake.getconfigname(prj.solution.configurations[1], platforms[1], true)))
_p('endif')
_p('')
- for _, variable in ipairs(premake.make.undefine) do
- _p('override undefine '.. variable)
- end
- _p('')
+
_p('ifndef verbose')
_p(' SILENT = @')
_p('endif')
@@ -228,9 +225,9 @@
-- if this platform requires a special compiler or linker, list it here
cpp.platformtools(cfg, cc)
- _p(' OBJDIR = %s', _MAKE.esc(cfg.objectsdir))
- _p(' TARGETDIR = %s', _MAKE.esc(cfg.buildtarget.directory))
- _p(' TARGET = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))
+ _p(' ' .. (table.contains(premake.make.override,"OBJDIR") and "override " or "") .. 'OBJDIR = %s', _MAKE.esc(cfg.objectsdir))
+ _p(' ' .. (table.contains(premake.make.override,"TARGETDIR") and "override " or "") .. 'TARGETDIR = %s', _MAKE.esc(cfg.buildtarget.directory))
+ _p(' ' .. (table.contains(premake.make.override,"TARGET") and "override " or "") .. 'TARGET = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))
_p(' DEFINES +=%s', make.list(cc.getdefines(cfg.defines)))
_p(' INCLUDES +=%s', make.list(cc.getincludedirs(cfg.includedirs)))