diff options
author | 2016-02-21 11:48:45 +0100 | |
---|---|---|
committer | 2016-02-21 11:48:45 +0100 | |
commit | cc24a339d8c0517259084b5c178d784626ba965c (patch) | |
tree | 9868e9687b5802ae0a3733712a3bbeb3bc75c953 /scripts/src/osd/modules.lua | |
parent | b5daabda5495dea5c50e17961ecfed2ea8619d76 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'scripts/src/osd/modules.lua')
-rw-r--r-- | scripts/src/osd/modules.lua | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 87e684a50f6..ea70ca132de 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -89,7 +89,6 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.h", MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.h", MAME_DIR .. "src/osd/modules/opengl/osd_opengl.h", - MAME_DIR .. "src/osd/modules/opengl/SDL1211_opengl.h", } defines { "USE_OPENGL=1", @@ -101,18 +100,15 @@ function osdmodulesbuild() end end - if USE_BGFX == 1 then - files { - MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp", - } - defines { - "USE_BGFX" - } - includedirs { - MAME_DIR .. "3rdparty/bgfx/include", - MAME_DIR .. "3rdparty/bx/include", - } - end + files { + MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp", + MAME_DIR .. "src/osd/modules/render/binpacker.cpp", + } + includedirs { + MAME_DIR .. "3rdparty/bgfx/include", + MAME_DIR .. "3rdparty/bx/include", + MAME_DIR .. "3rdparty/rapidjson/include", + } if _OPTIONS["NO_USE_MIDI"]=="1" then defines { @@ -356,14 +352,6 @@ newoption { }, } -if not _OPTIONS["NO_OPENGL"] then - if _OPTIONS["targetos"]=="os2" then - _OPTIONS["NO_OPENGL"] = "1" - else - _OPTIONS["NO_OPENGL"] = "0" - end -end - newoption { trigger = "USE_DISPATCH_GL", description = "Use GL-dispatching", @@ -374,11 +362,7 @@ newoption { } if not _OPTIONS["USE_DISPATCH_GL"] then - if USE_BGFX == 1 then - _OPTIONS["USE_DISPATCH_GL"] = "0" - else - _OPTIONS["USE_DISPATCH_GL"] = "1" - end + _OPTIONS["USE_DISPATCH_GL"] = "0" end newoption { |