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 path for Android x86 and MIPS 3rd party libraries.

Browse Source 
These both use platform-9 API, rather than platform-4 as the x86 and
MIPS toolchains were only added in platform-9.

Changed directory name for third party libraries to reflect the
platform system libraries compiled against.
This commit is contained in:
D G Turner
2014-05-05 01:44:55 +01:00
parent df8bcde8aa
commit c72a3918c1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/master.cfg
+4 -4
View File
@@ -998,8 +998,8 @@ scumm_platforms_stable["android_arm"] = p
scumm_env_android_mips = copy.deepcopy(scumm_env_android)
scumm_env_android_mips["PATH"] = "%s/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86/bin:%s" % (scumm_env_android["ANDROID_NDK"], DEFAULT_PATH)
scumm_env_android_mips["CXX"] = "ccache mipsel-linux-android-g++"
scumm_env_android_mips["CXXFLAGS"] = "-isystem %s/3rd-android-4-mipsel-debug/include" % scumm_root_android
scumm_env_android_mips["LDFLAGS"] = "-L%s/3rd-android-4-mipsel-debug/lib" % scumm_root_android
scumm_env_android_mips["CXXFLAGS"] = "-isystem %s/3rd-android-9-mipsel-debug/include" % scumm_root_android
scumm_env_android_mips["LDFLAGS"] = "-L%s/3rd-android-9-mipsel-debug/lib" % scumm_root_android
p = {
"configureargs": [
@@ -1021,8 +1021,8 @@ scumm_platforms_stable["android_mips"] = p
scumm_env_android_x86 = copy.deepcopy(scumm_env_android)
scumm_env_android_x86["PATH"] = "%s/toolchains/x86-4.6/prebuilt/linux-x86/bin:%s" % (scumm_env_android["ANDROID_NDK"], DEFAULT_PATH)
scumm_env_android_x86["CXX"] = "ccache i686-linux-android-g++"
scumm_env_android_x86["CXXFLAGS"] = "-isystem %s/3rd-android-4-x86-debug/include" % scumm_root_android
scumm_env_android_x86["LDFLAGS"] = "-L%s/3rd-android-4-x86-debug/lib" % scumm_root_android
scumm_env_android_x86["CXXFLAGS"] = "-isystem %s/3rd-android-9-x86-debug/include" % scumm_root_android
scumm_env_android_x86["LDFLAGS"] = "-L%s/3rd-android-9-x86-debug/lib" % scumm_root_android
p = {
"configureargs": [