From 8a91bc9f0e345e4e562b397705e64af2efe9eb4c Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 19 Nov 2015 13:34:44 +0100
Subject: [PATCH] disable this for CPP11 builds (nw)

---
 scripts/genie.lua        | 2 ++
 scripts/src/3rdparty.lua | 2 ++
 2 files changed, 4 insertions(+)

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 {