diff options
author | 2016-03-27 14:06:51 +0200 | |
---|---|---|
committer | 2016-03-27 17:35:23 +0200 | |
commit | 158c90cf1196f219e6a7c9c3e23ca47129429a7b (patch) | |
tree | 4630c4834544108f1ec74b5b48fe4d437d3efbeb /scripts/src/osd | |
parent | 5640305d0ecfdbf6a1a456688f48f6f0fe22adb3 (diff) |
Initial work to make MAME work on Android [Miodrag Milanovic]
Diffstat (limited to 'scripts/src/osd')
-rw-r--r-- | scripts/src/osd/modules.lua | 6 | ||||
-rw-r--r-- | scripts/src/osd/sdl.lua | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index dcce1a8e07b..5ea9bec2f1c 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -122,6 +122,12 @@ function osdmodulesbuild() end end + defines { + "__STDC_LIMIT_MACROS", + "__STDC_FORMAT_MACROS", + "__STDC_CONSTANT_MACROS", + } + files { MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp", MAME_DIR .. "src/osd/modules/render/binpacker.cpp", diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua index 47a8b0ff3b6..03e82ffcb2f 100644 --- a/scripts/src/osd/sdl.lua +++ b/scripts/src/osd/sdl.lua @@ -38,7 +38,7 @@ function maintargetosdoptions(_target,_subtarget) } end - if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" then + if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" and _OPTIONS["targetos"]~="android" then links { "SDL2_ttf", } @@ -239,7 +239,7 @@ elseif _OPTIONS["targetos"]=="macosx" then SDL_NETWORK = "pcap" end -if _OPTIONS["with-bundled-sdl2"]~=nil then +if _OPTIONS["with-bundled-sdl2"]~=nil or _OPTIONS["targetos"]=="android" then includedirs { GEN_DIR .. "includes", } @@ -295,7 +295,7 @@ if BASE_TARGETOS=="unix" then "/usr/openwin/lib", } end - if _OPTIONS["with-bundled-sdl2"]~=nil then + if _OPTIONS["with-bundled-sdl2"]~=nil and _OPTIONS["targetos"]~="android" then links { "SDL2", } @@ -305,7 +305,7 @@ if BASE_TARGETOS=="unix" then addoptionsfromstring(str) end - if _OPTIONS["targetos"]~="haiku" then + if _OPTIONS["targetos"]~="haiku" and _OPTIONS["targetos"]~="android" then links { "m", "pthread", |