summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/osd
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src/osd')
-rw-r--r--scripts/src/osd/modules.lua36
-rw-r--r--scripts/src/osd/osdmini.lua2
-rw-r--r--scripts/src/osd/osdmini_cfg.lua2
-rw-r--r--scripts/src/osd/sdl.lua123
-rw-r--r--scripts/src/osd/sdl_cfg.lua36
-rw-r--r--scripts/src/osd/windows.lua1
-rw-r--r--scripts/src/osd/windows_cfg.lua2
7 files changed, 122 insertions, 80 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index ea70ca132de..87e684a50f6 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -89,6 +89,7 @@ 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",
@@ -100,15 +101,18 @@ function osdmodulesbuild()
end
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 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
if _OPTIONS["NO_USE_MIDI"]=="1" then
defines {
@@ -352,6 +356,14 @@ 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",
@@ -362,7 +374,11 @@ newoption {
}
if not _OPTIONS["USE_DISPATCH_GL"] then
- _OPTIONS["USE_DISPATCH_GL"] = "0"
+ if USE_BGFX == 1 then
+ _OPTIONS["USE_DISPATCH_GL"] = "0"
+ else
+ _OPTIONS["USE_DISPATCH_GL"] = "1"
+ end
end
newoption {
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index b05839e7873..803b7413014 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -79,7 +79,6 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp",
MAME_DIR .. "src/osd/modules/sound/none.cpp",
- MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp",
}
project ("ocore_" .. _OPTIONS["osd"])
@@ -125,6 +124,7 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/osdmini/minidir.cpp",
MAME_DIR .. "src/osd/osdmini/minifile.cpp",
MAME_DIR .. "src/osd/osdmini/minimisc.cpp",
+ MAME_DIR .. "src/osd/osdmini/minisync.cpp",
MAME_DIR .. "src/osd/osdmini/minitime.cpp",
MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
}
diff --git a/scripts/src/osd/osdmini_cfg.lua b/scripts/src/osd/osdmini_cfg.lua
index 586075d3cac..ff9539066b2 100644
--- a/scripts/src/osd/osdmini_cfg.lua
+++ b/scripts/src/osd/osdmini_cfg.lua
@@ -7,6 +7,4 @@ defines {
"USE_SDL",
"SDLMAME_NOASM=1",
"USE_OPENGL=0",
- "NO_USE_MIDI=1",
- "USE_XAUDIO2=0",
}
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index b89a25814ad..6acb5a2d262 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -39,23 +39,29 @@ function maintargetosdoptions(_target,_subtarget)
end
if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" then
- links {
- "SDL2_ttf",
- }
+ if _OPTIONS["SDL_LIBVER"]=="sdl2" then
+ links {
+ "SDL2_ttf",
+ }
+ else
+ links {
+ "SDL_ttf",
+ }
+ end
local str = backtick("pkg-config --libs fontconfig")
addlibfromstring(str)
addoptionsfromstring(str)
end
if _OPTIONS["targetos"]=="windows" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
+ if _OPTIONS["SDL_LIBVER"]=="sdl2" then
links {
"SDL2.dll",
}
else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
+ links {
+ "SDL.dll",
+ }
end
links {
"psapi",
@@ -87,21 +93,16 @@ function maintargetosdoptions(_target,_subtarget)
configuration { "mingw*" or "vs*" }
targetprefix "sdl"
- links {
- "psapi"
- }
configuration { }
end
function sdlconfigcmd()
- if _OPTIONS["targetos"]=="asmjs" then
- return "sdl2-config"
- elseif not _OPTIONS["SDL_INSTALL_ROOT"] then
- return _OPTIONS['TOOLCHAIN'] .. "pkg-config sdl2"
+ if not _OPTIONS["SDL_INSTALL_ROOT"] then
+ return _OPTIONS["SDL_LIBVER"] .. "-config"
else
- return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin","sdl2") .. "-config"
+ return path.join(_OPTIONS["SDL_INSTALL_ROOT"],"bin",_OPTIONS["SDL_LIBVER"]) .. "-config"
end
end
@@ -147,6 +148,23 @@ if not _OPTIONS["NO_USE_XINPUT"] then
end
newoption {
+ trigger = "SDL_LIBVER",
+ description = "Choose SDL version",
+ allowed = {
+ { "sdl", "SDL" },
+ { "sdl2", "SDL 2" },
+ },
+}
+
+if not _OPTIONS["SDL_LIBVER"] then
+ if _OPTIONS["targetos"]=="os2" then
+ _OPTIONS["SDL_LIBVER"] = "sdl"
+ else
+ _OPTIONS["SDL_LIBVER"] = "sdl2"
+ end
+end
+
+newoption {
trigger = "SDL2_MULTIAPI",
description = "Use couriersud's multi-keyboard patch for SDL 2.1? (this API was removed prior to the 2.0 release)",
allowed = {
@@ -174,16 +192,16 @@ if not _OPTIONS["SDL_FRAMEWORK_PATH"] then
end
newoption {
- trigger = "USE_LIBSDL",
- description = "Use SDL library on OS (rather than framework/dll)",
+ trigger = "MACOSX_USE_LIBSDL",
+ description = "Use SDL library on OS (rather than framework)",
allowed = {
- { "0", "Use framework/dll" },
+ { "0", "Use framework" },
{ "1", "Use library" },
},
}
-if not _OPTIONS["USE_LIBSDL"] then
- _OPTIONS["USE_LIBSDL"] = "0"
+if not _OPTIONS["MACOSX_USE_LIBSDL"] then
+ _OPTIONS["MACOSX_USE_LIBSDL"] = "0"
end
@@ -217,6 +235,10 @@ elseif _OPTIONS["targetos"]=="os2" then
SYNC_IMPLEMENTATION = "os2"
end
+if _OPTIONS["SDL_LIBVER"]=="sdl" then
+ USE_BGFX = 0
+end
+
if BASE_TARGETOS=="unix" then
if _OPTIONS["targetos"]=="macosx" then
local os_version = str_to_version(backtick("sw_vers -productVersion"))
@@ -233,27 +255,39 @@ if BASE_TARGETOS=="unix" then
"-weak_framework Metal",
}
end
- if _OPTIONS["USE_LIBSDL"]~="1" then
+ if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then
linkoptions {
"-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
}
- links {
- "SDL2.framework",
- }
+ if _OPTIONS["SDL_LIBVER"]=="sdl2" then
+ links {
+ "SDL2.framework",
+ }
+ else
+ links {
+ "SDL.framework",
+ }
+ end
else
- local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'")
+ local str = backtick(sdlconfigcmd() .. " --libs | sed 's/-lSDLmain//'")
addlibfromstring(str)
addoptionsfromstring(str)
end
else
if _OPTIONS["NO_X11"]=="1" then
_OPTIONS["USE_QTDEBUG"] = "0"
+ USE_BGFX = 0
else
libdirs {
"/usr/X11/lib",
"/usr/X11R6/lib",
"/usr/openwin/lib",
}
+ if _OPTIONS["SDL_LIBVER"]=="sdl" then
+ links {
+ "X11",
+ }
+ end
end
local str = backtick(sdlconfigcmd() .. " --libs")
addlibfromstring(str)
@@ -370,6 +404,13 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/debugger/osx/watchpointsview.h",
MAME_DIR .. "src/osd/modules/debugger/osx/debugosx.h",
}
+ if _OPTIONS["SDL_LIBVER"]=="sdl" then
+ -- SDLMain_tmpl isn't necessary for SDL2
+ files {
+ MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm",
+ MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.h",
+ }
+ end
end
files {
@@ -390,10 +431,12 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/sdl/watchdog.h",
MAME_DIR .. "src/osd/modules/render/drawsdl.cpp",
}
- files {
- MAME_DIR .. "src/osd/modules/render/draw13.cpp",
- MAME_DIR .. "src/osd/modules/render/blit13.h",
- }
+ if _OPTIONS["SDL_LIBVER"]=="sdl2" then
+ files {
+ MAME_DIR .. "src/osd/modules/render/draw13.cpp",
+ MAME_DIR .. "src/osd/modules/render/blit13.h",
+ }
+ end
project ("ocore_" .. _OPTIONS["osd"])
@@ -486,14 +529,14 @@ if _OPTIONS["with-tools"] then
}
if _OPTIONS["targetos"] == "windows" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
+ if _OPTIONS["SDL_LIBVER"] == "sdl2" then
links {
"SDL2.dll",
}
else
- local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'")
- addlibfromstring(str)
- addoptionsfromstring(str)
+ links {
+ "SDL.dll",
+ }
end
links {
"psapi",
@@ -504,14 +547,12 @@ if _OPTIONS["with-tools"] then
files {
MAME_DIR .. "src/osd/sdl/main.cpp",
}
+ elseif _OPTIONS["targetos"] == "macosx" and _OPTIONS["SDL_LIBVER"] == "sdl" then
+ -- SDLMain_tmpl isn't necessary for SDL2
+ files {
+ MAME_DIR .. "src/osd/sdl/SDLMain_tmpl.mm",
+ }
end
-
- configuration { "mingw*" or "vs*" }
- targetextension ".exe"
-
- configuration { }
-
- strip()
end
@@ -553,6 +594,4 @@ if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then
files {
MAME_DIR .. "src/osd/sdl/aueffectutil.mm",
}
-
- strip()
end
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index bdeb7274ef1..2dc1a7e465a 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -56,12 +56,18 @@ if _OPTIONS["NO_USE_MIDI"]~="1" and _OPTIONS["targetos"]=="linux" then
}
end
-defines {
- "SDLMAME_SDL2=1",
-}
-if _OPTIONS["SDL2_MULTIAPI"]=="1" then
+if _OPTIONS["SDL_LIBVER"]=="sdl2" then
+ defines {
+ "SDLMAME_SDL2=1",
+ }
+ if _OPTIONS["SDL2_MULTIAPI"]=="1" then
+ defines {
+ "SDL2_MULTIAPI",
+ }
+ end
+else
defines {
- "SDL2_MULTIAPI",
+ "SDLMAME_SDL2=0",
}
end
@@ -75,7 +81,7 @@ if BASE_TARGETOS=="unix" then
"SDLMAME_UNIX",
}
if _OPTIONS["targetos"]=="macosx" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
+ if _OPTIONS["MACOSX_USE_LIBSDL"]~="1" then
buildoptions {
"-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
}
@@ -145,21 +151,3 @@ elseif _OPTIONS["targetos"]=="os2" then
backtick(sdlconfigcmd() .. " --cflags"),
}
end
-
-configuration { "osx*" }
- includedirs {
- MAME_DIR .. "3rdparty/bx/include/compat/osx",
- }
-
-configuration { "freebsd" }
- includedirs {
- MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
- }
-
-configuration { "netbsd" }
- includedirs {
- MAME_DIR .. "3rdparty/bx/include/compat/freebsd",
- }
-
-configuration { }
-
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 54464477e24..fd508e645c5 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -159,6 +159,7 @@ project ("osd_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h",
MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h",
+ MAME_DIR .. "src/osd/modules/render/drawdd.cpp",
MAME_DIR .. "src/osd/modules/render/drawgdi.cpp",
MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
MAME_DIR .. "src/osd/windows/input.cpp",
diff --git a/scripts/src/osd/windows_cfg.lua b/scripts/src/osd/windows_cfg.lua
index 3e656017816..19ef05c3ce9 100644
--- a/scripts/src/osd/windows_cfg.lua
+++ b/scripts/src/osd/windows_cfg.lua
@@ -50,7 +50,7 @@ end
if _OPTIONS["USE_SDL"]=="1" then
defines {
- "SDLMAME_SDL2=1",
+ "SDLMAME_SDL2=0",
"USE_XINPUT=0",
"USE_SDL=1",
"USE_SDL_SOUND",