From a4ea92de249af84d723879c579ee4f4df32209de Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 12 Sep 2015 11:06:14 +0200 Subject: Update scripts for compile with latest BGFX (nw) --- scripts/src/3rdparty.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts/src/3rdparty.lua') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 6f8a1f2b323..495a3cf4e7f 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -576,17 +576,20 @@ project "bgfx" MAME_DIR .. "3rdparty/bgfx/3rdparty", MAME_DIR .. "3rdparty/bx/include", MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", + MAME_DIR .. "3rdparty/bgfx/3rdparty/dxsdk/include", } configuration { "vs*" } includedirs { - MAME_DIR .. "3rdparty/dxsdk/Include", MAME_DIR .. "3rdparty/bx/include/compat/msvc", } configuration { "mingw*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/mingw", } + defines { + "nullptr=NULL" -- not used but needed for C++11 code + } configuration { "osx*" } includedirs { @@ -631,6 +634,9 @@ project "bgfx" MAME_DIR .. "3rdparty/bgfx/src/renderer_null.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderdoc.cpp", + MAME_DIR .. "3rdparty/bgfx/src/shader_dxbc.cpp", + MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp", + MAME_DIR .. "3rdparty/bgfx/src/shader_spirv.cpp", MAME_DIR .. "3rdparty/bgfx/src/vertexdecl.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/bgfx_utils.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/bounds.cpp", -- cgit v1.2.3