Selaa lähdekoodia

Fixes compile warnings
- Mac Sample Apps -- Removed lib folders that do not exist
- Casting UIView to View

Brandon Slack 14 vuotta sitten
vanhempi
sitoutus
d6e8a0d2ec
3 muutettua tiedostoa jossa 51 lisäystä ja 80 poistoa
  1. 42 79
      .gitignore
  2. 8 0
      gameplay/gameplay.xcodeproj/project.pbxproj
  3. 1 1
      gameplay/src/PlatformiOS.mm

+ 42 - 79
.gitignore

@@ -1,79 +1,42 @@
-*.suo
-*.sdf
-*.opensdf
-/.metadata
-/169.254.0.1
-/ipch
-/Debug
-/Release
-/Simulator
-/Simulator-Coverage
-/Simulator-Profile
-/Device-Debug
-/Device-Coverage
-/Device-Profile
-/Device-Release
-/gameplay.xcworkspace/xcuserdata
-/gameplay/Debug
-/gameplay/DebugMem
-/gameplay/Release
-/gameplay/Simulator
-/gameplay/Simulator-Coverage
-/gameplay/Simulator-Profile
-/gameplay/Device-Debug
-/gameplay/Device-Coverage
-/gameplay/Device-Profile
-/gameplay/Device-Release
-/gameplay/gameplay.xcodeproj/xcuserdata
-/gameplay-encoder/Debug
-/gameplay-encoder/Release
-/gameplay-encoder/gameplay-encoder.xcodeproj/xcuserdata
-/gameplay-internal
-/gameplay-samples/sample00-mesh/Debug
-/gameplay-samples/sample00-mesh/DebugMem
-/gameplay-samples/sample00-mesh/Release
-/gameplay-samples/sample00-mesh/Simulator
-/gameplay-samples/sample00-mesh/Simulator-Coverage
-/gameplay-samples/sample00-mesh/Simulator-Profile
-/gameplay-samples/sample00-mesh/Device-Debug
-/gameplay-samples/sample00-mesh/Device-Coverage
-/gameplay-samples/sample00-mesh/Device-Profile
-/gameplay-samples/sample00-mesh/Device-Release
-/gameplay-samples/sample00-mesh/res/shaders
-/gameplay-samples/sample00-mesh/sample00-mesh.xcodeproj/xcuserdata
-/gameplay-samples/sample01-longboard/Debug
-/gameplay-samples/sample01-longboard/DebugMem
-/gameplay-samples/sample01-longboard/Release
-/gameplay-samples/sample01-longboard/Simulator
-/gameplay-samples/sample01-longboard/Simulator-Coverage
-/gameplay-samples/sample01-longboard/Simulator-Profile
-/gameplay-samples/sample01-longboard/Device-Debug
-/gameplay-samples/sample01-longboard/Device-Coverage
-/gameplay-samples/sample01-longboard/Device-Profile
-/gameplay-samples/sample01-longboard/Device-Release
-/gameplay-samples/sample01-longboard/res/shaders
-/gameplay-samples/sample01-longboard/sample01-longboard.xcodeproj/xcuserdata
-/gameplay-samples/sample02-spaceship/Debug
-/gameplay-samples/sample02-spaceship/DebugMem
-/gameplay-samples/sample02-spaceship/Release
-/gameplay-samples/sample02-spaceship/Simulator
-/gameplay-samples/sample02-spaceship/Simulator-Coverage
-/gameplay-samples/sample02-spaceship/Simulator-Profile
-/gameplay-samples/sample02-spaceship/Device-Debug
-/gameplay-samples/sample02-spaceship/Device-Coverage
-/gameplay-samples/sample02-spaceship/Device-Profile
-/gameplay-samples/sample02-spaceship/Device-Release
-/gameplay-samples/sample02-spaceship/res/shaders
-/gameplay-samples/sample02-spaceship/sample02-spaceship.xcodeproj/xcuserdata
-/gameplay-samples/sample03-character/Debug
-/gameplay-samples/sample03-character/DebugMem
-/gameplay-samples/sample03-character/Release
-/gameplay-samples/sample03-character/Simulator
-/gameplay-samples/sample03-character/Simulator-Coverage
-/gameplay-samples/sample03-character/Simulator-Profile
-/gameplay-samples/sample03-character/Device-Debug
-/gameplay-samples/sample03-character/Device-Coverage
-/gameplay-samples/sample03-character/Device-Profile
-/gameplay-samples/sample03-character/Device-Release
-/gameplay-samples/sample03-character/res/shaders
-/gameplay-samples/sample03-character/sample03-character.xcodeproj/xcuserdata
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.fsh
+*.vsh
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# PLAYBOOK Build Folders #
+##########################
+Simulator/
+Device-Debug/
+xcuserdata/

+ 8 - 0
gameplay/gameplay.xcodeproj/project.pbxproj

@@ -540,6 +540,7 @@
 		4234D98A14686BB6003031B3 = {
 		4234D98A14686BB6003031B3 = {
 			isa = PBXGroup;
 			isa = PBXGroup;
 			children = (
 			children = (
+				5BE64DE414C4FABD00DD7397 /* iOSTest */,
 				4234D9A314686C52003031B3 /* src */,
 				4234D9A314686C52003031B3 /* src */,
 				427D4F42147DC8DE0076760E /* Libraries */,
 				427D4F42147DC8DE0076760E /* Libraries */,
 				42CCD4AF146D811D00353661 /* Frameworks */,
 				42CCD4AF146D811D00353661 /* Frameworks */,
@@ -811,6 +812,13 @@
 			name = "Mac OS X";
 			name = "Mac OS X";
 			sourceTree = "<group>";
 			sourceTree = "<group>";
 		};
 		};
+		5BE64DE414C4FABD00DD7397 /* iOSTest */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = iOSTest;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 /* End PBXGroup section */
 
 
 /* Begin PBXHeadersBuildPhase section */
 /* Begin PBXHeadersBuildPhase section */

+ 1 - 1
gameplay/src/PlatformiOS.mm

@@ -345,7 +345,7 @@ long getMachTimeInMilliseconds()
     self.view = [[[View alloc] init] autorelease];
     self.view = [[[View alloc] init] autorelease];
     if(__view == nil) 
     if(__view == nil) 
     {
     {
-        __view = self.view;
+        __view = (View*)self.view;
     }
     }
 }
 }