From 16bc18753cb69a017e19baecb96c2032c31c2bb8 Mon Sep 17 00:00:00 2001
From: Robert D Blanchet Jr <xgalaxy@gmail.com>
Date: Sun, 18 Mar 2012 18:40:56 -0700
Subject: [PATCH] Changed iOS scons to be compatible with new Xcode.app

---
 conf/ios/SConscript | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/conf/ios/SConscript b/conf/ios/SConscript
index 40460ee..814b954 100644
--- a/conf/ios/SConscript
+++ b/conf/ios/SConscript
@@ -18,8 +18,9 @@ import os
 
 # iOS specific vars
 vars = Variables()
+vars.Add(EnumVariable('IOS_SDK_MIN_VER', ' Minimum Supports Version', '4.3', allowed_values=('4.3', '5.0', '5.1', ''), map={}, ignorecase=0))
 vars.Add(EnumVariable('IOS_SDK_VERSION', ' iOS SDK Version (4.3)',
-                      os.environ.get('IOS_SDK_VERSION'), allowed_values=('4.3', '5.0', ''), map={}, ignorecase=0))
+                      os.environ.get('IOS_SDK_VERSION'), allowed_values=('4.3', '5.0', '5.1', ''), map={}, ignorecase=0))
 vars.Update(env)
 Help(vars.GenerateHelpText(env))
 
@@ -27,28 +28,35 @@ Help(vars.GenerateHelpText(env))
 if '' == env.subst('$IOS_SDK_VERSION'):
    env['IOS_SDK_VERSION'] = '5.0'
 
+env['IOS_XCODE'] = '/Applications/Xcode.app/Contents/Developer'
+env['IOS_TOOLS'] = '$IOS_XCODE/Toolchains/XcodeDefault.xctoolchain'
+
 # x86 build means iPhone Simulator
 if env['CPU'].startswith('arm'):
-   env.AppendENVPath('IPHONEOS_DEPLOYMENT_TARGET', env['IOS_SDK_VERSION'])
+   env.AppendENVPath('IPHONEOS_DEPLOYMENT_TARGET', env['IOS_SDK_MIN_VER'])
    env['IOS_ARCH'] = env['CPU']
-   env['IOS_PLATFORM'] = '/Developer/Platforms/iPhoneOS.platform/Developer'
+   env['IOS_PLATFORM'] = '$IOS_XCODE/Platforms/iPhoneOS.platform/Developer'
    env['IOS_PLATFORM_SDK'] = '$IOS_PLATFORM/SDKs/iPhoneOS' + env['IOS_SDK_VERSION'] + '.sdk'
 else:
    env['IOS_ARCH'] = 'i386'
    env.AppendENVPath('MACOSX_DEPLOYMENT_TARGET', '10.6')
-   env['IOS_PLATFORM'] = '/Developer/Platforms/iPhoneSimulator.platform/Developer'
+   env['IOS_PLATFORM'] = '$IOS_XCODE/Platforms/iPhoneSimulator.platform/Developer'
    env['IOS_PLATFORM_SDK'] = '$IOS_PLATFORM/SDKs/iPhoneSimulator' + env['IOS_SDK_VERSION'] + '.sdk'
 
+env['IOS_XCODE_BIN'] = '$IOS_XCODE/usr/bin'
+env['IOS_TOOLS_BIN'] = '$IOS_TOOLS/usr/bin'
 env['IOS_PLATFORM_BIN'] = '$IOS_PLATFORM/usr/bin'
+env.PrependENVPath('PATH', '$IOS_XCODE_BIN')
+env.PrependENVPath('PATH', '$IOS_TOOLS_BIN')
 env.PrependENVPath('PATH', '$IOS_PLATFORM_BIN')
 
 # Add needed defines and flags
 env.Append(CPPDEFINES=[env['ZIG_OS_IOS'],
-                       '__IPHONE_OS_VERSION_MIN_REQUIRED=40300']) # TODO: Base this off $IOS_SDK_VERSION
+                       '__IPHONE_OS_VERSION_MIN_REQUIRED=40300']) # TODO: Base this off $IOS_SDK_MIN_VER
 
 env.Append(CPPFLAGS=['-arch', env['IOS_ARCH'],
                      '-isysroot', env['IOS_PLATFORM_SDK'],
-                     '-miphoneos-version-min=' + env['IOS_SDK_VERSION'],
+                     '-miphoneos-version-min=' + env['IOS_SDK_MIN_VER'],
                      '-Wno-trigraphs',
                      '-Wno-tautological-compare',
                      '-fpascal-strings',
@@ -63,18 +71,18 @@ env.Append(CPPFLAGS=['-x', 'objective-c',
 
 env.Append(LINKFLAGS=['-arch', env['IOS_ARCH'],
                       '-isysroot', env['IOS_PLATFORM_SDK'],
-                      '-miphoneos-version-min=' + env['IOS_SDK_VERSION']])
+                      '-miphoneos-version-min=' + env['IOS_SDK_MIN_VER']])
 
 # iOS include paths
 env.Append(CPPPATH=['$IOS_PLATFORM_SDK/usr/include',
-                    '$IOS_PLATFORM/usr/lib/clang/3.0/include'])
+                    '$IOS_TOOLS/usr/lib/clang/3.1/include'])
 
 # iOS library locations
 env.Append(LIBPATH=['$IOS_PLATFORM_SDK/usr/lib',
-                    '$IOS_PLATFORM/usr/lib/clang/3.0/lib/darwin'])
+                    '$IOS_TOOLS/usr/lib/clang/3.1/lib/darwin'])
 
 # iOS tools
-env['AR'] = '$IOS_PLATFORM_BIN/ar'
-env['CC'] = '$IOS_PLATFORM_BIN/clang'
-env['CXX'] = '$IOS_PLATFORM_BIN/clang++'
-env['LINK'] = '$IOS_PLATFORM_BIN/clang'
+env['AR'] = '$IOS_TOOLS_BIN/ar'
+env['CC'] = '$IOS_TOOLS_BIN/clang'
+env['CXX'] = '$IOS_TOOLS_BIN/clang++'
+env['LINK'] = '$IOS_TOOLS_BIN/clang'