Skip to content

Commit

Permalink
BUILDBOT: Add builder for new iOS clang toolchain.
Browse files Browse the repository at this point in the history
  • Loading branch information
digitall committed Apr 19, 2014
1 parent 441e607 commit 7d50c97
Showing 1 changed file with 26 additions and 1 deletion.
27 changes: 26 additions & 1 deletion config/master.cfg
Expand Up @@ -557,7 +557,7 @@ scumm_env_iphone["CXX"] = "ccache arm-apple-darwin9-g++"
scumm_env_iphone["CXXFLAGS"] = "-isystem %s/include -isystem %s/SDK/usr/include/c++/4.0.0/ -isystem %s/SDK/usr/include/c++/4.0.0/arm-apple-darwin9" % (scumm_libdir_iphone, scumm_root_iphone, scumm_root_iphone )
scumm_env_iphone["LDFLAGS"] = "-F%s/SDK/System/Library/PrivateFrameworks -bind_at_load -L%s/lib" % (scumm_root_iphone, scumm_libdir_iphone)
scumm_env_iphone["LIBDIR"] = scumm_libdir_iphone
scumm_env_iphone["CODESIGN_ALLOCATE"] = "/opt/toolchains/arm-apple-darwin9-llvm-gcc-4.2/bin/arm-apple-darwin9-codesign_allocate"
scumm_env_iphone["CODESIGN_ALLOCATE"] = "%s/bin/arm-apple-darwin9-codesign_allocate" % scumm_root_iphone

p = {
"configureargs": [
Expand All @@ -573,6 +573,31 @@ p = {
scumm_platforms_master["iphone"] = p
scumm_platforms_stable["iphone"] = p

# iPhone - New Clang Toolchain as of 20140419
scumm_root_iphone_clang = "/opt/toolchains/ios-clang3.3"
scumm_libdir_iphone_clang = "%s/iPhoneOS3.1.2.sdk/usr/local" % scumm_root_iphone_clang
scumm_env_iphone_clang = copy.deepcopy(scumm_env)
scumm_env_iphone_clang["PATH"] = "%s/bin:%s" % (scumm_root_iphone_clang, DEFAULT_PATH)
scumm_env_iphone_clang["CXX"] = "ccache ios-clang++"
scumm_env_iphone_clang["CXXFLAGS"] = "-isystem %s/include -isystem %s/iPhoneOS3.1.2.sdk/usr/include/c++/4.0.0/ -isystem %s/iPhoneOS3.1.2.sdk/usr/include/c++/4.0.0/arm-apple-darwin9" % (scumm_libdir_iphone_clang, scumm_root_iphone_clang, scumm_root_iphone_clang )
scumm_env_iphone_clang["LDFLAGS"] = "-F%s/iPhoneOS3.1.2.sdk/System/Library/PrivateFrameworks -bind_at_load -L%s/lib" % (scumm_root_iphone_clang, scumm_libdir_iphone_clang)
scumm_env_iphone_clang["LIBDIR"] = scumm_libdir_iphone_clang
scumm_env_iphone_clang["CODESIGN_ALLOCATE"] = "%s/bin/arm-apple-darwin9-codesign_allocate" % scumm_root_iphone_clang

p = {
"configureargs": [
"--host=iphone",
"--with-staticlib-prefix=%s" % scumm_libdir_iphone,
],
"env": scumm_env_iphone,
"disttarget": "iphonebundle",
"package": [ "ScummVM.app" ],
"archive_format": "tar.xz"
}

scumm_platforms_master["iphone-clang"] = p
scumm_platforms_stable["iphone-clang"] = p

# PSP
scumm_root_psp = "/opt/toolchains/psp"
scumm_env_psp = copy.deepcopy(scumm_env)
Expand Down

0 comments on commit 7d50c97

Please sign in to comment.