Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Use latest iOS SDK but target iOS 4.

Also fixed some settings that caused it to always link against the debug builds of iErl.

Change-Id: I94f2634f015c6d24fd9c52e5a6433bd7b576d049
Reviewed-on: http://review.couchbase.org/9170
Tested-by: Chris Anderson <jchris@couchbase.com>
Reviewed-by: Chris Anderson <jchris@couchbase.com>
  • Loading branch information...
commit 14581613f562f11db3ae126ad9957a6ab26deb23 1 parent 6b95899
@snej snej authored jchris committed
View
16 EmptyApp/Empty App.xcodeproj/project.pbxproj
@@ -267,7 +267,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# The 'CouchbaseResources' subfolder of the framework contains Erlang code and other resources needed at runtime. Copy it into the app bundle:\nrm -rf \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CouchbaseResources\"\nrsync -a \"${TARGET_BUILD_DIR}/../Debug-universal/Couchbase.framework/CouchbaseResources\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"";
+ shellScript = "# The 'CouchbaseResources' subfolder of the framework contains Erlang code and other resources needed at runtime. Copy it into the app bundle:\nrm -rf \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CouchbaseResources\"\nrsync -a \"${TARGET_BUILD_DIR}/../${CONFIGURATION}-universal/Couchbase.framework/CouchbaseResources\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -329,7 +329,7 @@
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
- "\"$(TARGET_BUILD_DIR)/../Debug-universal\"",
+ "\"$(TARGET_BUILD_DIR)/../$(CONFIGURATION)-universal\"",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
@@ -345,8 +345,8 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
- SDKROOT = iphoneos4.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
@@ -360,7 +360,7 @@
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
- "\"$(TARGET_BUILD_DIR)/../Debug-universal\"",
+ "\"$(TARGET_BUILD_DIR)/../$(CONFIGURATION)-universal\"",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -369,9 +369,9 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
- SDKROOT = iphoneos4.0;
+ SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
@@ -382,7 +382,6 @@
buildSettings = {
GCC_PRECOMPILE_PREFIX_HEADER = YES;
INFOPLIST_FILE = "Source/Empty App-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
PRODUCT_NAME = "Empty App";
STRIP_INSTALLED_PRODUCT = NO;
WRAPPER_EXTENSION = app;
@@ -395,7 +394,6 @@
DEPLOYMENT_POSTPROCESSING = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
INFOPLIST_FILE = "Source/Empty App-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
PRODUCT_NAME = "Empty App";
STRIP_INSTALLED_PRODUCT = YES;
WRAPPER_EXTENSION = app;
View
4 Framework/Couchbase.xcodeproj/project.pbxproj
@@ -435,7 +435,7 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.0;
PUBLIC_HEADERS_FOLDER_PATH = include;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -454,7 +454,7 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PUBLIC_HEADERS_FOLDER_PATH = include;
SDKROOT = iphoneos;
Please sign in to comment.
Something went wrong with that request. Please try again.