summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/genie.lua9
-rw-r--r--scripts/src/3rdparty.lua24
-rw-r--r--scripts/toolchain.lua1
3 files changed, 25 insertions, 9 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 5f226315e47..e490701e9e9 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -98,15 +98,11 @@ newoption {
trigger = "targetos",
description = "Choose target OS",
allowed = {
- { "android-arm", "Android - ARM" },
- { "android-mips", "Android - MIPS" },
- { "android-x86", "Android - x86" },
+ { "android", "Android" },
{ "asmjs", "Emscripten/asm.js" },
{ "freebsd", "FreeBSD" },
{ "netbsd", "NetBSD" },
{ "openbsd", "OpenBSD" },
- { "nacl", "Native Client" },
- { "nacl-arm", "Native Client - ARM" },
{ "pnacl", "Native Client - PNaCl" },
{ "linux", "Linux" },
{ "ios", "iOS" },
@@ -1035,6 +1031,9 @@ configuration { "android*" }
"-Wno-tautological-constant-out-of-range-compare",
"-Wno-tautological-pointer-compare",
}
+ defines {
+ "_POSIX_BARRIERS=1",
+ }
archivesplit_size "20"
configuration { "pnacl" }
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 36547209ac7..cfaa171bf64 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -523,10 +523,7 @@ project "luv"
"_WIN32_WINNT=0x0600",
}
end
- configuration { "pnacl"}
- defines {
- "_POSIX_BARRIERS=1",
- }
+
configuration { "vs*" }
buildoptions {
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
@@ -1159,6 +1156,25 @@ project "uv"
MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
}
end
+
+ if _OPTIONS["targetos"]=="android" then
+ defines {
+ "_GNU_SOURCE",
+ }
+ buildoptions {
+ "-Wno-header-guard",
+ }
+ files {
+ MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-core.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-inotify.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.h",
+ MAME_DIR .. "3rdparty/libuv/src/unix/pthread-fixes.c",
+ MAME_DIR .. "3rdparty/libuv/src/unix/android-ifaddrs.c",
+ }
+ end
+
if _OPTIONS["targetos"]=="solaris" then
defines {
"__EXTENSIONS__",
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 058c10a4bcc..95fe72f618b 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -649,6 +649,7 @@ function toolchain(_buildDir, _subDir)
"m",
"android",
"log",
+ "c++_static",
"gcc",
}
buildoptions {