Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compile for Android(nw)

Browse source
This commit is contained in:
Miodrag Milanovic 2016-02-26 11:42:35 +01:00
parent e740bb6915
commit 5132d31224
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/src/osd/osdmini.lua
View file

@ -58,8 +58,6 @@ project ("osd_" .. _OPTIONS["osd"])
}
files {
MAME_DIR .. "src/osd/osdnet.cpp",
MAME_DIR .. "src/osd/osdnet.h",
MAME_DIR .. "src/osd/osdmini/minimain.cpp",
MAME_DIR .. "src/osd/osdmini/osdmini.h",
MAME_DIR .. "src/osd/osdepend.h",
@ -118,6 +116,8 @@ project ("ocore_" .. _OPTIONS["osd"])
end
files {
MAME_DIR .. "src/osd/osdnet.cpp",
MAME_DIR .. "src/osd/osdnet.h",
MAME_DIR .. "src/osd/osdcore.cpp",
MAME_DIR .. "src/osd/osdcore.h",
MAME_DIR .. "src/osd/modules/osdmodule.cpp",

5
scripts/toolchain.lua
View file

@ -638,7 +638,7 @@ function toolchain(_buildDir, _subDir)
"$(ANDROID_NDK_ROOT)/sources/android/native_app_glue",
}
linkoptions {
"-static-libgcc",
"-nostdlib",
}
flags {
"NoImportLib",
@ -692,6 +692,7 @@ function toolchain(_buildDir, _subDir)
}
linkoptions {
"-gcc-toolchain $(ANDROID_NDK_ARM)",
"--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib/crtbegin_so.o",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib/crtend_so.o",
"-target armv7-none-linux-androideabi",
@ -716,6 +717,7 @@ function toolchain(_buildDir, _subDir)
linkoptions {
"-gcc-toolchain $(ANDROID_NDK_MIPS)",
"-target mipsel-none-linux-android",
"--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtbegin_so.o",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtend_so.o",
}
@ -739,6 +741,7 @@ function toolchain(_buildDir, _subDir)
"-gcc-toolchain $(ANDROID_NDK_X86)",
"-target i686-none-linux-android",
"-mssse3",
"--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib/crtbegin_so.o",
"$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib/crtend_so.o",
}