summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua15
-rw-r--r--scripts/src/main.lua11
2 files changed, 23 insertions, 3 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 066ee85befb..36547209ac7 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -537,10 +537,14 @@ project "luv"
"-Wno-unused-function",
"-Wno-strict-prototypes",
"-Wno-unused-variable",
- "-Wno-maybe-uninitialized",
"-Wno-undef",
}
+ configuration { "not android-*" }
+ buildoptions_c {
+ "-Wno-maybe-uninitialized",
+ }
+
configuration { "vs2015" }
buildoptions {
"/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
@@ -749,6 +753,11 @@ end
MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
}
+ configuration { "android-*"}
+ buildoptions {
+ "-Wno-macro-redefined",
+ }
+
configuration { "vs*" }
includedirs {
MAME_DIR .. "3rdparty/bx/include/compat/msvc",
@@ -890,7 +899,7 @@ end
local version = str_to_version(_OPTIONS["gcc_version"])
if (_OPTIONS["gcc"]~=nil) then
- if string.find(_OPTIONS["gcc"], "clang") then
+ if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
buildoptions_c {
"-Wno-unknown-warning-option",
"-Wno-absolute-value",
@@ -1024,7 +1033,7 @@ project "uv"
local version = str_to_version(_OPTIONS["gcc_version"])
if (_OPTIONS["gcc"]~=nil) then
- if string.find(_OPTIONS["gcc"], "clang") then
+ if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
buildoptions_c {
"-Wno-unknown-warning-option",
"-Wno-unknown-attributes",
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index b8125bf1989..ad71d0a5cb7 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -25,6 +25,17 @@ else
end
uuid (os.uuid(_target .."_" .. _subtarget))
kind "ConsoleApp"
+
+ configuration { "android*" }
+ targetextension ".so"
+ linkoptions {
+ "-shared",
+ }
+ links {
+ "EGL",
+ "GLESv2",
+ }
+ configuration { }
addprojectflags()
flags {