summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-26 13:20:43 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-26 13:20:43 +0100
commit4727b0d97f30666b15155765d602c9a2f1f5159f (patch)
treea1c0ccb666ec3b1fbfc63cbf19f0732e9f71a082 /scripts
parentf79e31489758026c37058b16fa9c968fbf35a8a1 (diff)
OS/2 can not support SDL2 which is needed for MAME to run (nw)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/genie.lua20
-rw-r--r--scripts/src/osd/modules.lua4
-rw-r--r--scripts/src/osd/sdl.lua13
-rw-r--r--scripts/src/osd/sdl_cfg.lua7
-rw-r--r--scripts/toolchain.lua19
5 files changed, 9 insertions, 54 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index e490701e9e9..0854523185e 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -108,7 +108,6 @@ newoption {
{ "ios", "iOS" },
{ "macosx", "OSX" },
{ "windows", "Windows" },
- { "os2", "OS/2 eComStation" },
{ "haiku", "Haiku" },
{ "solaris", "Solaris SunOS" },
{ "steamlink", "Steam Link" },
@@ -555,8 +554,8 @@ configuration { "Release" }
configuration { }
--- CR/LF setup: use both on win32/os2, CR only on everything else
-if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="os2" then
+-- CR/LF setup: use on win32, CR only on everything else
+if _OPTIONS["targetos"]=="windows" then
defines {
"CRLF=3",
}
@@ -696,17 +695,10 @@ if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["ta
"-std=c++1y",
}
else
- if _OPTIONS["targetos"]=="os2" then
- buildoptions_cpp {
- "-x c++",
- "-std=gnu++14",
- }
- else
- buildoptions_cpp {
- "-x c++",
- "-std=c++14",
- }
- end
+ buildoptions_cpp {
+ "-x c++",
+ "-std=c++14",
+ }
buildoptions_objc {
"-x objective-c++",
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*" }
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 64650af1802..c98e233b255 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -28,7 +28,6 @@ newoption {
{ "mingw64-gcc", "MinGW64" },
{ "mingw-clang", "MinGW (clang compiler)" },
{ "netbsd", "NetBSD" },
- { "os2", "OS/2" },
{ "osx", "OSX (GCC compiler)" },
{ "osx-clang", "OSX (Clang compiler)" },
{ "pnacl", "Native Client - PNaCl" },
@@ -292,9 +291,6 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi")
end
- if "os2" == _OPTIONS["gcc"] then
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-os2")
- end
elseif _ACTION == "vs2013" or _ACTION == "vs2015" then
if (_ACTION .. "-clang") == _OPTIONS["vs"] then
@@ -820,15 +816,6 @@ function toolchain(_buildDir, _subDir)
targetdir (_buildDir .. "rpi" .. "/bin")
objdir (_buildDir .. "rpi" .. "/obj")
- configuration { "os2" }
- objdir (_buildDir .. "os2" .. "/obj")
-
- configuration { "os2", "Release" }
- targetdir (_buildDir .. "os2" .. "/bin/Release")
-
- configuration { "os2", "Debug" }
- targetdir (_buildDir .. "os2" .. "/bin/Debug")
-
configuration {} -- reset configuration
return true
@@ -893,12 +880,6 @@ function strip()
-- ALLOW_MEMORY_GROWTH
}
- configuration { "os2", "Release" }
- postbuildcommands {
- "$(SILENT) echo Stripping symbols.",
- "$(SILENT) lxlite /B- /L- /CS \"$(TARGET)\""
- }
-
configuration {} -- reset configuration
end