Skip to content

Commit c6e294f

Browse files
committed
UPgrade xcode
1 parent f8d5624 commit c6e294f

File tree

3 files changed

+33
-9
lines changed

3 files changed

+33
-9
lines changed

FlickrSavr.xcodeproj/project.pbxproj

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@
431431
E7C4FB8713FF3B190003A727 /* Project object */ = {
432432
isa = PBXProject;
433433
attributes = {
434-
LastUpgradeCheck = 0420;
434+
LastUpgradeCheck = 0460;
435435
};
436436
buildConfigurationList = E7C4FB8A13FF3B190003A727 /* Build configuration list for PBXProject "FlickrSavr" */;
437437
compatibilityVersion = "Xcode 3.2";
@@ -576,11 +576,15 @@
576576
ALWAYS_SEARCH_USER_PATHS = NO;
577577
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
578578
CLANG_ENABLE_OBJC_ARC = NO;
579+
CLANG_WARN_CONSTANT_CONVERSION = YES;
580+
CLANG_WARN_ENUM_CONVERSION = YES;
581+
CLANG_WARN_INT_CONVERSION = YES;
582+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
579583
COPY_PHASE_STRIP = NO;
580584
GCC_C_LANGUAGE_STANDARD = gnu99;
581585
GCC_DYNAMIC_NO_PIC = NO;
582586
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
583-
GCC_ENABLE_OBJC_GC = supported;
587+
GCC_ENABLE_OBJC_GC = unsupported;
584588
GCC_OPTIMIZATION_LEVEL = 0;
585589
GCC_PREPROCESSOR_DEFINITIONS = (
586590
"DEBUG=1",
@@ -591,6 +595,7 @@
591595
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
592596
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
593597
GCC_WARN_ABOUT_RETURN_TYPE = YES;
598+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
594599
GCC_WARN_UNUSED_VARIABLE = YES;
595600
HEADER_SEARCH_PATHS = "$(SOURCE_ROOT)/External/sbjson/Classes";
596601
MACOSX_DEPLOYMENT_TARGET = 10.6;
@@ -605,15 +610,20 @@
605610
ALWAYS_SEARCH_USER_PATHS = NO;
606611
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
607612
CLANG_ENABLE_OBJC_ARC = NO;
613+
CLANG_WARN_CONSTANT_CONVERSION = YES;
614+
CLANG_WARN_ENUM_CONVERSION = YES;
615+
CLANG_WARN_INT_CONVERSION = YES;
616+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
608617
COPY_PHASE_STRIP = YES;
609618
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
610619
GCC_C_LANGUAGE_STANDARD = gnu99;
611620
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
612-
GCC_ENABLE_OBJC_GC = supported;
621+
GCC_ENABLE_OBJC_GC = unsupported;
613622
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
614623
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
615624
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
616625
GCC_WARN_ABOUT_RETURN_TYPE = YES;
626+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
617627
GCC_WARN_UNUSED_VARIABLE = YES;
618628
HEADER_SEARCH_PATHS = "$(SOURCE_ROOT)/External/sbjson/Classes";
619629
MACOSX_DEPLOYMENT_TARGET = 10.6;
@@ -624,10 +634,13 @@
624634
E7C4FBAB13FF3B190003A727 /* Debug */ = {
625635
isa = XCBuildConfiguration;
626636
buildSettings = {
637+
CLANG_ENABLE_OBJC_ARC = YES;
638+
COMBINE_HIDPI_IMAGES = YES;
627639
GCC_PRECOMPILE_PREFIX_HEADER = YES;
628640
GCC_PREFIX_HEADER = "FlickrSavr/FlickrSavr-Prefix.pch";
629641
INFOPLIST_FILE = "FlickrSavr/FlickrSavr-Info.plist";
630642
INSTALL_PATH = "$(HOME)/Library/Screen Savers";
643+
MACOSX_DEPLOYMENT_TARGET = 10.6.8;
631644
PRODUCT_NAME = "$(TARGET_NAME)";
632645
WRAPPER_EXTENSION = saver;
633646
};
@@ -636,10 +649,13 @@
636649
E7C4FBAC13FF3B190003A727 /* Release */ = {
637650
isa = XCBuildConfiguration;
638651
buildSettings = {
652+
CLANG_ENABLE_OBJC_ARC = YES;
653+
COMBINE_HIDPI_IMAGES = YES;
639654
GCC_PRECOMPILE_PREFIX_HEADER = YES;
640655
GCC_PREFIX_HEADER = "FlickrSavr/FlickrSavr-Prefix.pch";
641656
INFOPLIST_FILE = "FlickrSavr/FlickrSavr-Info.plist";
642657
INSTALL_PATH = "$(HOME)/Library/Screen Savers";
658+
MACOSX_DEPLOYMENT_TARGET = 10.6.8;
643659
PRODUCT_NAME = "$(TARGET_NAME)";
644660
WRAPPER_EXTENSION = saver;
645661
};
@@ -648,6 +664,7 @@
648664
E7C4FBC713FF4A150003A727 /* Debug */ = {
649665
isa = XCBuildConfiguration;
650666
buildSettings = {
667+
COMBINE_HIDPI_IMAGES = YES;
651668
GCC_PRECOMPILE_PREFIX_HEADER = YES;
652669
GCC_PREFIX_HEADER = "saverTest/saverTest-Prefix.pch";
653670
INFOPLIST_FILE = "saverTest/saverTest-Info.plist";
@@ -659,6 +676,7 @@
659676
E7C4FBC813FF4A150003A727 /* Release */ = {
660677
isa = XCBuildConfiguration;
661678
buildSettings = {
679+
COMBINE_HIDPI_IMAGES = YES;
662680
GCC_PRECOMPILE_PREFIX_HEADER = YES;
663681
GCC_PREFIX_HEADER = "saverTest/saverTest-Prefix.pch";
664682
INFOPLIST_FILE = "saverTest/saverTest-Info.plist";

FlickrSavr.xcodeproj/xcuserdata/alan.xcuserdatad/xcschemes/FlickrSavr.xcscheme

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3+
LastUpgradeVersion = "0460"
34
version = "1.3">
45
<BuildAction
56
parallelizeBuildables = "YES"
@@ -22,20 +23,22 @@
2223
</BuildActionEntries>
2324
</BuildAction>
2425
<TestAction
25-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
26+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2627
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
2728
shouldUseLaunchSchemeArgsEnv = "YES"
2829
buildConfiguration = "Debug">
2930
<Testables>
3031
</Testables>
3132
</TestAction>
3233
<LaunchAction
33-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
34+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3435
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
3536
launchStyle = "0"
3637
useCustomWorkingDirectory = "NO"
3738
buildConfiguration = "Debug"
38-
debugDocumentVersioning = "YES">
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
allowLocationSimulation = "YES">
3942
<AdditionalOptions>
4043
</AdditionalOptions>
4144
</LaunchAction>

FlickrSavr.xcodeproj/xcuserdata/alan.xcuserdatad/xcschemes/saverTest.xcscheme

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3+
LastUpgradeVersion = "0460"
34
version = "1.3">
45
<BuildAction
56
parallelizeBuildables = "YES"
@@ -22,20 +23,22 @@
2223
</BuildActionEntries>
2324
</BuildAction>
2425
<TestAction
25-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
26+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2627
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
2728
shouldUseLaunchSchemeArgsEnv = "YES"
2829
buildConfiguration = "Debug">
2930
<Testables>
3031
</Testables>
3132
</TestAction>
3233
<LaunchAction
33-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
34+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3435
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
3536
launchStyle = "0"
3637
useCustomWorkingDirectory = "NO"
3738
buildConfiguration = "Debug"
38-
debugDocumentVersioning = "YES">
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
allowLocationSimulation = "YES">
3942
<BuildableProductRunnable>
4043
<BuildableReference
4144
BuildableIdentifier = "primary"

0 commit comments

Comments
 (0)