diff options
Diffstat (limited to 'scripts/toolchain.lua')
-rw-r--r-- | scripts/toolchain.lua | 60 |
1 files changed, 12 insertions, 48 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index e1052dc4500..e596c06bfb0 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -94,11 +94,11 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION) - local androidPlatform = "android-21" + local androidPlatform = "android-24" if _OPTIONS["with-android"] then androidPlatform = "android-" .. _OPTIONS["with-android"] elseif _OPTIONS["PLATFORM"]:find("64", -2) then - androidPlatform = "android-21" + androidPlatform = "android-24" end local iosPlatform = "" @@ -847,6 +847,7 @@ function toolchain(_buildDir, _subDir) MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/include", + "$(ANDROID_NDK_ROOT)/sysroot/usr/include", "$(ANDROID_NDK_ROOT)/sources/android/support/include", "$(ANDROID_NDK_ROOT)/sources/android/native_app_glue", } @@ -864,10 +865,12 @@ function toolchain(_buildDir, _subDir) "log", "c++_static", "c++abi", - "android_support", "stdc++", "gcc", } + buildoptions_c { + "-Wno-strict-prototypes", + } buildoptions { "-fpic", "-ffunction-sections", @@ -880,6 +883,8 @@ function toolchain(_buildDir, _subDir) "-Wno-cast-align", "-Wno-unknown-attributes", "-Wno-macro-redefined", + "-DASIO_HAS_STD_STRING_VIEW", + "-Wno-unused-function", } linkoptions { "-no-canonical-prefixes", @@ -893,11 +898,10 @@ function toolchain(_buildDir, _subDir) configuration { "android-arm" } libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a", - "$(ANDROID_NDK_ARM)/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib", } includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/include", + "$(ANDROID_NDK_ROOT)/sysroot/usr/include/arm-linux-androideabi", } buildoptions { "-gcc-toolchain $(ANDROID_NDK_ARM)", @@ -926,7 +930,7 @@ function toolchain(_buildDir, _subDir) "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib64", } includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/include", + "$(ANDROID_NDK_ROOT)/sysroot/usr/include/aarch64-linux-android", } buildoptions { "-gcc-toolchain $(ANDROID_NDK_ARM64)", @@ -940,53 +944,13 @@ function toolchain(_buildDir, _subDir) "-target aarch64-none-linux-android", } - configuration { "android-mips" } - libdirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips", - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/", - } - includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/include", - } - buildoptions { - "-gcc-toolchain $(ANDROID_NDK_MIPS)", - "-target mipsel-none-linux-android", - } - 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", - } - - configuration { "android-mips64" } - libdirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips64", - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/", - } - includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/include", - } - buildoptions { - "-gcc-toolchain $(ANDROID_NDK_MIPS64)", - "-target mips64el-none-linux-android", - } - linkoptions { - "-gcc-toolchain $(ANDROID_NDK_MIPS64)", - "-target mips64el-none-linux-android", - "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64", - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/crtbegin_so.o", - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/crtend_so.o", - } - configuration { "android-x86" } libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib", } includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/include", + "$(ANDROID_NDK_ROOT)/sysroot/usr/include/i686-linux-android", } buildoptions { "-gcc-toolchain $(ANDROID_NDK_X86)", @@ -1008,7 +972,7 @@ function toolchain(_buildDir, _subDir) "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64", } includedirs { - "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/include", + "$(ANDROID_NDK_ROOT)/sysroot/usr/include/x86_64-linux-android", } buildoptions { "-gcc-toolchain $(ANDROID_NDK_X64)", |