ScummVM/scummvm-sites
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm-sites.git synced 2026-05-21 05:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILDBOT: Change Android to using NDK r9c and thus GCC 4.6.

Browse Source
This commit is contained in:
D G Turner
2014-01-22 13:33:17 +00:00
parent ba6c2679b4
commit 8024a39461
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/master.cfg
+2 -2
View File
@@ -902,12 +902,12 @@ scumm_platforms_stable["caanoo"] = p_stable
# Android
scumm_root_android = "/opt/toolchains/android"
scumm_env_android = copy.deepcopy(scumm_env)
scumm_env_android["PATH"] = "%s/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin:%s" % (scumm_root_android, DEFAULT_PATH)
scumm_env_android["PATH"] = "%s/android-ndk-r9c/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin:%s" % (scumm_root_android, DEFAULT_PATH)
scumm_env_android["CXX"] = "ccache arm-linux-androideabi-g++"
scumm_env_android["CXXFLAGS"] = "-isystem %s/3rd-android-4-armeabi-debug/include" % scumm_root_android
scumm_env_android["LDFLAGS"] = "-L%s/3rd-android-4-armeabi-debug/lib" % scumm_root_android
scumm_env_android["ANDROID_SDK"] = "%s/android-sdk-linux_x86" % scumm_root_android
scumm_env_android["ANDROID_NDK"] = "%s/android-ndk-r5b" % scumm_root_android
scumm_env_android["ANDROID_NDK"] = "%s/android-ndk-r9c" % scumm_root_android
p = {
"configureargs": [