Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1027 from h0tw1r3/master

Browse Source 
android objdir (nw)
This commit is contained in:
Vas Crabb 2016-07-02 14:21:32 +10:00 committed by GitHub
commit 448d04e9b9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/toolchain.lua
View File

@ -774,13 +774,12 @@ function toolchain(_buildDir, _subDir)
configuration { "android-*", "Release" } configuration { "android-*", "Release" }
targetdir (_buildDir .. "android/bin/" .. _OPTIONS["PLATFORM"] .. "/Release") targetdir (_buildDir .. "android/bin/" .. _OPTIONS["PLATFORM"] .. "/Release")
objdir (_buildDir .. "android/obj/" .. _OPTIONS["PLATFORM"] .. "/Release")
configuration { "android-*", "Debug" } configuration { "android-*", "Debug" }
targetdir (_buildDir .. "android/bin/" .. _OPTIONS["PLATFORM"] .. "/Debug") targetdir (_buildDir .. "android/bin/" .. _OPTIONS["PLATFORM"] .. "/Debug")
objdir (_buildDir .. "android/obj/" .. _OPTIONS["PLATFORM"] .. "/Debug")
configuration { "android-*" } configuration { "android-*" }
objdir (_buildDir .. "android/obj/" .. _OPTIONS["PLATFORM"])
includedirs { includedirs {
MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos",
"$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include",