summaryrefslogtreecommitdiffstats
path: root/docs/release/scripts/src/osd/sdl_cfg.lua
diff options
context:
space:
mode:
author Robbbert <pac0446@bigpond.net.au>2016-04-27 18:59:40 +1000
committer Robbbert <pac0446@bigpond.net.au>2016-04-27 18:59:40 +1000
commitbcd8558b02cb54eab92df98f14bf07221d6d358b (patch)
treec29211cecf250a791c074dfc3e1fc9a2d9a1a593 /docs/release/scripts/src/osd/sdl_cfg.lua
parent0d70c1f8cdb9e66fd7bc5bcad128e394a2345607 (diff)
0.173 Release Fileshbmame173
Diffstat (limited to 'docs/release/scripts/src/osd/sdl_cfg.lua')
-rw-r--r--docs/release/scripts/src/osd/sdl_cfg.lua46
1 files changed, 18 insertions, 28 deletions
diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua
index e3a6f913e75..0fd15e5ca27 100644
--- a/docs/release/scripts/src/osd/sdl_cfg.lua
+++ b/docs/release/scripts/src/osd/sdl_cfg.lua
@@ -19,9 +19,9 @@ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS[
end
if _OPTIONS["SDL_INI_PATH"]~=nil then
- defines {
- "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'",
- }
+ defines {
+ "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'",
+ }
end
if _OPTIONS["NO_X11"]=="1" then
@@ -67,7 +67,6 @@ end
defines {
"OSD_SDL",
- "SYNC_IMPLEMENTATION=" .. SYNC_IMPLEMENTATION,
}
if BASE_TARGETOS=="unix" then
@@ -75,18 +74,20 @@ if BASE_TARGETOS=="unix" then
"SDLMAME_UNIX",
}
if _OPTIONS["targetos"]=="macosx" then
- if _OPTIONS["USE_LIBSDL"]~="1" then
- buildoptions {
- "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
- }
- else
- defines {
- "MACOSX_USE_LIBSDL",
- }
- buildoptions {
- backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
- }
- end
+ if _OPTIONS["with-bundled-sdl2"]==nil then
+ if _OPTIONS["USE_LIBSDL"]~="1" then
+ buildoptions {
+ "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"],
+ }
+ else
+ defines {
+ "MACOSX_USE_LIBSDL",
+ }
+ buildoptions {
+ backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"),
+ }
+ end
+ end
else
buildoptions {
backtick(sdlconfigcmd() .. " --cflags"),
@@ -100,7 +101,7 @@ if BASE_TARGETOS=="unix" then
end
if _OPTIONS["targetos"]=="windows" then
- configuration { "mingw*-gcc or vs*" }
+ configuration { "mingw* or vs*" }
defines {
"UNICODE",
"_UNICODE",
@@ -111,10 +112,6 @@ if _OPTIONS["targetos"]=="windows" then
defines {
"MALLOC_DEBUG",
}
- configuration { "vs*" }
- includedirs {
- MAME_DIR .. "3rdparty/sdl2/include",
- }
configuration { }
elseif _OPTIONS["targetos"]=="linux" then
@@ -137,13 +134,6 @@ elseif _OPTIONS["targetos"]=="freebsd" then
-- /usr/local/include is not considered a system include director on FreeBSD. GL.h resides there and throws warnings
"-isystem /usr/local/include",
}
-elseif _OPTIONS["targetos"]=="os2" then
- defines {
- "SDLMAME_OS2",
- }
- buildoptions {
- backtick(sdlconfigcmd() .. " --cflags"),
- }
end
configuration { "osx*" }