Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 15:11:37 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fixing some more Android related things (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-02-26 08:20:30 +01:00
parent 4a3926b1eb
commit e740bb6915
4 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -938,7 +938,7 @@ ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
ifndef COMPILE
$(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=4.9 --osd=osdmini --targetos=android-arm --PLATFORM=arm --NOASM=1 gmake
$(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=4.9 --osd=osdmini --targetos=android-arm --targetos=android --PLATFORM=arm --NOASM=1 gmake
endif
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-arm config=$(CONFIG) precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-arm config=$(CONFIG)
@ -952,7 +952,7 @@ ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
ifndef COMPILE
$(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=4.9 --osd=osdmini --targetos=android-mips --PLATFORM=mips --NOASM=1 gmake
$(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=4.9 --osd=osdmini --targetos=android-mips --targetos=android --PLATFORM=mips --NOASM=1 gmake
endif
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-mips config=$(CONFIG) precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-mips config=$(CONFIG)
@ -966,7 +966,7 @@ ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
ifndef COMPILE
$(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=4.9 --osd=osdmini --targetos=android-x86 --PLATFORM=x86 gmake
$(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=4.9 --osd=osdmini --targetos=android-x86 --targetos=android --PLATFORM=x86 gmake
endif
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-x86 config=$(CONFIG) precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-x86 config=$(CONFIG)

9
scripts/genie.lua
View File

@ -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" }

24
scripts/src/3rdparty.lua
View File

@ -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__",

1
scripts/toolchain.lua
View File

@ -649,6 +649,7 @@ function toolchain(_buildDir, _subDir)
"m",
"android",
"log",
"c++_static",
"gcc",
}
buildoptions {