Skip to content

Commit 4561a05

Browse files
chalonversechalonverse
committed
Chapter 7 (Mac)
1 parent 225600f commit 4561a05

File tree

4 files changed

+47
-34
lines changed

4 files changed

+47
-34
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ Release/
1010
.vs
1111
Chapter15/Assets/Saved.gplevel
1212
Chapter15/Assets/*.bin
13+
External/FMOD

‎Chapter07/Chapter8-mac.xcodeproj/project.pbxproj renamed to ‎Chapter07/Chapter07-mac.xcodeproj/project.pbxproj

+38-28
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
9223C47E1F009428009A94D7 /* Math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4721F009428009A94D7 /* Math.cpp */; };
1717
9223C4801F009428009A94D7 /* SpriteComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4761F009428009A94D7 /* SpriteComponent.cpp */; };
1818
9223C48B1F0CA3CE009A94D7 /* MoveComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C48A1F0CA3CE009A94D7 /* MoveComponent.cpp */; };
19-
9223C4941F0CA766009A94D7 /* CollisionComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4901F0CA766009A94D7 /* CollisionComponent.cpp */; };
2019
9223C4951F0CA766009A94D7 /* CircleComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4911F0CA766009A94D7 /* CircleComponent.cpp */; };
2120
92CF0D2F1F3BB5270086A0F3 /* AudioComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D1D1F3BB5270086A0F3 /* AudioComponent.cpp */; };
2221
92CF0D301F3BB5270086A0F3 /* AudioSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92CF0D1F1F3BB5270086A0F3 /* AudioSystem.cpp */; };
@@ -50,9 +49,7 @@
5049
9223C4771F009428009A94D7 /* SpriteComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteComponent.h; sourceTree = "<group>"; };
5150
9223C48A1F0CA3CE009A94D7 /* MoveComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MoveComponent.cpp; sourceTree = "<group>"; };
5251
9223C48C1F0CA3D4009A94D7 /* MoveComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoveComponent.h; sourceTree = "<group>"; };
53-
9223C4901F0CA766009A94D7 /* CollisionComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CollisionComponent.cpp; sourceTree = "<group>"; };
5452
9223C4911F0CA766009A94D7 /* CircleComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CircleComponent.cpp; sourceTree = "<group>"; };
55-
9223C4921F0CA766009A94D7 /* CollisionComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollisionComponent.h; sourceTree = "<group>"; };
5653
9223C4931F0CA766009A94D7 /* CircleComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircleComponent.h; sourceTree = "<group>"; };
5754
92CF0D1D1F3BB5270086A0F3 /* AudioComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioComponent.cpp; sourceTree = "<group>"; };
5855
92CF0D1E1F3BB5270086A0F3 /* AudioComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioComponent.h; sourceTree = "<group>"; };
@@ -93,45 +90,43 @@
9390
92E46DEE1B634EA30035CD21 = {
9491
isa = PBXGroup;
9592
children = (
93+
9223C4681F009428009A94D7 /* Actor.cpp */,
94+
9223C4691F009428009A94D7 /* Actor.h */,
9695
92CF0D1D1F3BB5270086A0F3 /* AudioComponent.cpp */,
9796
92CF0D1E1F3BB5270086A0F3 /* AudioComponent.h */,
9897
92CF0D1F1F3BB5270086A0F3 /* AudioSystem.cpp */,
9998
92CF0D201F3BB5270086A0F3 /* AudioSystem.h */,
10099
92CF0D211F3BB5270086A0F3 /* CameraActor.cpp */,
101100
92CF0D221F3BB5270086A0F3 /* CameraActor.h */,
102-
92CF0D231F3BB5270086A0F3 /* Mesh.cpp */,
103-
92CF0D241F3BB5270086A0F3 /* Mesh.h */,
104-
92CF0D251F3BB5270086A0F3 /* MeshComponent.cpp */,
105-
92CF0D261F3BB5270086A0F3 /* MeshComponent.h */,
106-
92CF0D271F3BB5270086A0F3 /* PlaneActor.cpp */,
107-
92CF0D281F3BB5270086A0F3 /* PlaneActor.h */,
108-
92CF0D291F3BB5270086A0F3 /* Renderer.cpp */,
109-
92CF0D2A1F3BB5270086A0F3 /* Renderer.h */,
110-
92CF0D2B1F3BB5270086A0F3 /* SoundEvent.cpp */,
111-
92CF0D2C1F3BB5270086A0F3 /* SoundEvent.h */,
112-
92CF0D2D1F3BB5270086A0F3 /* VertexArray.cpp */,
113-
92CF0D2E1F3BB5270086A0F3 /* VertexArray.h */,
114-
9223C4681F009428009A94D7 /* Actor.cpp */,
115-
9223C4691F009428009A94D7 /* Actor.h */,
116101
9223C46E1F009428009A94D7 /* Component.cpp */,
117102
9223C46F1F009428009A94D7 /* Component.h */,
118103
9223C4911F0CA766009A94D7 /* CircleComponent.cpp */,
119104
9223C4931F0CA766009A94D7 /* CircleComponent.h */,
120-
9223C4901F0CA766009A94D7 /* CollisionComponent.cpp */,
121-
9223C4921F0CA766009A94D7 /* CollisionComponent.h */,
122105
9223C4671F009428009A94D7 /* Game.cpp */,
123106
9223C4701F009428009A94D7 /* Game.h */,
124107
9223C4711F009428009A94D7 /* Main.cpp */,
125108
9223C4721F009428009A94D7 /* Math.cpp */,
126109
9223C4731F009428009A94D7 /* Math.h */,
110+
92CF0D231F3BB5270086A0F3 /* Mesh.cpp */,
111+
92CF0D241F3BB5270086A0F3 /* Mesh.h */,
112+
92CF0D251F3BB5270086A0F3 /* MeshComponent.cpp */,
113+
92CF0D261F3BB5270086A0F3 /* MeshComponent.h */,
127114
9223C48A1F0CA3CE009A94D7 /* MoveComponent.cpp */,
128115
9223C48C1F0CA3D4009A94D7 /* MoveComponent.h */,
116+
92CF0D271F3BB5270086A0F3 /* PlaneActor.cpp */,
117+
92CF0D281F3BB5270086A0F3 /* PlaneActor.h */,
118+
92CF0D291F3BB5270086A0F3 /* Renderer.cpp */,
119+
92CF0D2A1F3BB5270086A0F3 /* Renderer.h */,
129120
9206FDC71F140D40005078A2 /* Shader.cpp */,
130121
9206FDC81F140D40005078A2 /* Shader.h */,
122+
92CF0D2B1F3BB5270086A0F3 /* SoundEvent.cpp */,
123+
92CF0D2C1F3BB5270086A0F3 /* SoundEvent.h */,
131124
9223C4761F009428009A94D7 /* SpriteComponent.cpp */,
132125
9223C4771F009428009A94D7 /* SpriteComponent.h */,
133126
9206FDC41F140707005078A2 /* Texture.cpp */,
134127
9206FDC51F140707005078A2 /* Texture.h */,
128+
92CF0D2D1F3BB5270086A0F3 /* VertexArray.cpp */,
129+
92CF0D2E1F3BB5270086A0F3 /* VertexArray.h */,
135130
9206FDC31F13F7E8005078A2 /* Shaders */,
136131
92E46DF81B634EA30035CD21 /* Products */,
137132
92D324FA1B697389005A86C7 /* CoreFoundation.framework */,
@@ -173,15 +168,15 @@
173168
92E46DEF1B634EA30035CD21 /* Project object */ = {
174169
isa = PBXProject;
175170
attributes = {
176-
LastUpgradeCheck = 0830;
171+
LastUpgradeCheck = 0920;
177172
ORGANIZATIONNAME = "Sanjay Madhav";
178173
TargetAttributes = {
179174
92E46DF61B634EA30035CD21 = {
180175
CreatedOnToolsVersion = 6.4;
181176
};
182177
};
183178
};
184-
buildConfigurationList = 92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter8-mac" */;
179+
buildConfigurationList = 92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter07-mac" */;
185180
compatibilityVersion = "Xcode 3.2";
186181
developmentRegion = English;
187182
hasScannedForEncodings = 0;
@@ -210,7 +205,7 @@
210205
);
211206
runOnlyForDeploymentPostprocessing = 0;
212207
shellPath = /bin/sh;
213-
shellScript = "if [ -d \"$BUILD_DIR/Debug\" ]; then\n cp \"$SRCROOT\"/../external/GLEW/lib/mac/*.dylib $BUILD_DIR/Debug\n cp \"$SRCROOT\"/../external/SDL/lib/mac/*.dylib $BUILD_DIR/Debug\n cp \"$SRCROOT\"/../external/FMOD/lib/mac/*.dylib $BUILD_DIR/Debug\nfi\n\nif [ -d \"$BUILD_DIR/Release\" ]; then\n cp \"$SRCROOT\"/../external/GLEW/lib/mac/*.dylib $BUILD_DIR/Release\n cp \"$SRCROOT\"/../external/SDL/lib/mac/*.dylib $BUILD_DIR/Release\n cp \"$SRCROOT\"/../external/FMOD/lib/mac/*.dylib $BUILD_DIR/Release\nfi";
208+
shellScript = "if [ -d \"$BUILD_DIR/Debug\" ]; then\n cp \"$SRCROOT\"/../external/GLEW/lib/mac/*.dylib $BUILD_DIR/Debug\n cp \"$SRCROOT\"/../external/SDL/lib/mac/*.dylib $BUILD_DIR/Debug\n cp \"$SRCROOT\"/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/lib/*.dylib $BUILD_DIR/Debug\n cp \"$SRCROOT\"/../external/FMOD/\"FMOD Programmers API\"/api/studio/lib/*.dylib $BUILD_DIR/Debug\nfi\n\nif [ -d \"$BUILD_DIR/Release\" ]; then\n cp \"$SRCROOT\"/../external/GLEW/lib/mac/*.dylib $BUILD_DIR/Release\n cp \"$SRCROOT\"/../external/SDL/lib/mac/*.dylib $BUILD_DIR/Release\n cp \"$SRCROOT\"/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/lib/*.dylib $BUILD_DIR/Release\n cp \"$SRCROOT\"/../external/FMOD/\"FMOD Programmers API\"/api/studio/lib/*.dylib $BUILD_DIR/Release\nfi";
214209
};
215210
/* End PBXShellScriptBuildPhase section */
216211

@@ -220,7 +215,6 @@
220215
buildActionMask = 2147483647;
221216
files = (
222217
92CF0D351F3BB5270086A0F3 /* Renderer.cpp in Sources */,
223-
9223C4941F0CA766009A94D7 /* CollisionComponent.cpp in Sources */,
224218
9223C47D1F009428009A94D7 /* Main.cpp in Sources */,
225219
92CF0D331F3BB5270086A0F3 /* MeshComponent.cpp in Sources */,
226220
9223C47E1F009428009A94D7 /* Math.cpp in Sources */,
@@ -253,14 +247,20 @@
253247
CLANG_CXX_LIBRARY = "libc++";
254248
CLANG_ENABLE_MODULES = YES;
255249
CLANG_ENABLE_OBJC_ARC = YES;
250+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
256251
CLANG_WARN_BOOL_CONVERSION = YES;
252+
CLANG_WARN_COMMA = YES;
257253
CLANG_WARN_CONSTANT_CONVERSION = YES;
258254
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
259255
CLANG_WARN_EMPTY_BODY = YES;
260256
CLANG_WARN_ENUM_CONVERSION = YES;
261257
CLANG_WARN_INFINITE_RECURSION = YES;
262258
CLANG_WARN_INT_CONVERSION = YES;
259+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
260+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
263261
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
262+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
263+
CLANG_WARN_STRICT_PROTOTYPES = YES;
264264
CLANG_WARN_SUSPICIOUS_MOVE = YES;
265265
CLANG_WARN_UNREACHABLE_CODE = YES;
266266
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -298,14 +298,20 @@
298298
CLANG_CXX_LIBRARY = "libc++";
299299
CLANG_ENABLE_MODULES = YES;
300300
CLANG_ENABLE_OBJC_ARC = YES;
301+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
301302
CLANG_WARN_BOOL_CONVERSION = YES;
303+
CLANG_WARN_COMMA = YES;
302304
CLANG_WARN_CONSTANT_CONVERSION = YES;
303305
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
304306
CLANG_WARN_EMPTY_BODY = YES;
305307
CLANG_WARN_ENUM_CONVERSION = YES;
306308
CLANG_WARN_INFINITE_RECURSION = YES;
307309
CLANG_WARN_INT_CONVERSION = YES;
310+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
311+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
308312
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
313+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
314+
CLANG_WARN_STRICT_PROTOTYPES = YES;
309315
CLANG_WARN_SUSPICIOUS_MOVE = YES;
310316
CLANG_WARN_UNREACHABLE_CODE = YES;
311317
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -339,14 +345,16 @@
339345
"$(SRCROOT)/../external/SDL/include",
340346
"$(SRCROOT)/../external/GLEW/include",
341347
"$(SRCROOT)/../external/SOIL/include",
342-
"$(SRCROOT)/../external/FMOD/include",
343348
"$(SRCROOT)/../external/rapidjson/include",
349+
"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/inc",
350+
"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/studio/inc",
344351
);
345352
LIBRARY_SEARCH_PATHS = (
346353
"$(SRCROOT)/../external/GLEW/lib/mac",
347354
"$(SRCROOT)/../external/SDL/lib/mac",
348355
"$(SRCROOT)/../external/SOIL/lib/mac",
349-
"$(SRCROOT)/../external/FMOD/lib/mac",
356+
"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/lib",
357+
"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/studio/lib",
350358
);
351359
OTHER_LDFLAGS = (
352360
"-lGLEW.2.1.0",
@@ -374,14 +382,16 @@
374382
"$(SRCROOT)/../external/SDL/include",
375383
"$(SRCROOT)/../external/GLEW/include",
376384
"$(SRCROOT)/../external/SOIL/include",
377-
"$(SRCROOT)/../external/FMOD/include",
378385
"$(SRCROOT)/../external/rapidjson/include",
386+
"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/inc",
387+
"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/studio/inc",
379388
);
380389
LIBRARY_SEARCH_PATHS = (
381390
"$(SRCROOT)/../external/GLEW/lib/mac",
382391
"$(SRCROOT)/../external/SDL/lib/mac",
383392
"$(SRCROOT)/../external/SOIL/lib/mac",
384-
"$(SRCROOT)/../external/FMOD/lib/mac",
393+
"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/lowlevel/lib",
394+
"$(SRCROOT)/../external/FMOD/\"FMOD Programmers API\"/api/studio/lib",
385395
);
386396
OTHER_LDFLAGS = (
387397
"-lGLEW.2.1.0",
@@ -400,7 +410,7 @@
400410
/* End XCBuildConfiguration section */
401411

402412
/* Begin XCConfigurationList section */
403-
92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter8-mac" */ = {
413+
92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter07-mac" */ = {
404414
isa = XCConfigurationList;
405415
buildConfigurations = (
406416
92E46DFC1B634EA40035CD21 /* Debug */,

‎Chapter07/Chapter8-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to ‎Chapter07/Chapter07-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Chapter07/Chapter8-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme renamed to ‎Chapter07/Chapter07-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme

+7-5
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:Chapter8-mac.xcodeproj">
20+
ReferencedContainer = "container:Chapter07-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:Chapter8-mac.xcodeproj">
39+
ReferencedContainer = "container:Chapter07-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:Chapter8-mac.xcodeproj">
64+
ReferencedContainer = "container:Chapter07-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:Chapter8-mac.xcodeproj">
83+
ReferencedContainer = "container:Chapter07-mac.xcodeproj">
8284
</BuildableReference>
8385
</BuildableProductRunnable>
8486
</ProfileAction>

0 commit comments

Comments
 (0)