first pass at clean up of the 3 config files
- note that SkUserConfig.h no longer actually does anything
git-svn-id: http://skia.googlecode.com/svn/trunk@60 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj b/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj
index f288c87..1df5c61f0 100644
--- a/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj
+++ b/xcode/sampleapp/SampleApp.xcodeproj/project.pbxproj
@@ -548,7 +548,7 @@
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
- 01E2163A09EDAC6600E66AF8 /* Development */ = {
+ 01E2163A09EDAC6600E66AF8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -568,9 +568,9 @@
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
- name = Development;
+ name = Debug;
};
- 01E2163B09EDAC6600E66AF8 /* Deployment */ = {
+ 01E2163B09EDAC6600E66AF8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
@@ -588,25 +588,9 @@
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
- name = Deployment;
+ name = Release;
};
- 01E2163C09EDAC6600E66AF8 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = CICarbonSample_Prefix.pch;
- GCC_WARN_ABOUT_RETURN_TYPE = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- INFOPLIST_FILE = Info.plist;
- INSTALL_PATH = "$(HOME)/Applications";
- PRODUCT_NAME = CICarbonSample;
- SKIP_INSTALL = YES;
- WRAPPER_EXTENSION = app;
- };
- name = Default;
- };
- 01E2163E09EDAC6600E66AF8 /* Development */ = {
+ 01E2163E09EDAC6600E66AF8 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -619,9 +603,9 @@
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
USER_HEADER_SEARCH_PATHS = "../../include/**";
};
- name = Development;
+ name = Debug;
};
- 01E2163F09EDAC6600E66AF8 /* Deployment */ = {
+ 01E2163F09EDAC6600E66AF8 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -634,18 +618,7 @@
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
USER_HEADER_SEARCH_PATHS = "../../include/**";
};
- name = Deployment;
- };
- 01E2164009EDAC6600E66AF8 /* Default */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_ENABLE_CPP_EXCEPTIONS = NO;
- GCC_ENABLE_CPP_RTTI = NO;
- GCC_THREADSAFE_STATICS = NO;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- USER_HEADER_SEARCH_PATHS = "../../include/**";
- };
- name = Default;
+ name = Release;
};
/* End XCBuildConfiguration section */
@@ -653,22 +626,20 @@
01E2163909EDAC6600E66AF8 /* Build configuration list for PBXNativeTarget "CICarbonSample" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- 01E2163A09EDAC6600E66AF8 /* Development */,
- 01E2163B09EDAC6600E66AF8 /* Deployment */,
- 01E2163C09EDAC6600E66AF8 /* Default */,
+ 01E2163A09EDAC6600E66AF8 /* Debug */,
+ 01E2163B09EDAC6600E66AF8 /* Release */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Debug;
};
01E2163D09EDAC6600E66AF8 /* Build configuration list for PBXProject "SampleApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
- 01E2163E09EDAC6600E66AF8 /* Development */,
- 01E2163F09EDAC6600E66AF8 /* Deployment */,
- 01E2164009EDAC6600E66AF8 /* Default */,
+ 01E2163E09EDAC6600E66AF8 /* Debug */,
+ 01E2163F09EDAC6600E66AF8 /* Release */,
);
defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Default;
+ defaultConfigurationName = Debug;
};
/* End XCConfigurationList section */
};