[Hgengine-cvs] SF.net SVN: hgengine:[433] Mercury2

[<cn...@us...>]

Revision: 433
          http://hgengine.svn.sourceforge.net/hgengine/?rev=433&view=rev
Author:   cnlohr
Date:     2009-07-23 03:50:09 +0000 (Thu, 23 Jul 2009)

Log Message:
-----------
Update windows project, fixing some 64-bit compat issues.

Modified Paths:
--------------
    Mercury2/Mercury2.vcproj
    Mercury2/modules/TextNode.cpp
    Mercury2/src/GLHelpers.cpp
    Mercury2/src/MercuryFile.cpp
    Mercury2/src/MercuryFileDriverDirect.cpp
    Mercury2/src/MercuryMath.h
    Mercury2/src/MercuryNamedResource.cpp

Modified: Mercury2/Mercury2.vcproj
===================================================================
--- Mercury2/Mercury2.vcproj	2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/Mercury2.vcproj	2009-07-23 03:50:09 UTC (rev 433)
@@ -6,6 +6,7 @@
 	ProjectGUID="{071CC088-86A7-4A9F-9FEE-50BD69132886}"
 	RootNamespace="Mercury2"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -41,13 +42,12 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;src;src/include;src/include/png;src/include/zlib"
-				PreprocessorDefinitions="HGENGINE,WIN32"
+				PreprocessorDefinitions="HGENGINE;WIN32;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -86,9 +86,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -118,11 +115,10 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".;src;src/include;src/include/png;src/include/zlib"
-				PreprocessorDefinitions="HGENGINE,WIN32"
+				PreprocessorDefinitions="HGENGINE;WIN32;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -163,9 +159,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -283,10 +276,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\MercuryPoint.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\src\MercuryPrefs.cpp"
 				>
 			</File>
@@ -517,10 +506,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\MercuryPoint.h"
-				>
-			</File>
-			<File
 				RelativePath=".\src\MercuryPrefs.h"
 				>
 			</File>

Modified: Mercury2/modules/TextNode.cpp
===================================================================
--- Mercury2/modules/TextNode.cpp	2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/modules/TextNode.cpp	2009-07-23 03:50:09 UTC (rev 433)
@@ -242,8 +242,8 @@
 	}
 
 	//Stage 3: Actually generate the geometry.
-	((MercuryVBO*)m_kVBO.Ptr())->AllocateIndexSpace(chars.size()*6);
-	((MercuryVBO*)m_kVBO.Ptr())->AllocateVertexSpace(chars.size()*4);
+	((MercuryVBO*)m_kVBO.Ptr())->AllocateIndexSpace((unsigned)chars.size()*6);
+	((MercuryVBO*)m_kVBO.Ptr())->AllocateVertexSpace((unsigned)chars.size()*4);
 
 	for( unsigned i = 0; i < chars.size(); i++ )
 	{

Modified: Mercury2/src/GLHelpers.cpp
===================================================================
--- Mercury2/src/GLHelpers.cpp	2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/src/GLHelpers.cpp	2009-07-23 03:50:09 UTC (rev 433)
@@ -75,7 +75,7 @@
 		winX, winY, winZ,
 		modelview, projection, viewport,
 		&mouseX, &mouseY, &mouseZ);
-	return MercuryVertex( mouseX, mouseY, mouseZ );
+	return MercuryVertex( (float)mouseX, (float)mouseY, (float)mouseZ );
 }
 
 /****************************************************************************

Modified: Mercury2/src/MercuryFile.cpp
===================================================================
--- Mercury2/src/MercuryFile.cpp	2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/src/MercuryFile.cpp	2009-07-23 03:50:09 UTC (rev 433)
@@ -60,7 +60,7 @@
 		if( *c == ':' )
 		{
 			c++;
-			MString ExtString = ToProper( MString( sPath.c_str(), c-sPath.c_str()-1 ) ) + "/" + c;
+			MString ExtString = ToProper( MString( sPath.c_str(), (int)(c-sPath.c_str()-1) ) ) + "/" + c;
 			const MVector< MercuryThemeManager::Theme > & th = THEME.GetThemes();
 			for( int i = (int)th.size()-1; i >= 0; i-- )
 			{

Modified: Mercury2/src/MercuryFileDriverDirect.cpp
===================================================================
--- Mercury2/src/MercuryFileDriverDirect.cpp	2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/src/MercuryFileDriverDirect.cpp	2009-07-23 03:50:09 UTC (rev 433)
@@ -150,7 +150,7 @@
 {
 	if ( m_fF == NULL )
 		return false;
-	return ( fread( data, 1, length, m_fF) );
+	return (unsigned long)( fread( data, 1, length, m_fF) );
 }
 
 bool MercuryFileObjectDirect::Check()

Modified: Mercury2/src/MercuryMath.h
===================================================================
--- Mercury2/src/MercuryMath.h	2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/src/MercuryMath.h	2009-07-23 03:50:09 UTC (rev 433)
@@ -13,9 +13,10 @@
 #ifdef WIN32
 #include <limits>
 #define INFINITY  (std::numeric_limits<float>::infinity())
+#else
+#define MAXINT	(0x7FFFFFFF)
 #endif
 
-#define MAXINT	(0x7FFFFFFF)
 
 void ZeroFloatRow(FloatRow& r);
 

Modified: Mercury2/src/MercuryNamedResource.cpp
===================================================================
--- Mercury2/src/MercuryNamedResource.cpp	2009-07-21 01:52:34 UTC (rev 432)
+++ Mercury2/src/MercuryNamedResource.cpp	2009-07-23 03:50:09 UTC (rev 433)
@@ -56,7 +56,7 @@
 		if( tmpret.compare( "YES" ) == 0 )	return 1;
 		if( tmpret.compare( "NO" ) == 0 )	return 0;
 
-		return StrToInt( tmpret );
+		return StrToInt( tmpret ) != 0;
 	}
 
 	if( bSetValue )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.