build: Use Xcode 6.4

peter-b · peter-b · commit 7045ba17e127 · 2015-07-01T13:13:10.000+01:00
diff --git a/Makefile b/Makefile
@@ -24,8 +24,8 @@ WINE ?= wine
 
 # Some magic to control which versions of iOS we try to build.  N.b. you may
 # also need to modify the buildbot configuration
-IPHONEOS_VERSIONS ?= 8.2 8.3
-IPHONESIMULATOR_VERSIONS ?= 5.1 6.1 7.1 8.2 8.3
+IPHONEOS_VERSIONS ?= 8.2 8.3 8.4
+IPHONESIMULATOR_VERSIONS ?= 5.1 6.1 7.1 8.2 8.3 8.4
 
 IOS_SDKS ?= \
 	$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \
@@ -138,9 +138,9 @@ compile-ios-%:
 	$(XCODEBUILD) -project "build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE)
 
 # Provide some synonyms for "latest iOS SDK"
-$(addsuffix -ios-iphoneos,all config compile): %: %8.3
+$(addsuffix -ios-iphoneos,all config compile): %: %8.4
 	@true
-$(addsuffix -ios-iphonesimulator,all config compile): %: %8.3
+$(addsuffix -ios-iphonesimulator,all config compile): %: %8.4
 	@true
 
 all_ios_subplatforms = iphoneos iphonesimulator $(IOS_SDKS)
@@ -165,4 +165,3 @@ all-win-%:
 	$(MAKE) compile-win-$*
 
 $(addsuffix -win,all config compile): %: %-x86
-
diff --git a/config.sh b/config.sh
@@ -226,7 +226,7 @@ fi
 if test -z "$XCODE_TARGET_SDK"; then
  case ${OS} in
    mac) XCODE_TARGET_SDK="macosx10.8" ;;
-   ios) XCODE_TARGET_SDK="iphoneos8.3" ;;
+   ios) XCODE_TARGET_SDK="iphoneos" ;;
  esac
 fi
 
@@ -366,7 +366,7 @@ case ${OS} in
     export ANDROID_NDK
     export ANDROID_PLATFORM
     export ANDROID_SDK
-    
+
     export JAVA_SDK="${ANDROID_JAVA_SDK}"
 
     export AR="${ANDROID_AR}"
diff --git a/tools/setup_xcode_sdks.sh b/tools/setup_xcode_sdks.sh
@@ -2,8 +2,8 @@
 
 # Update these lists if you need different SDK versions!
 
-iphoneos_versions="8.3 8.2"
-iphonesimulator_versions="8.3 8.2 7.1 6.1 5.1"
+iphoneos_versions="8.4 8.2"
+iphonesimulator_versions="8.4 8.2 7.1 6.1 5.1"
 macosx_versions="10.8 10.6"
 
 # This tool creates the symlinks required for Xcode builds of LiveCode.
