From fed429f9ecf0e8c050ae003eaa48bafbc4b81292 Mon Sep 17 00:00:00 2001 From: Sanjay Madhav Date: Mon, 18 Dec 2017 16:39:49 -0600 Subject: [PATCH] Chapter 1 mac --- .../project.pbxproj | 64 ++++++------------- .../contents.xcworkspacedata | 2 +- .../xcshareddata/xcschemes/Game-mac.xcscheme | 12 ++-- 3 files changed, 27 insertions(+), 51 deletions(-) rename Chapter01/{Chapter3-mac.xcodeproj => Chapter01-mac.xcodeproj}/project.pbxproj (69%) rename Chapter01/{Chapter3-mac.xcodeproj => Chapter01-mac.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (54%) rename Chapter01/{Chapter3-mac.xcodeproj => Chapter01-mac.xcodeproj}/xcshareddata/xcschemes/Game-mac.xcscheme (89%) diff --git a/Chapter01/Chapter3-mac.xcodeproj/project.pbxproj b/Chapter01/Chapter01-mac.xcodeproj/project.pbxproj similarity index 69% rename from Chapter01/Chapter3-mac.xcodeproj/project.pbxproj rename to Chapter01/Chapter01-mac.xcodeproj/project.pbxproj index 991e7d82..cf8a87e1 100644 --- a/Chapter01/Chapter3-mac.xcodeproj/project.pbxproj +++ b/Chapter01/Chapter01-mac.xcodeproj/project.pbxproj @@ -8,36 +8,15 @@ /* Begin PBXBuildFile section */ 9223C4781F009428009A94D7 /* Game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4671F009428009A94D7 /* Game.cpp */; }; - 9223C4791F009428009A94D7 /* Actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4681F009428009A94D7 /* Actor.cpp */; }; - 9223C47A1F009428009A94D7 /* AnimSpriteComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C46A1F009428009A94D7 /* AnimSpriteComponent.cpp */; }; - 9223C47B1F009428009A94D7 /* BGSpriteComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C46C1F009428009A94D7 /* BGSpriteComponent.cpp */; }; - 9223C47C1F009428009A94D7 /* Component.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C46E1F009428009A94D7 /* Component.cpp */; }; 9223C47D1F009428009A94D7 /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4711F009428009A94D7 /* Main.cpp */; }; - 9223C47E1F009428009A94D7 /* Math.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4721F009428009A94D7 /* Math.cpp */; }; - 9223C47F1F009428009A94D7 /* Ship.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4741F009428009A94D7 /* Ship.cpp */; }; - 9223C4801F009428009A94D7 /* SpriteComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9223C4761F009428009A94D7 /* SpriteComponent.cpp */; }; 92D324FB1B697389005A86C7 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92D324FA1B697389005A86C7 /* CoreFoundation.framework */; }; 92E46E941B6353E50035CD21 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92E46E931B6353E50035CD21 /* OpenGL.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 9223C4671F009428009A94D7 /* Game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Game.cpp; sourceTree = ""; }; - 9223C4681F009428009A94D7 /* Actor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Actor.cpp; sourceTree = ""; }; - 9223C4691F009428009A94D7 /* Actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Actor.h; sourceTree = ""; }; - 9223C46A1F009428009A94D7 /* AnimSpriteComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnimSpriteComponent.cpp; sourceTree = ""; }; - 9223C46B1F009428009A94D7 /* AnimSpriteComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimSpriteComponent.h; sourceTree = ""; }; - 9223C46C1F009428009A94D7 /* BGSpriteComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BGSpriteComponent.cpp; sourceTree = ""; }; - 9223C46D1F009428009A94D7 /* BGSpriteComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BGSpriteComponent.h; sourceTree = ""; }; - 9223C46E1F009428009A94D7 /* Component.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Component.cpp; sourceTree = ""; }; - 9223C46F1F009428009A94D7 /* Component.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Component.h; sourceTree = ""; }; 9223C4701F009428009A94D7 /* Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Game.h; sourceTree = ""; }; 9223C4711F009428009A94D7 /* Main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Main.cpp; sourceTree = ""; }; - 9223C4721F009428009A94D7 /* Math.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Math.cpp; sourceTree = ""; }; - 9223C4731F009428009A94D7 /* Math.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Math.h; sourceTree = ""; }; - 9223C4741F009428009A94D7 /* Ship.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Ship.cpp; sourceTree = ""; }; - 9223C4751F009428009A94D7 /* Ship.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ship.h; sourceTree = ""; }; - 9223C4761F009428009A94D7 /* SpriteComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpriteComponent.cpp; sourceTree = ""; }; - 9223C4771F009428009A94D7 /* SpriteComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpriteComponent.h; sourceTree = ""; }; 92D324FA1B697389005A86C7 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 92E46DF71B634EA30035CD21 /* Game-mac */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Game-mac"; sourceTree = BUILT_PRODUCTS_DIR; }; 92E46E931B6353E50035CD21 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; @@ -59,23 +38,9 @@ 92E46DEE1B634EA30035CD21 = { isa = PBXGroup; children = ( - 9223C4681F009428009A94D7 /* Actor.cpp */, - 9223C4691F009428009A94D7 /* Actor.h */, - 9223C46A1F009428009A94D7 /* AnimSpriteComponent.cpp */, - 9223C46B1F009428009A94D7 /* AnimSpriteComponent.h */, - 9223C46C1F009428009A94D7 /* BGSpriteComponent.cpp */, - 9223C46D1F009428009A94D7 /* BGSpriteComponent.h */, - 9223C46E1F009428009A94D7 /* Component.cpp */, - 9223C46F1F009428009A94D7 /* Component.h */, 9223C4671F009428009A94D7 /* Game.cpp */, 9223C4701F009428009A94D7 /* Game.h */, 9223C4711F009428009A94D7 /* Main.cpp */, - 9223C4721F009428009A94D7 /* Math.cpp */, - 9223C4731F009428009A94D7 /* Math.h */, - 9223C4741F009428009A94D7 /* Ship.cpp */, - 9223C4751F009428009A94D7 /* Ship.h */, - 9223C4761F009428009A94D7 /* SpriteComponent.cpp */, - 9223C4771F009428009A94D7 /* SpriteComponent.h */, 92E46DF81B634EA30035CD21 /* Products */, 92D324FA1B697389005A86C7 /* CoreFoundation.framework */, 92E46E931B6353E50035CD21 /* OpenGL.framework */, @@ -116,7 +81,7 @@ 92E46DEF1B634EA30035CD21 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0720; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = "Sanjay Madhav"; TargetAttributes = { 92E46DF61B634EA30035CD21 = { @@ -124,7 +89,7 @@ }; }; }; - buildConfigurationList = 92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter3-mac" */; + buildConfigurationList = 92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter01-mac" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -163,14 +128,7 @@ buildActionMask = 2147483647; files = ( 9223C47D1F009428009A94D7 /* Main.cpp in Sources */, - 9223C47E1F009428009A94D7 /* Math.cpp in Sources */, - 9223C47A1F009428009A94D7 /* AnimSpriteComponent.cpp in Sources */, - 9223C47B1F009428009A94D7 /* BGSpriteComponent.cpp in Sources */, 9223C4781F009428009A94D7 /* Game.cpp in Sources */, - 9223C4801F009428009A94D7 /* SpriteComponent.cpp in Sources */, - 9223C47F1F009428009A94D7 /* Ship.cpp in Sources */, - 9223C4791F009428009A94D7 /* Actor.cpp in Sources */, - 9223C47C1F009428009A94D7 /* Component.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -185,13 +143,21 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; @@ -228,13 +194,21 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; @@ -318,7 +292,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter3-mac" */ = { + 92E46DF21B634EA30035CD21 /* Build configuration list for PBXProject "Chapter01-mac" */ = { isa = XCConfigurationList; buildConfigurations = ( 92E46DFC1B634EA40035CD21 /* Debug */, diff --git a/Chapter01/Chapter3-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Chapter01/Chapter01-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 54% rename from Chapter01/Chapter3-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Chapter01/Chapter01-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 84be36ce..403d96cd 100644 --- a/Chapter01/Chapter3-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Chapter01/Chapter01-mac.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:/Users/Sanjay/gameprogcpp-final/Chapter01/Chapter01-mac.xcodeproj"> diff --git a/Chapter01/Chapter3-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme b/Chapter01/Chapter01-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme similarity index 89% rename from Chapter01/Chapter3-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme rename to Chapter01/Chapter01-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme index 8c41bc4b..21a91dfd 100644 --- a/Chapter01/Chapter3-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme +++ b/Chapter01/Chapter01-mac.xcodeproj/xcshareddata/xcschemes/Game-mac.xcscheme @@ -1,6 +1,6 @@ + ReferencedContainer = "container:Chapter01-mac.xcodeproj"> @@ -26,6 +26,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -35,7 +36,7 @@ BlueprintIdentifier = "92E46DF61B634EA30035CD21" BuildableName = "Game-mac" BlueprintName = "Game-mac" - ReferencedContainer = "container:Chapter3-mac.xcodeproj"> + ReferencedContainer = "container:Chapter01-mac.xcodeproj"> @@ -45,6 +46,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "YES" customWorkingDirectory = "$(SRCROOT)" @@ -59,7 +61,7 @@ BlueprintIdentifier = "92E46DF61B634EA30035CD21" BuildableName = "Game-mac" BlueprintName = "Game-mac" - ReferencedContainer = "container:Chapter3-mac.xcodeproj"> + ReferencedContainer = "container:Chapter01-mac.xcodeproj"> @@ -78,7 +80,7 @@ BlueprintIdentifier = "92E46DF61B634EA30035CD21" BuildableName = "Game-mac" BlueprintName = "Game-mac" - ReferencedContainer = "container:Chapter3-mac.xcodeproj"> + ReferencedContainer = "container:Chapter01-mac.xcodeproj">