From 3e0776251c99e8baa662e5cea9ce589a59d0abb9 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Thu, 8 Jul 2010 22:57:54 +0000 Subject: - Extend the LLVM Compiler 1.5 fix from r2444 to all build targets and build modes; this restores LLVM Compiler 1.5 as the default compiler for Debug, Release and Distribution builds. --- sequel-pro.xcodeproj/project.pbxproj | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 47b23b7d..00e403d9 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -2872,6 +2872,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "Resources/Plists/MCPKit-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; LIBRARY_SEARCH_PATHS = ( @@ -3045,13 +3046,17 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Source/Sequel-Pro.pch"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = Resources/Plists/Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/Frameworks/MCPKit/MySQL/lib\"", "\"$(SRCROOT)/Frameworks/zlib\"", ); - OTHER_LDFLAGS = "$(SRCROOT)/Frameworks/zlib/libz.a"; + OTHER_LDFLAGS = ( + "-lstdc++", + "$(SRCROOT)/Frameworks/zlib/libz.a", + ); PRODUCT_NAME = "Sequel Pro"; SEPARATE_STRIP = NO; }; @@ -3112,6 +3117,7 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "Resources/Plists/PSMTabBar-Info.plist"; INSTALL_PATH = "@executable_path/../Frameworks"; OTHER_LDFLAGS = ""; @@ -3199,6 +3205,7 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( + "-lstdc++", "-framework", Foundation, "-framework", @@ -3221,6 +3228,7 @@ GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( + "-lstdc++", "-framework", Foundation, "-framework", @@ -3240,8 +3248,10 @@ GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INSTALL_PATH = /usr/local/bin; OTHER_LDFLAGS = ( + "-lstdc++", "-framework", Foundation, "-framework", @@ -3274,6 +3284,7 @@ "\"$(SRCROOT)/Frameworks/zlib\"", ); OTHER_LDFLAGS = ( + "-lstdc++", "$(SRCROOT)/Frameworks/zlib/libz.a", "-lcrypto", ); @@ -3302,6 +3313,7 @@ "\"$(SRCROOT)/Frameworks/zlib\"", ); OTHER_LDFLAGS = ( + "-lstdc++", "$(SRCROOT)/Frameworks/zlib/libz.a", "-lcrypto", ); @@ -3321,7 +3333,7 @@ GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; @@ -3377,7 +3389,7 @@ GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = NO; - GCC_VERSION = com.apple.compilers.llvmgcc42; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = YES; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; -- cgit v1.2.3