diff options
| -rw-r--r-- | Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj | 22 | ||||
| -rw-r--r-- | Source/SPEditorTokens.l | 6 | ||||
| -rw-r--r-- | Source/SPSQLTokenizer.l | 4 |
3 files changed, 9 insertions, 23 deletions
diff --git a/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj b/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj index 93bdddb6..5b9ef229 100644 --- a/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj +++ b/Frameworks/PostgresKit/PostgresKit.xcodeproj/project.pbxproj @@ -568,19 +568,16 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Resources/Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; OTHER_LDFLAGS = ( "-framework", Cocoa, "-framework", SenTestingKit, ); - PREBINDING = YES; PRODUCT_NAME = Tests; TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; @@ -592,23 +589,19 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Resources/Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; OTHER_LDFLAGS = ( "-framework", Cocoa, "-framework", SenTestingKit, ); - PREBINDING = YES; PRODUCT_NAME = Tests; TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; @@ -624,18 +617,15 @@ FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h"; INFOPLIST_FILE = "Resources/Tests-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; OTHER_LDFLAGS = ( "-framework", Cocoa, "-framework", SenTestingKit, ); - PREBINDING = YES; PRODUCT_NAME = Tests; TEST_AFTER_BUILD = YES; WRAPPER_EXTENSION = octest; @@ -645,6 +635,7 @@ 17E5952D14F302740054EE08 /* Distribution */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_STATIC_ANALYZER_MODE = deep; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; @@ -664,8 +655,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = ""; - PREBINDING = NO; - SDKROOT = macosx; + MACOSX_DEPLOYMENT_TARGET = 10.6; VALID_ARCHS = "i386 x86_64"; }; name = Distribution; @@ -820,6 +810,7 @@ 1DEB91B208733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_STATIC_ANALYZER_MODE = deep; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; @@ -840,9 +831,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = ""; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SDKROOT = macosx; VALID_ARCHS = "i386 x86_64"; }; name = Debug; @@ -850,6 +840,7 @@ 1DEB91B308733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CLANG_STATIC_ANALYZER_MODE = deep; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; @@ -869,8 +860,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = Resources/Info.plist; INFOPLIST_PREFIX_HEADER = ""; - PREBINDING = NO; - SDKROOT = macosx; + MACOSX_DEPLOYMENT_TARGET = 10.6; VALID_ARCHS = "i386 x86_64"; }; name = Release; diff --git a/Source/SPEditorTokens.l b/Source/SPEditorTokens.l index c78018a1..c10dbd60 100644 --- a/Source/SPEditorTokens.l +++ b/Source/SPEditorTokens.l @@ -1,7 +1,5 @@ %{ - -// -// $Id$ + // // SPEditorTokens.l // sequel-pro @@ -30,7 +28,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -// More info at <http://code.google.com/p/sequel-pro/> +// More info at <https://github.com/sequelpro/sequelpro> /** * This is the lex file used for syntax coloring. diff --git a/Source/SPSQLTokenizer.l b/Source/SPSQLTokenizer.l index 5e3a9537..24dac938 100644 --- a/Source/SPSQLTokenizer.l +++ b/Source/SPSQLTokenizer.l @@ -1,8 +1,6 @@ %{ // -// $Id$ -// // SPSQLTokenizer.l // sequel-pro // @@ -30,7 +28,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR // OTHER DEALINGS IN THE SOFTWARE. // -// More info at <http://code.google.com/p/sequel-pro/> +// More info at <https://github.com/sequelpro/sequelpro> #import "SPSQLTokenizer.h" |