summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-11-19 13:34:44 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-11-19 13:34:44 +0100
commit8a91bc9f0e345e4e562b397705e64af2efe9eb4c (patch)
tree9a20612ae9ef210bff3251cc01b54c64e9072f00 /scripts
parentb1cd05ee52ee9df18c8116eed05df9f08067eac5 (diff)
disable this for CPP11 builds (nw)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/genie.lua2
-rw-r--r--scripts/src/3rdparty.lua2
2 files changed, 4 insertions, 0 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 2c96593bb42..d8d26ebf49d 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -532,9 +532,11 @@ else
os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"].."/drivlist.cpp")
end
configuration { "gmake" }
+if _OPTIONS["CPP11"]~="1" then
defines {
"nullptr=NULL" -- getting ready for C++11
}
+end
flags {
"SingleOutputDir",
}
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 89ff4990b7e..e3d7a6be843 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -674,9 +674,11 @@ end
includedirs {
MAME_DIR .. "3rdparty/bx/include/compat/mingw",
}
+if _OPTIONS["CPP11"]~="1" then
defines {
"nullptr=NULL" -- not used but needed for C++11 code
}
+end
configuration { "osx*" }
includedirs {