Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 05:13:46 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

disable this for CPP11 builds (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-11-19 13:34:44 +01:00
parent b1cd05ee52
commit 8a91bc9f0e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/genie.lua
View File

@ -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") 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 end
configuration { "gmake" } configuration { "gmake" }
if _OPTIONS["CPP11"]~="1" then
defines { defines {
"nullptr=NULL" -- getting ready for C++11 "nullptr=NULL" -- getting ready for C++11
} }
end
flags { flags {
"SingleOutputDir", "SingleOutputDir",
} }

2
scripts/src/3rdparty.lua
View File

@ -674,9 +674,11 @@ end
includedirs { includedirs {
MAME_DIR .. "3rdparty/bx/include/compat/mingw", MAME_DIR .. "3rdparty/bx/include/compat/mingw",
} }
if _OPTIONS["CPP11"]~="1" then
defines { defines {
"nullptr=NULL" -- not used but needed for C++11 code "nullptr=NULL" -- not used but needed for C++11 code
} }
end
configuration { "osx*" } configuration { "osx*" }
includedirs { includedirs {