瀏覽代碼

Update to use new ID-based driver settings.

Sam Jaffe 6 年之前
父節點
當前提交
e419f2ed52
共有 3 個文件被更改,包括 24 次插入9 次删除
  1. 20 1
      danmaku.xcodeproj/project.pbxproj
  2. 3 7
      danmaku.xcodeproj/xcshareddata/xcschemes/danmaku.xcscheme
  3. 1 1
      danmaku/GameView.mm

+ 20 - 1
danmaku.xcodeproj/project.pbxproj

@@ -28,11 +28,19 @@
 		CD49F784229B25DE00EB8926 /* libmath.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD7E883022960DBC00D877FE /* libmath.dylib */; };
 		CD49F794229C22A800EB8926 /* serial.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD49F793229C22A800EB8926 /* serial.cxx */; };
 		CD49F7B3229C530A00EB8926 /* world.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CD49F7B2229C530A00EB8926 /* world.cxx */; };
+		CD6CDB94234EAC0200D76C1A /* libopengl_graphics.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6CDB81234EABB300D76C1A /* libopengl_graphics.dylib */; };
 		CD7E87A52295FCED00D877FE /* danmakuUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = CD7E87A42295FCED00D877FE /* danmakuUITests.m */; };
 		CDA4693823061D5B0011E246 /* libjsoncpp.1.9.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CDA4693723061D5B0011E246 /* libjsoncpp.1.9.0.dylib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		CD6CDB80234EABB300D76C1A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CD7E883322960DBF00D877FE /* graphics.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CD6CDB61234EA31500D76C1A;
+			remoteInfo = opengl_graphics;
+		};
 		CD7E881122960D8200D877FE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = CD7E880B22960D8200D877FE /* engine.xcodeproj */;
@@ -123,6 +131,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CD6CDB94234EAC0200D76C1A /* libopengl_graphics.dylib in Frameworks */,
 				CDA4693823061D5B0011E246 /* libjsoncpp.1.9.0.dylib in Frameworks */,
 				CD49F784229B25DE00EB8926 /* libmath.dylib in Frameworks */,
 				CD1C833F2298A9E000825C4E /* libengine.dylib in Frameworks */,
@@ -265,6 +274,7 @@
 			children = (
 				CD7E883922960DBF00D877FE /* libgraphics.dylib */,
 				CDA4693423061D4D0011E246 /* graphics-test.xctest */,
+				CD6CDB81234EABB300D76C1A /* libopengl_graphics.dylib */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -312,7 +322,7 @@
 		CD7E877B2295FCEA00D877FE /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1110;
 				ORGANIZATIONNAME = "Sam Jaffe";
 				TargetAttributes = {
 					CD1C83282298A89E00825C4E = {
@@ -362,6 +372,13 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		CD6CDB81234EABB300D76C1A /* libopengl_graphics.dylib */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.dylib";
+			path = libopengl_graphics.dylib;
+			remoteRef = CD6CDB80234EABB300D76C1A /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		CD7E881222960D8200D877FE /* libengine.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
@@ -472,6 +489,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = danmaku/danmaku.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = danmaku/Info.plist;
@@ -494,6 +512,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = danmaku/danmaku.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = danmaku/Info.plist;

+ 3 - 7
danmaku.xcodeproj/xcshareddata/xcschemes/danmaku.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1110"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:danmaku.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:danmaku.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

+ 1 - 1
danmaku/GameView.mm

@@ -44,7 +44,7 @@ namespace env { namespace detail {
 
   using graphics::direct_renderer;
   using graphics::driver;
-  renderer = std::make_shared<direct_renderer>(driver::openGL);
+  renderer = std::make_shared<direct_renderer>("openGL");
   game = std::make_shared<engine::game_dispatch>(renderer);
   auto world = danmaku::world::load_world("scripts/level/world.json", game);
   game->register_scene(world);