diff options
| author | 2015-09-12 11:06:14 +0200 | |
|---|---|---|
| committer | 2015-09-12 11:06:14 +0200 | |
| commit | a4ea92de249af84d723879c579ee4f4df32209de (patch) | |
| tree | af1130840fd4f03b76bd89adbf985aed568f2524 /scripts | |
| parent | 7acef624245f15f8733b5701aae68ec6b5941c65 (diff) | |
Update scripts for compile with latest BGFX (nw)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/genie.lua | 10 | ||||
| -rw-r--r-- | scripts/src/3rdparty.lua | 8 | ||||
| -rw-r--r-- | scripts/src/osd/windows.lua | 1 |
3 files changed, 8 insertions, 11 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 56a2f5126a5..0f2090e61e1 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1269,16 +1269,6 @@ configuration { "vs2010" } "/wd4481", -- warning C4481: nonstandard extension used: override specifier 'override' } -configuration { "x32", "vs*" } - libdirs { - MAME_DIR .. "3rdparty/dxsdk/lib/x86", - } - -configuration { "x64", "vs*" } - libdirs { - MAME_DIR .. "3rdparty/dxsdk/lib/x64", - } - configuration { "winphone8* or winstore8*" } removelinks { "DelayImp", 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", diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index b793b83433d..77c0398ef92 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -37,6 +37,7 @@ function maintargetosdoptions(_target,_subtarget) links { "comctl32", "comdlg32", + "psapi", } end |
