Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-05 12:26:35 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Harmonise targetos between genie.lua and sdl{,_config}.lua

Browse Source
This commit is contained in:
Vas Crabb 2015-04-04 15:13:48 +11:00
parent a119fc50ab
commit f947a9b160
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/genie.lua
View File

@ -65,14 +65,17 @@ newoption {
{ "android-x86", "Android - x86" }, { "android-x86", "Android - x86" },
{ "asmjs", "Emscripten/asm.js" }, { "asmjs", "Emscripten/asm.js" },
{ "freebsd", "FreeBSD" }, { "freebsd", "FreeBSD" },
{ "netbsd", "NetBSD" },
{ "openbsd", "OpenBSD" },
{ "nacl", "Native Client" }, { "nacl", "Native Client" },
{ "nacl-arm", "Native Client - ARM" }, { "nacl-arm", "Native Client - ARM" },
{ "pnacl", "Native Client - PNaCl" }, { "pnacl", "Native Client - PNaCl" },
{ "linux", "Linux" }, { "linux", "Linux" },
{ "ios", "iOS" }, { "ios", "iOS" },
{ "macosx", "OSX" }, { "macosx", "OSX" },
{ "windows", "Windows" }, { "windows", "Windows" },
{ "os2", "OS/2 eComStation" },
{ "haiku", "Haiku" },
}, },
} }

4
scripts/src/osd/sdl.lua
View File

@ -102,7 +102,7 @@ newoption {
} }
if not _OPTIONS["NO_X11"] then if not _OPTIONS["NO_X11"] then
if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="emscripten" or _OPTIONS["targetos"]=="os2" then if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="os2" then
_OPTIONS["NO_X11"] = "1" _OPTIONS["NO_X11"] = "1"
else else
_OPTIONS["NO_X11"] = "0" _OPTIONS["NO_X11"] = "0"
@ -193,7 +193,7 @@ elseif _OPTIONS["targetos"]=="netbsd" then
SDL_NETWORK = "pcap" SDL_NETWORK = "pcap"
elseif _OPTIONS["targetos"]=="haiku" then elseif _OPTIONS["targetos"]=="haiku" then
SYNC_IMPLEMENTATION = "ntc" SYNC_IMPLEMENTATION = "ntc"
elseif _OPTIONS["targetos"]=="emscripten" then elseif _OPTIONS["targetos"]=="asmjs" then
SYNC_IMPLEMENTATION = "mini" SYNC_IMPLEMENTATION = "mini"
elseif _OPTIONS["targetos"]=="windows" then elseif _OPTIONS["targetos"]=="windows" then
BASE_TARGETOS = "win32" BASE_TARGETOS = "win32"

2
scripts/src/osd/sdl_cfg.lua
View File

@ -90,7 +90,7 @@ if BASE_TARGETOS=="unix" then
buildoptions { buildoptions {
backtick(sdlconfigcmd() .. " --cflags"), backtick(sdlconfigcmd() .. " --cflags"),
} }
if _OPTIONS["targetos"]~="emscripten" then if _OPTIONS["targetos"]~="asmjs" then
buildoptions { buildoptions {
backtick("pkg-config --cflags fontconfig"), backtick("pkg-config --cflags fontconfig"),
} }