Fixed build error in RocketCoreOSX (wrong prefix and missing cast on …

…Max)
mikke89 · Sep 10, 2010 · 19c77ad · 19c77ad
1 parent 9303eee
commit 19c77ad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
+# Ignore compiled python code
 *.pyc
+# Ignore MacOSX directory info
 .DS_Store
diff --git a/Build/Rocket.xcodeproj/project.pbxproj b/Build/Rocket.xcodeproj/project.pbxproj
@@ -573,14 +573,14 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 6E8B1DDB123ABC7800C451C8 /* RocketCoreOSX */;
+			remoteGlobalIDString = 6E8B1DDB123ABC7800C451C8;
 			remoteInfo = RocketCoreOSX;
 		};
 		6E8B1F97123ACC3B00C451C8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 6E8B1DDB123ABC7800C451C8 /* RocketCoreOSX */;
+			remoteGlobalIDString = 6E8B1DDB123ABC7800C451C8;
 			remoteInfo = RocketCoreOSX;
 		};
 /* End PBXContainerItemProxy section */
@@ -2258,7 +2258,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = RocketCore_Prefix.pch;
+				GCC_PREFIX_HEADER = Rocket_Prefix.pch;
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2278,7 +2278,7 @@
 				DSTROOT = /tmp/test.dst;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = RocketCore_Prefix.pch;
+				GCC_PREFIX_HEADER = Rocket_Prefix.pch;
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/Source/Core/BaseXMLParser.cpp b/Source/Core/BaseXMLParser.cpp
@@ -483,7 +483,7 @@ bool BaseXMLParser::PeekString(const unsigned char* string, bool consume)
 bool BaseXMLParser::FillBuffer()
 {
 	int bytes_free = buffer_size;
-	int bytes_remaining = Math::Max(buffer_used - (read - buffer), 0);
+	int bytes_remaining = Math::Max((int)(buffer_used - (read - buffer)), 0);
 
 	// If theres any data still in the buffer, shift it down, and fill it again
 	if (bytes_remaining > 0)