diff options
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/osd/modules.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 13 | ||||
-rw-r--r-- | scripts/src/osd/sdl_cfg.lua | 7 |
3 files changed, 3 insertions, 21 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 1dfa4317a48..ba4fa9cfee0 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -399,7 +399,7 @@ newoption { } if not _OPTIONS["NO_USE_MIDI"] then - if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then + if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then _OPTIONS["NO_USE_MIDI"] = "1" else _OPTIONS["NO_USE_MIDI"] = "0" @@ -454,7 +454,7 @@ newoption { if not _OPTIONS["USE_QTDEBUG"] then - if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then + if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then _OPTIONS["USE_QTDEBUG"] = "0" else _OPTIONS["USE_QTDEBUG"] = "1" diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 76947ad777a..28e542a1402 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -141,7 +141,7 @@ newoption { } if not _OPTIONS["NO_X11"] then - if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="os2" then + if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then _OPTIONS["NO_X11"] = "1" else _OPTIONS["NO_X11"] = "0" @@ -226,10 +226,6 @@ elseif _OPTIONS["targetos"]=="macosx" then SDLOS_TARGETOS = "macosx" SYNC_IMPLEMENTATION = "ntc" SDL_NETWORK = "pcap" -elseif _OPTIONS["targetos"]=="os2" then - BASE_TARGETOS = "os2" - SDLOS_TARGETOS = "os2" - SYNC_IMPLEMENTATION = "os2" end if BASE_TARGETOS=="unix" then @@ -290,13 +286,6 @@ if BASE_TARGETOS=="unix" then end end end -elseif BASE_TARGETOS=="os2" then - local str = backtick(sdlconfigcmd() .. " --libs") - addlibfromstring(str) - addoptionsfromstring(str) - links { - "pthread" - } end project ("qtdbg_" .. _OPTIONS["osd"]) diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua index e3a6f913e75..5aee0471cc7 100644 --- a/scripts/src/osd/sdl_cfg.lua +++ b/scripts/src/osd/sdl_cfg.lua @@ -137,13 +137,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*" } |