diff options
author | 2016-02-16 17:21:32 +0100 | |
---|---|---|
committer | 2016-02-16 17:21:32 +0100 | |
commit | e1ace736267d354caa3c9e1ff844bdc88d645864 (patch) | |
tree | f5e686f4c5f8030249514d024b7510fda2ec5586 /scripts/src | |
parent | c16d050d54b23309613f05868e23e2ffdcbcb27e (diff) |
opengl as requirement (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/emu.lua | 2 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 71 | ||||
-rw-r--r-- | scripts/src/osd/osdmini_cfg.lua | 1 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 2 |
4 files changed, 23 insertions, 53 deletions
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index e0358285114..e8d2abba10a 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -38,7 +38,7 @@ if _OPTIONS["with-bundled-lua"] then } end -if (_OPTIONS["targetos"] == "windows") then +if (_OPTIONS["targetos"] == "windows" and _OPTIONS["osd"] ~= "osdmini" ) then defines { "UI_WINDOWS", } diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 14d344fee09..6e0bf611844 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -77,28 +77,18 @@ function osdmodulesbuild() } end - if _OPTIONS["NO_OPENGL"]=="1" then - defines { - "USE_OPENGL=0", - } - else - files { - MAME_DIR .. "src/osd/modules/render/drawogl.cpp", - MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.cpp", - MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.cpp", - 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", - } + files { + MAME_DIR .. "src/osd/modules/render/drawogl.cpp", + MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.cpp", + MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.cpp", + 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", + } + if _OPTIONS["USE_DISPATCH_GL"]=="1" then defines { - "USE_OPENGL=1", + "USE_DISPATCH_GL=1", } - if _OPTIONS["USE_DISPATCH_GL"]=="1" then - defines { - "USE_DISPATCH_GL=1", - } - end end if USE_BGFX == 1 then @@ -257,21 +247,19 @@ end function osdmodulestargetconf() - if _OPTIONS["NO_OPENGL"]~="1" then - if _OPTIONS["targetos"]=="macosx" then + if _OPTIONS["targetos"]=="macosx" then + links { + "OpenGL.framework", + } + elseif _OPTIONS["USE_DISPATCH_GL"]~="1" then + if _OPTIONS["targetos"]=="windows" then links { - "OpenGL.framework", + "opengl32", + } + else + links { + "GL", } - elseif _OPTIONS["USE_DISPATCH_GL"]~="1" then - if _OPTIONS["targetos"]=="windows" then - links { - "opengl32", - } - else - links { - "GL", - } - end end end @@ -349,23 +337,6 @@ newoption { } newoption { - trigger = "NO_OPENGL", - description = "Disable use of OpenGL", - allowed = { - { "0", "Enable OpenGL" }, - { "1", "Disable OpenGL" }, - }, -} - -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", allowed = { diff --git a/scripts/src/osd/osdmini_cfg.lua b/scripts/src/osd/osdmini_cfg.lua index 586075d3cac..09631dcbc0b 100644 --- a/scripts/src/osd/osdmini_cfg.lua +++ b/scripts/src/osd/osdmini_cfg.lua @@ -6,7 +6,6 @@ defines { "USE_QTDEBUG=0", "USE_SDL", "SDLMAME_NOASM=1", - "USE_OPENGL=0", "NO_USE_MIDI=1", "USE_XAUDIO2=0", } diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index bdeb7274ef1..0eb5a9333f2 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -12,7 +12,7 @@ if SDL_NETWORK~="" and not _OPTIONS["DONT_USE_NETWORK"] then } end -if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then +if _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then includedirs { path.join(_OPTIONS["MESA_INSTALL_ROOT"],"include"), } |