summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-16 18:00:19 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-16 18:00:19 +0100
commit38e054c76552c1b4c1598a489b4bacf614f0949d (patch)
treece3ecb6be5947909ce8b83c7632d34eb69d1f7ac /scripts/src
parent9eb2734495cda6ff0391f317ca2565b421476738 (diff)
placed back OPENGL check since GL is not same as GLES (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/emu.lua2
-rw-r--r--scripts/src/osd/modules.lua62
-rw-r--r--scripts/src/osd/osdmini_cfg.lua1
-rw-r--r--scripts/src/osd/sdl_cfg.lua2
4 files changed, 44 insertions, 23 deletions
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index e8d2abba10a..e0358285114 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" and _OPTIONS["osd"] ~= "osdmini" ) then
+if (_OPTIONS["targetos"] == "windows") then
defines {
"UI_WINDOWS",
}
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index c3d4d3a117d..8e55ae2d8d3 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -77,18 +77,27 @@ function osdmodulesbuild()
}
end
- 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
+ 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",
+ }
defines {
- "USE_DISPATCH_GL=1",
+ "USE_OPENGL=1",
}
+ if _OPTIONS["USE_DISPATCH_GL"]=="1" then
+ defines {
+ "USE_DISPATCH_GL=1",
+ }
+ end
end
files {
@@ -242,19 +251,21 @@ end
function osdmodulestargetconf()
- if _OPTIONS["targetos"]=="macosx" then
- links {
- "OpenGL.framework",
- }
- elseif _OPTIONS["USE_DISPATCH_GL"]~="1" then
- if _OPTIONS["targetos"]=="windows" then
- links {
- "opengl32",
- }
- else
+ if _OPTIONS["NO_OPENGL"]~="1" then
+ if _OPTIONS["targetos"]=="macosx" then
links {
- "GL",
+ "OpenGL.framework",
}
+ elseif _OPTIONS["USE_DISPATCH_GL"]~="1" then
+ if _OPTIONS["targetos"]=="windows" then
+ links {
+ "opengl32",
+ }
+ else
+ links {
+ "GL",
+ }
+ end
end
end
@@ -332,6 +343,15 @@ newoption {
}
newoption {
+ trigger = "NO_OPENGL",
+ description = "Disable use of OpenGL",
+ allowed = {
+ { "0", "Enable OpenGL" },
+ { "1", "Disable OpenGL" },
+ },
+}
+
+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 09631dcbc0b..586075d3cac 100644
--- a/scripts/src/osd/osdmini_cfg.lua
+++ b/scripts/src/osd/osdmini_cfg.lua
@@ -6,6 +6,7 @@ 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 0eb5a9333f2..bdeb7274ef1 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["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then
+if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS["MESA_INSTALL_ROOT"] then
includedirs {
path.join(_OPTIONS["MESA_INSTALL_ROOT"],"include"),
}