From 66fe98cfc3ec79f517bd6414103c4bb5ea49fac2 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 27 Jun 2010 14:49:17 +0200
Subject: [PATCH] Fixed: world_editor_sound_plugin compilation on 64 bits

---
 .../world_editor/world_editor_doc.h           |   4 +-
 .../world_editor_sound_plugin/DialogFlags.cpp |   2 +-
 .../world_editor_sound_plugin/DialogFlags.h   |   2 +-
 .../world_editor_sound_plugin.vcproj          | 175 ++++++++----------
 4 files changed, 86 insertions(+), 97 deletions(-)

diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h
index b23f5d522..7ec562b37 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor_doc.h
@@ -76,8 +76,8 @@ public:
 	bool						operator== (const CDatabaseLocator &other) const;
 	bool						operator< (const CDatabaseLocator &other) const
 	{
-		const uint size = _LocateStack.size ();
-		const uint otherSize = other._LocateStack.size ();
+		const uint size = (uint)_LocateStack.size ();
+		const uint otherSize = (uint)other._LocateStack.size ();
 		const uint minSize = std::min (size, otherSize);
 		uint i;
 		for (i=0; i<minSize; i++)
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp
index 04e541bc7..036e197fe 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.cpp
@@ -208,7 +208,7 @@ void CDialogFlags::lostPositionControl()
 	CheckMoveEar.SetBitmap(EarBitmap);
 }
 
-void CDialogFlags::OnTimer(UINT nIDEvent) 
+void CDialogFlags::OnTimer(UINT_PTR nIDEvent) 
 {
 	CDialog::OnTimer(nIDEvent);
 
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.h
index 5f4e91048..e2105bf64 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/DialogFlags.h
@@ -83,7 +83,7 @@ protected:
 	//{{AFX_MSG(CDialogFlags)
 	afx_msg void OnButtonPlayStop();
 	afx_msg void OnCheckMoveEar();
-	afx_msg void OnTimer(UINT nIDEvent);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 	afx_msg void OnDestroy();
 	afx_msg void OnReload();
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.vcproj b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.vcproj
index ee5e49c7c..8ee03c30d 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.vcproj
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="world_editor_sound_plugin"
 	ProjectGUID="{CBEDEB8E-18EA-4699-BF0F-061F0F644780}"
+	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
@@ -65,12 +66,9 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\install\$(ProjectName)_d.dll"
-				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="msvcrt.lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)\$(TargetName).lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -95,6 +93,84 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
+			ConfigurationType="2"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="4"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WORLDEDITOR_SOUND_PLUGIN_EXPORTS"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\install\$(ProjectName)_d.dll"
+				IgnoreDefaultLibraryNames="msvcrt.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\..\..\..\obj\$(ConfigurationName)\$(ProjectName)"
@@ -148,13 +224,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\install\$(ProjectName)_r.dll"
-				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\$(TargetName).lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -179,87 +252,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WORLDEDITOR_SOUND_PLUGIN_EXPORTS"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="..\..\install\$(ProjectName)_d.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\$(TargetName).lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
@@ -314,13 +306,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\install\$(ProjectName)_r.dll"
-				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\$(TargetName).lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -381,7 +370,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -389,7 +378,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"