diff options
| author | 2015-12-03 12:04:08 +0100 | |
|---|---|---|
| committer | 2015-12-03 12:04:08 +0100 | |
| commit | 6bea96d5f22546a2973a67d1cd72fcced8acb894 (patch) | |
| tree | f49a59b4ce77a00950848b79fa7695ed008a11c9 /scripts | |
| parent | b9e242db21c395b8597b3c04da5d61206c365383 (diff) | |
enabled compiling part of bgfx that required c++11 (nw)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/src/3rdparty.lua | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 34dc213cc7d..773a6f9384c 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -674,11 +674,6 @@ 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 { @@ -745,7 +740,7 @@ end MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_buffer_manager.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_metrics.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/font/utf8.cpp", - --MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp", + MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp", } |
