Skip to content

Commit

Permalink
Fix compilation errors, perform some recommended project updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@qwzybug
qwzybug committed Feb 20, 2013
1 parent 4621010 commit 4e55e88
Show file tree
Hide file tree
Showing 15 changed files with 155 additions and 139 deletions.
12 changes: 8 additions & 4 deletions BugsFramework/BugsFramework.xcodeproj/project.pbxproj
View file
Expand Up @@ -190,7 +190,11 @@
isa = PBXProject;
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "BugsFramework" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
en,
);
mainGroup = 0867D691FE84028FC02AAC07 /* BugsFramework */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -279,27 +283,27 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_GC = supported;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = macosx10.5;
SDKROOT = "";
};
name = Debug;
};
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
SDKROOT = macosx10.5;
SDKROOT = "";
};
name = Release;
};
Expand Down
Binary file modified CocoaBugs/.DS_Store
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion CocoaBugs/ALifeConfigurationViewController.h
View file
Expand Up @@ -22,7 +22,7 @@ typedef enum _ALifeConfigurationControllerMode {
ALifeConfigurationControllerMode mode;
}

@property(readwrite) Class <ALifeController> simulationClass;
@property(readwrite, retain) Class <ALifeController> simulationClass;
@property(readonly) int contentHeight;
@property (nonatomic, assign) ALifeConfigurationControllerMode mode;
@property (nonatomic, retain) NSMutableArray *optionControllers;
Expand Down
6 changes: 3 additions & 3 deletions CocoaBugs/AppController.m
View file
Expand Up @@ -8,9 +8,9 @@

#import "AppController.h"

#import "ALifeConfigurationWindowController.h";
#import "ALifeWindowController.h";
#import "ALifePluginLoader.h";
#import "ALifeConfigurationWindowController.h"
#import "ALifeWindowController.h"
#import "ALifePluginLoader.h"

@implementation AppController

Expand Down
40 changes: 18 additions & 22 deletions CocoaBugs/CocoaBugs.xcodeproj/project.pbxproj
View file
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 44;
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -251,7 +251,7 @@
037880A4106ED41A0023E6EA /* ALifeTinkerPanelController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ALifeTinkerPanelController.h; sourceTree = "<group>"; };
037880A5106ED41A0023E6EA /* ALifeTinkerPanelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ALifeTinkerPanelController.m; sourceTree = "<group>"; };
037880E5106EDA860023E6EA /* TinkerPanel.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TinkerPanel.xib; sourceTree = "<group>"; };
03A10DB310B3DC590039B8E4 /* GameOfLife.plugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = GameOfLife.plugin.bundle; path = build/Release/GameOfLife.plugin.bundle; sourceTree = "<group>"; };
03A10DB310B3DC590039B8E4 /* GameOfLife.plugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GameOfLife.plugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
03A10DB410B3DC590039B8E4 /* GameOfLife.plugin-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GameOfLife.plugin-Info.plist"; sourceTree = "<group>"; };
03AE61E10E4C902000C0E469 /* Shuffle.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Shuffle.tif; sourceTree = "<group>"; };
03B539860E230663007FCED7 /* ALifeConfigurationWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ALifeConfigurationWindowController.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -608,9 +608,16 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "CocoaBugs" */;
compatibilityVersion = "Xcode 3.0";
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
en,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CocoaBugs */;
projectDirPath = "";
projectReferences = (
Expand Down Expand Up @@ -847,7 +854,6 @@
"\"$(SRCROOT)/../BugsFramework/build/Release\"",
);
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -863,7 +869,6 @@
"-framework",
AppKit,
);
PREBINDING = NO;
PRODUCT_NAME = HeadlessBugs;
};
name = Debug;
Expand All @@ -878,7 +883,6 @@
"$(inherited)",
"\"$(SRCROOT)/../BugsFramework/build/Release\"",
);
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = HeadlessBugs_Prefix.pch;
Expand All @@ -893,7 +897,6 @@
"-framework",
AppKit,
);
PREBINDING = NO;
PRODUCT_NAME = HeadlessBugs;
ZERO_LINK = NO;
};
Expand All @@ -903,9 +906,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -918,7 +921,6 @@
"-framework",
AppKit,
);
PREBINDING = NO;
PRODUCT_NAME = GameOfLife.plugin;
WRAPPER_EXTENSION = bundle;
};
Expand All @@ -928,9 +930,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
Expand All @@ -942,7 +944,6 @@
"-framework",
AppKit,
);
PREBINDING = NO;
PRODUCT_NAME = GameOfLife.plugin;
WRAPPER_EXTENSION = bundle;
ZERO_LINK = NO;
Expand All @@ -952,13 +953,13 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../BugsFramework/build/Release\"",
);
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -978,6 +979,7 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -1000,34 +1002,28 @@
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEPLOYMENT_LOCATION = NO;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_ENABLE_OBJC_GC = supported;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INSTALL_PATH = "";
PREBINDING = NO;
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
SDKROOT = macosx;
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
ppc,
i386,
);
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEPLOYMENT_LOCATION = NO;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_ENABLE_OBJC_GC = unsupported;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INSTALL_PATH = "";
PREBINDING = NO;
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
SDKROOT = macosx;
};
name = Release;
};
Expand Down
7 changes: 7 additions & 0 deletions CocoaBugs/CocoaBugs.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4e55e88

Please sign in to comment.