From bcd8558b02cb54eab92df98f14bf07221d6d358b Mon Sep 17 00:00:00 2001 From: Robbbert Date: Wed, 27 Apr 2016 18:59:40 +1000 Subject: 0.173 Release Files --- docs/release/scripts/src/osd/sdl_cfg.lua | 46 +++++++++++++------------------- 1 file changed, 18 insertions(+), 28 deletions(-) (limited to 'docs/release/scripts/src/osd/sdl_cfg.lua') 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*" } -- cgit v1.2.3-70-g09d2