Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  [Configuration] Don't overwrite warnings defaults.
  • Loading branch information
fabiopelosin committed Jul 6, 2012
2 parents a827965 + c41f423 commit afe6d8b
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions lib/xcodeproj/project/object/configuration.rb
Expand Up @@ -13,9 +13,6 @@ class XCBuildConfiguration < AbstractPBXObject
'ALWAYS_SEARCH_USER_PATHS' => 'NO', 'ALWAYS_SEARCH_USER_PATHS' => 'NO',
'GCC_C_LANGUAGE_STANDARD' => 'gnu99', 'GCC_C_LANGUAGE_STANDARD' => 'gnu99',
'INSTALL_PATH' => "$(BUILT_PRODUCTS_DIR)", 'INSTALL_PATH' => "$(BUILT_PRODUCTS_DIR)",
'GCC_WARN_ABOUT_MISSING_PROTOTYPES' => 'YES',
'GCC_WARN_ABOUT_RETURN_TYPE' => 'YES',
'GCC_WARN_UNUSED_VARIABLE' => 'YES',
'OTHER_LDFLAGS' => '', 'OTHER_LDFLAGS' => '',
'COPY_PHASE_STRIP' => 'YES', 'COPY_PHASE_STRIP' => 'YES',
}.freeze, }.freeze,
Expand All @@ -35,7 +32,6 @@ class XCBuildConfiguration < AbstractPBXObject
:osx => { :osx => {
'ARCHS' => "$(ARCHS_STANDARD_64_BIT)", 'ARCHS' => "$(ARCHS_STANDARD_64_BIT)",
'GCC_ENABLE_OBJC_EXCEPTIONS' => 'YES', 'GCC_ENABLE_OBJC_EXCEPTIONS' => 'YES',
'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'YES',
'GCC_VERSION' => 'com.apple.compilers.llvm.clang.1_0', 'GCC_VERSION' => 'com.apple.compilers.llvm.clang.1_0',
'MACOSX_DEPLOYMENT_TARGET' => '10.7', 'MACOSX_DEPLOYMENT_TARGET' => '10.7',
'SDKROOT' => 'macosx', 'SDKROOT' => 'macosx',
Expand Down

0 comments on commit afe6d8b

Please sign in to comment.