Properly orient game:engine

engine/engine.xcodeproj/project.pbxproj

@@ -8,27 +8,18 @@
 
 /* Begin PBXBuildFile section */
 		CD2973951D7B117E00E37217 /* time.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD2973931D7B117E00E37217 /* time.cpp */; };
-		CD2973961D7B117E00E37217 /* time.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD2973941D7B117E00E37217 /* time.hpp */; };
 		CDB1F8C81D7A312B00700C6B /* game_dispatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB1F8C61D7A312B00700C6B /* game_dispatch.cpp */; };
-		CDB1F8C91D7A312B00700C6B /* game_dispatch.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CDB1F8C71D7A312B00700C6B /* game_dispatch.hpp */; };
 		CDB1F8CC1D7A319A00700C6B /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB1F8CA1D7A319A00700C6B /* scene.cpp */; };
-		CDB1F8CD1D7A319A00700C6B /* scene.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CDB1F8CB1D7A319A00700C6B /* scene.hpp */; };
 		CDB1F8D21D7A32A300700C6B /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB1F8D01D7A32A300700C6B /* events.cpp */; };
-		CDB1F8D31D7A32A300700C6B /* events.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CDB1F8D11D7A32A300700C6B /* events.hpp */; };
-		CDB1F8D51D7A32F800700C6B /* engine_fwd.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CDB1F8D41D7A32F800700C6B /* engine_fwd.hpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		CD2973931D7B117E00E37217 /* time.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time.cpp; sourceTree = "<group>"; };
-		CD2973941D7B117E00E37217 /* time.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = time.hpp; sourceTree = "<group>"; };
+		CDA34D8422515C99008036A7 /* game */ = {isa = PBXFileReference; lastKnownFileType = folder; name = game; path = include/game; sourceTree = "<group>"; };
 		CDB1F8AE1D7A30CD00700C6B /* libengine.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libengine.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		CDB1F8C61D7A312B00700C6B /* game_dispatch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = game_dispatch.cpp; sourceTree = "<group>"; };
-		CDB1F8C71D7A312B00700C6B /* game_dispatch.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = game_dispatch.hpp; sourceTree = "<group>"; };
 		CDB1F8CA1D7A319A00700C6B /* scene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scene.cpp; sourceTree = "<group>"; };
-		CDB1F8CB1D7A319A00700C6B /* scene.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = scene.hpp; sourceTree = "<group>"; };
 		CDB1F8D01D7A32A300700C6B /* events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = events.cpp; sourceTree = "<group>"; };
-		CDB1F8D11D7A32A300700C6B /* events.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = events.hpp; sourceTree = "<group>"; };
-		CDB1F8D41D7A32F800700C6B /* engine_fwd.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = engine_fwd.hpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -42,10 +33,19 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		CDA34D8522515CA9008036A7 /* test */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = test;
+			sourceTree = "<group>";
+		};
 		CDB1F8A51D7A30CD00700C6B = {
 			isa = PBXGroup;
 			children = (
+				CDA34D8422515C99008036A7 /* game */,
 				CDB1F8B01D7A30CD00700C6B /* src */,
+				CDA34D8522515CA9008036A7 /* test */,
 				CDB1F8AF1D7A30CD00700C6B /* Products */,
 			);
 			sourceTree = "<group>";
@@ -61,17 +61,12 @@
 		CDB1F8B01D7A30CD00700C6B /* src */ = {
 			isa = PBXGroup;
 			children = (
-				CDB1F8D41D7A32F800700C6B /* engine_fwd.hpp */,
 				CDB1F8C61D7A312B00700C6B /* game_dispatch.cpp */,
-				CDB1F8C71D7A312B00700C6B /* game_dispatch.hpp */,
 				CDB1F8CA1D7A319A00700C6B /* scene.cpp */,
-				CDB1F8CB1D7A319A00700C6B /* scene.hpp */,
 				CDB1F8D01D7A32A300700C6B /* events.cpp */,
-				CDB1F8D11D7A32A300700C6B /* events.hpp */,
 				CD2973931D7B117E00E37217 /* time.cpp */,
-				CD2973941D7B117E00E37217 /* time.hpp */,
 			);
-			name = src;
+			path = src;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -81,11 +76,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CDB1F8C91D7A312B00700C6B /* game_dispatch.hpp in Headers */,
-				CDB1F8D31D7A32A300700C6B /* events.hpp in Headers */,
-				CDB1F8D51D7A32F800700C6B /* engine_fwd.hpp in Headers */,
-				CD2973961D7B117E00E37217 /* time.hpp in Headers */,
-				CDB1F8CD1D7A319A00700C6B /* scene.hpp in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -158,7 +148,6 @@
 		CDB1F8B71D7A30CD00700C6B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -205,13 +194,13 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../include/expect/include $(PROJECT_DIR)/../";
 			};
 			name = Debug;
 		};
 		CDB1F8B81D7A30CD00700C6B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -251,6 +240,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include/ $(PROJECT_DIR)/../include/expect/include $(PROJECT_DIR)/../";
 			};
 			name = Release;
 		};
@@ -264,7 +254,6 @@
 				GCC_ENABLE_CPP_RTTI = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				USER_HEADER_SEARCH_PATHS = ".. ../include";
 			};
 			name = Debug;
 		};
@@ -278,7 +267,6 @@
 				GCC_ENABLE_CPP_RTTI = YES;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				USER_HEADER_SEARCH_PATHS = ".. ../include";
 			};
 			name = Release;
 		};

engine/events.cpp

@@ -5,4 +5,4 @@
 //  Created by Sam Jaffe on 9/2/16.
 //
 
-#include "events.hpp"
+#include "game/engine/events.hpp"

engine/game_dispatch.cpp

@@ -7,10 +7,10 @@
 
 #include <thread>
 
-#include "game_dispatch.hpp"
+#include "game/engine/game_dispatch.hpp"
 
-#include "events.hpp"
-#include "scene.hpp"
+#include "game/engine/events.hpp"
+#include "game/engine/scene.hpp"
 
 namespace engine {
   namespace {

engine/scene.cpp

@@ -5,10 +5,10 @@
 //  Created by Sam Jaffe on 9/2/16.
 //
 
-#include "scene.hpp"
+#include "game/engine/scene.hpp"
 
-#include "events.hpp"
-#include "game_dispatch.hpp"
+#include "game/engine/events.hpp"
+#include "game/engine/game_dispatch.hpp"
 
 namespace engine {
   

engine/time.cpp

@@ -5,7 +5,7 @@
 //  Created by Sam Jaffe on 9/3/16.
 //
 
-#include "time.hpp"
+#include "game/engine/time.hpp"
 
 namespace engine {
   using std::chrono::duration_cast;