Previous 199869 Revisions Next

r40688 Saturday 12th September, 2015 at 09:06:14 UTC by Miodrag Milanović
Update scripts for compile with latest BGFX (nw)
[scripts]genie.lua
[scripts/src]3rdparty.lua
[scripts/src/osd]windows.lua
[src/osd/modules/render]drawbgfx.c

trunk/scripts/genie.lua
r249199r249200
12691269         "/wd4481", -- warning C4481: nonstandard extension used: override specifier 'override'
12701270      }
12711271
1272configuration { "x32", "vs*" }
1273      libdirs {
1274         MAME_DIR .. "3rdparty/dxsdk/lib/x86",
1275      }
1276
1277configuration { "x64", "vs*" }
1278      libdirs {
1279         MAME_DIR .. "3rdparty/dxsdk/lib/x64",
1280      }
1281
12821272configuration { "winphone8* or winstore8*" }
12831273   removelinks {
12841274      "DelayImp",
trunk/scripts/src/3rdparty.lua
r249199r249200
576576      MAME_DIR .. "3rdparty/bgfx/3rdparty",
577577      MAME_DIR .. "3rdparty/bx/include",
578578      MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
579      MAME_DIR .. "3rdparty/bgfx/3rdparty/dxsdk/include",
579580   }
580581
581582   configuration { "vs*" }
582583      includedirs {
583         MAME_DIR .. "3rdparty/dxsdk/Include",
584584         MAME_DIR .. "3rdparty/bx/include/compat/msvc",
585585      }
586586   configuration { "mingw*" }
587587      includedirs {
588588         MAME_DIR .. "3rdparty/bx/include/compat/mingw",
589589      }
590      defines {
591         "nullptr=NULL" -- not used but needed for C++11 code
592      }
590593
591594   configuration { "osx*" }
592595      includedirs {
r249199r249200
631634      MAME_DIR .. "3rdparty/bgfx/src/renderer_null.cpp",
632635      MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp",
633636      MAME_DIR .. "3rdparty/bgfx/src/renderdoc.cpp",
637      MAME_DIR .. "3rdparty/bgfx/src/shader_dxbc.cpp",
638      MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp",
639      MAME_DIR .. "3rdparty/bgfx/src/shader_spirv.cpp",
634640      MAME_DIR .. "3rdparty/bgfx/src/vertexdecl.cpp",
635641      MAME_DIR .. "3rdparty/bgfx/examples/common/bgfx_utils.cpp",
636642      MAME_DIR .. "3rdparty/bgfx/examples/common/bounds.cpp",
trunk/scripts/src/osd/windows.lua
r249199r249200
3737   links {
3838      "comctl32",
3939      "comdlg32",
40      "psapi",
4041   }
4142end
4243
trunk/src/osd/modules/render/drawbgfx.c
r249199r249200
241241#endif
242242   // This dummy draw call is here to make sure that view 0 is cleared
243243   // if no other draw calls are submitted to view 0.
244   bgfx::submit(0);
244   bgfx::touch(0);
245245
246246   window().m_primlist->acquire_lock();
247247

https://github.com/mamedev/mame/commit/a4ea92de249af84d723879c579ee4f4df32209de

Previous 199869 Revisions Next

© 1997-2024 The MAME Team