Skip to content

Commit fed429f

Browse files
chalonversechalonverse
committed
Chapter 1 mac
1 parent e6c1b72 commit fed429f

3 files changed

Lines changed: 27 additions & 51 deletions

File tree

Chapter01/Chapter3-mac.xcodeproj/project.pbxproj renamed to Chapter01/Chapter01-mac.xcodeproj/project.pbxproj

Lines changed: 19 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,15 @@
88

99
/* Begin PBXBuildFile section */
1010
9223C4781F009428009A94D7 /* Game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4671F009428009A94D7 /* Game.cpp */; };
11-
9223C4791F009428009A94D7 /* Actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4681F009428009A94D7 /* Actor.cpp */; };
12-
9223C47A1F009428009A94D7 /* AnimSpriteComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C46A1F009428009A94D7 /* AnimSpriteComponent.cpp */; };
13-
9223C47B1F009428009A94D7 /* BGSpriteComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C46C1F009428009A94D7 /* BGSpriteComponent.cpp */; };
14-
9223C47C1F009428009A94D7 /* Component.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C46E1F009428009A94D7 /* Component.cpp */; };
1511
9223C47D1F009428009A94D7 /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4711F009428009A94D7 /* Main.cpp */; };
16-
9223C47E1F009428009A94D7 /* Math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4721F009428009A94D7 /* Math.cpp */; };
17-
9223C47F1F009428009A94D7 /* Ship.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4741F009428009A94D7 /* Ship.cpp */; };
18-
9223C4801F009428009A94D7 /* SpriteComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4761F009428009A94D7 /* SpriteComponent.cpp */; };
1912
92D324FB1B697389005A86C7 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92D324FA1B697389005A86C7 /* CoreFoundation.framework */; };
2013
92E46E941B6353E50035CD21 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E46E931B6353E50035CD21 /* OpenGL.framework */; };
2114
/* End PBXBuildFile section */
2215

2316
/* Begin PBXFileReference section */
2417
9223C4671F009428009A94D7 /* Game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Game.cpp; sourceTree = "<group>"; };
25-
9223C4681F009428009A94D7 /* Actor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Actor.cpp; sourceTree = "<group>"; };
26-
9223C4691F009428009A94D7 /* Actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Actor.h; sourceTree = "<group>"; };
27-
9223C46A1F009428009A94D7 /* AnimSpriteComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnimSpriteComponent.cpp; sourceTree = "<group>"; };
28-
9223C46B1F009428009A94D7 /* AnimSpriteComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimSpriteComponent.h; sourceTree = "<group>"; };
29-
9223C46C1F009428009A94D7 /* BGSpriteComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BGSpriteComponent.cpp; sourceTree = "<group>"; };
30-
9223C46D1F009428009A94D7 /* BGSpriteComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BGSpriteComponent.h; sourceTree = "<group>"; };
31-
9223C46E1F009428009A94D7 /* Component.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Component.cpp; sourceTree = "<group>"; };
32-
9223C46F1F009428009A94D7 /* Component.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Component.h; sourceTree = "<group>"; };
3318
9223C4701F009428009A94D7 /* Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Game.h; sourceTree = "<group>"; };
3419
9223C4711F009428009A94D7 /* Main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Main.cpp; sourceTree = "<group>"; };
35-
9223C4721F009428009A94D7 /* Math.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Math.cpp; sourceTree = "<group>"; };
36-
9223C4731F009428009A94D7 /* Math.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Math.h; sourceTree = "<group>"; };
37-
9223C4741F009428009A94D7 /* Ship.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ship.cpp; sourceTree = "<group>"; };
38-
9223C4751F009428009A94D7 /* Ship.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ship.h; sourceTree = "<group>"; };
39-
9223C4761F009428009A94D7 /* SpriteComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpriteComponent.cpp; sourceTree = "<group>"; };
40-
9223C4771F009428009A94D7 /* SpriteComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteComponent.h; sourceTree = "<group>"; };
4120
92D324FA1B697389005A86C7 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
4221
92E46DF71B634EA30035CD21 /* Game-mac */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Game-mac"; sourceTree = BUILT_PRODUCTS_DIR; };
4322
92E46E931B6353E50035CD21 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
@@ -59,23 +38,9 @@
5938
92E46DEE1B634EA30035CD21 = {
6039
isa = PBXGroup;
6140
children = (
62-
9223C4681F009428009A94D7 /* Actor.cpp */,
63-
9223C4691F009428009A94D7 /* Actor.h */,
64-
9223C46A1F009428009A94D7 /* AnimSpriteComponent.cpp */,
65-
9223C46B1F009428009A94D7 /* AnimSpriteComponent.h */,
66-
9223C46C1F009428009A94D7 /* BGSpriteComponent.cpp */,
67-
9223C46D1F009428009A94D7 /* BGSpriteComponent.h */,
68-
9223C46E1F009428009A94D7 /* Component.cpp */,
69-
9223C46F1F009428009A94D7 /* Component.h */,
7041
9223C4671F009428009A94D7 /* Game.cpp */,
7142
9223C4701F009428009A94D7 /* Game.h */,
7243
9223C4711F009428009A94D7 /* Main.cpp */,
73-
9223C4721F009428009A94D7 /* Math.cpp */,
74-
9223C4731F009428009A94D7 /* Math.h */,
75-
9223C4741F009428009A94D7 /* Ship.cpp */,
76-
9223C4751F009428009A94D7 /* Ship.h */,
77-
9223C4761F009428009A94D7 /* SpriteComponent.cpp */,
78-
9223C4771F009428009A94D7 /* SpriteComponent.h */,
7944
92E46DF81B634EA30035CD21 /* Products */,
8045
92D324FA1B697389005A86C7 /* CoreFoundation.framework */,
8146
92E46E931B6353E50035CD21 /* OpenGL.framework */,
@@ -116,15 +81,15 @@
11681
92E46DEF1B634EA30035CD21 /* Project object */ = {
11782
isa = PBXProject;
11883
attributes = {
119-
LastUpgradeCheck = 0720;
84+
LastUpgradeCheck = 0920;
12085
ORGANIZATIONNAME = "Sanjay Madhav";
12186
TargetAttributes = {
12287
92E46DF61B634EA30035CD21 = {
12388
CreatedOnToolsVersion = 6.4;
12489
};
12590
};
12691
};
127-
buildConfigurationList = 92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter3-mac" */;
92+
buildConfigurationList = 92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter01-mac" */;
12893
compatibilityVersion = "Xcode 3.2";
12994
developmentRegion = English;
13095
hasScannedForEncodings = 0;
@@ -163,14 +128,7 @@
163128
buildActionMask = 2147483647;
164129
files = (
165130
9223C47D1F009428009A94D7 /* Main.cpp in Sources */,
166-
9223C47E1F009428009A94D7 /* Math.cpp in Sources */,
167-
9223C47A1F009428009A94D7 /* AnimSpriteComponent.cpp in Sources */,
168-
9223C47B1F009428009A94D7 /* BGSpriteComponent.cpp in Sources */,
169131
9223C4781F009428009A94D7 /* Game.cpp in Sources */,
170-
9223C4801F009428009A94D7 /* SpriteComponent.cpp in Sources */,
171-
9223C47F1F009428009A94D7 /* Ship.cpp in Sources */,
172-
9223C4791F009428009A94D7 /* Actor.cpp in Sources */,
173-
9223C47C1F009428009A94D7 /* Component.cpp in Sources */,
174132
);
175133
runOnlyForDeploymentPostprocessing = 0;
176134
};
@@ -185,13 +143,21 @@
185143
CLANG_CXX_LIBRARY = "libc++";
186144
CLANG_ENABLE_MODULES = YES;
187145
CLANG_ENABLE_OBJC_ARC = YES;
146+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
188147
CLANG_WARN_BOOL_CONVERSION = YES;
148+
CLANG_WARN_COMMA = YES;
189149
CLANG_WARN_CONSTANT_CONVERSION = YES;
190150
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
191151
CLANG_WARN_EMPTY_BODY = YES;
192152
CLANG_WARN_ENUM_CONVERSION = YES;
153+
CLANG_WARN_INFINITE_RECURSION = YES;
193154
CLANG_WARN_INT_CONVERSION = YES;
155+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
156+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
194157
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
158+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
159+
CLANG_WARN_STRICT_PROTOTYPES = YES;
160+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
195161
CLANG_WARN_UNREACHABLE_CODE = YES;
196162
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
197163
COPY_PHASE_STRIP = NO;
@@ -228,13 +194,21 @@
228194
CLANG_CXX_LIBRARY = "libc++";
229195
CLANG_ENABLE_MODULES = YES;
230196
CLANG_ENABLE_OBJC_ARC = YES;
197+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
231198
CLANG_WARN_BOOL_CONVERSION = YES;
199+
CLANG_WARN_COMMA = YES;
232200
CLANG_WARN_CONSTANT_CONVERSION = YES;
233201
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
234202
CLANG_WARN_EMPTY_BODY = YES;
235203
CLANG_WARN_ENUM_CONVERSION = YES;
204+
CLANG_WARN_INFINITE_RECURSION = YES;
236205
CLANG_WARN_INT_CONVERSION = YES;
206+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
207+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
237208
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
209+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
210+
CLANG_WARN_STRICT_PROTOTYPES = YES;
211+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
238212
CLANG_WARN_UNREACHABLE_CODE = YES;
239213
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
240214
COPY_PHASE_STRIP = NO;
@@ -318,7 +292,7 @@
318292
/* End XCBuildConfiguration section */
319293

320294
/* Begin XCConfigurationList section */
321-
92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter3-mac" */ = {
295+
92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter01-mac" */ = {
322296
isa = XCConfigurationList;
323297
buildConfigurations = (
324298
92E46DFC1B634EA40035CD21 /* Debug */,

Chapter01/Chapter3-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to Chapter01/Chapter01-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Chapter01/Chapter3-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme renamed to Chapter01/Chapter01-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0920"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -17,7 +17,7 @@
1717
BlueprintIdentifier = "92E46DF61B634EA30035CD21"
1818
BuildableName = "Game-mac"
1919
BlueprintName = "Game-mac"
20-
ReferencedContainer = "container:Chapter3-mac.xcodeproj">
20+
ReferencedContainer = "container:Chapter01-mac.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -35,7 +36,7 @@
3536
BlueprintIdentifier = "92E46DF61B634EA30035CD21"
3637
BuildableName = "Game-mac"
3738
BlueprintName = "Game-mac"
38-
ReferencedContainer = "container:Chapter3-mac.xcodeproj">
39+
ReferencedContainer = "container:Chapter01-mac.xcodeproj">
3940
</BuildableReference>
4041
</MacroExpansion>
4142
<AdditionalOptions>
@@ -45,6 +46,7 @@
4546
buildConfiguration = "Debug"
4647
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4748
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
4850
launchStyle = "0"
4951
useCustomWorkingDirectory = "YES"
5052
customWorkingDirectory = "$(SRCROOT)"
@@ -59,7 +61,7 @@
5961
BlueprintIdentifier = "92E46DF61B634EA30035CD21"
6062
BuildableName = "Game-mac"
6163
BlueprintName = "Game-mac"
62-
ReferencedContainer = "container:Chapter3-mac.xcodeproj">
64+
ReferencedContainer = "container:Chapter01-mac.xcodeproj">
6365
</BuildableReference>
6466
</BuildableProductRunnable>
6567
<AdditionalOptions>
@@ -78,7 +80,7 @@
7880
BlueprintIdentifier = "92E46DF61B634EA30035CD21"
7981
BuildableName = "Game-mac"
8082
BlueprintName = "Game-mac"
81-
ReferencedContainer = "container:Chapter3-mac.xcodeproj">
83+
ReferencedContainer = "container:Chapter01-mac.xcodeproj">
8284
</BuildableReference>
8385
</BuildableProductRunnable>
8486
</ProfileAction>

0 commit comments

Comments
 (0)