Browse Source

Fix some things in the project defs

Sam Jaffe 6 years ago
parent
commit
b33a0487ee

+ 17 - 1
engine/engine.xcodeproj/project.pbxproj

@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		CD2973951D7B117E00E37217 /* time.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD2973931D7B117E00E37217 /* time.cpp */; };
+		CD62D8462251A94C0023219A /* libgraphics.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD62D8452251A94C0023219A /* libgraphics.dylib */; };
+		CD62D8482251A9500023219A /* libmath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD62D8472251A9500023219A /* libmath.dylib */; };
 		CDB1F8C81D7A312B00700C6B /* game_dispatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB1F8C61D7A312B00700C6B /* game_dispatch.cpp */; };
 		CDB1F8CC1D7A319A00700C6B /* scene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB1F8CA1D7A319A00700C6B /* scene.cpp */; };
 		CDB1F8D21D7A32A300700C6B /* events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CDB1F8D01D7A32A300700C6B /* events.cpp */; };
@@ -15,6 +17,8 @@
 
 /* Begin PBXFileReference section */
 		CD2973931D7B117E00E37217 /* time.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time.cpp; sourceTree = "<group>"; };
+		CD62D8452251A94C0023219A /* libgraphics.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libgraphics.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		CD62D8472251A9500023219A /* libmath.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libmath.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		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>"; };
@@ -27,12 +31,23 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CD62D8482251A9500023219A /* libmath.dylib in Frameworks */,
+				CD62D8462251A94C0023219A /* libgraphics.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		CD62D8442251A94C0023219A /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				CD62D8452251A94C0023219A /* libgraphics.dylib */,
+				CD62D8472251A9500023219A /* libmath.dylib */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		CDA34D8522515CA9008036A7 /* test */ = {
 			isa = PBXGroup;
 			children = (
@@ -47,6 +62,7 @@
 				CDB1F8B01D7A30CD00700C6B /* src */,
 				CDA34D8522515CA9008036A7 /* test */,
 				CDB1F8AF1D7A30CD00700C6B /* Products */,
+				CD62D8442251A94C0023219A /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -147,7 +163,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp -r ${PROJECT_DIR}/include/* ${BUILT_PRODUCTS_DIR}/usr/local/include/\n";
+			shellScript = "mkdir -p ${BUILT_PRODUCTS_DIR}/usr/local/include/\ncp -r ${PROJECT_DIR}/include/* ${BUILT_PRODUCTS_DIR}/usr/local/include/\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

+ 1 - 1
graphics/graphics.xcodeproj/project.pbxproj

@@ -154,7 +154,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp -r ${PROJECT_DIR}/include/* ${BUILT_PRODUCTS_DIR}/usr/local/include/\n";
+			shellScript = "mkdir -p ${BUILT_PRODUCTS_DIR}/usr/local/include/\ncp -r ${PROJECT_DIR}/include/* ${BUILT_PRODUCTS_DIR}/usr/local/include/\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

+ 2 - 3
math/math.xcodeproj/project.pbxproj

@@ -81,7 +81,6 @@
 				CDA34D9022517689008036A7 /* vector.hpp */,
 			);
 			name = include;
-			path = include/include;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -165,7 +164,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cp -r ${PROJECT_DIR}/include/* ${BUILT_PRODUCTS_DIR}/usr/local/include/\n";
+			shellScript = "mkdir -p ${BUILT_PRODUCTS_DIR}/usr/local/include/\ncp -r ${PROJECT_DIR}/include/* ${BUILT_PRODUCTS_DIR}/usr/local/include/\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -175,7 +174,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				CD3AC71E1D2C0AF8002B4BB0 /* shape.cpp in Sources */,
-				CD3C80BC1D68902300ACC795 /* common.cpp in Sources */,
+				CD1FCFEC227E4C2E00F9BF93 /* common.cpp in Sources */,
 				CD3C809F1D675AB100ACC795 /* angle.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;