Merge

code/nel/nel.sln

@@ -75,69 +75,131 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|Win32.Build.0 = Debug|Win32
+		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|x64.ActiveCfg = Debug|x64
+		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|x64.Build.0 = Debug|x64
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|Win32.ActiveCfg = Release|Win32
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|Win32.Build.0 = Release|Win32
+		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|x64.ActiveCfg = Release|x64
+		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|x64.Build.0 = Release|x64
 		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|Win32.Build.0 = Debug|Win32
+		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|x64.ActiveCfg = Debug|x64
+		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|x64.Build.0 = Debug|x64
 		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|Win32.ActiveCfg = Release|Win32
 		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|Win32.Build.0 = Release|Win32
+		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|x64.ActiveCfg = Release|x64
+		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|x64.Build.0 = Release|x64
 		{309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Debug|Win32.Build.0 = Debug|Win32
+		{309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Debug|x64.ActiveCfg = Debug|x64
+		{309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Debug|x64.Build.0 = Debug|x64
 		{309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Release|Win32.ActiveCfg = Release|Win32
 		{309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Release|Win32.Build.0 = Release|Win32
+		{309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Release|x64.ActiveCfg = Release|x64
+		{309F8A55-BFBA-433B-8C3E-CB2223F799C3}.Release|x64.Build.0 = Release|x64
 		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|Win32.Build.0 = Debug|Win32
+		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|x64.ActiveCfg = Debug|x64
+		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|x64.Build.0 = Debug|x64
 		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|Win32.ActiveCfg = Release|Win32
 		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|Win32.Build.0 = Release|Win32
+		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|x64.ActiveCfg = Release|x64
+		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|x64.Build.0 = Release|x64
 		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|Win32.Build.0 = Debug|Win32
+		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|x64.ActiveCfg = Debug|x64
+		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|x64.Build.0 = Debug|x64
 		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|Win32.ActiveCfg = Release|Win32
 		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|Win32.Build.0 = Release|Win32
+		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|x64.ActiveCfg = Release|x64
+		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|x64.Build.0 = Release|x64
 		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|Win32.Build.0 = Debug|Win32
+		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|x64.ActiveCfg = Debug|x64
+		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|x64.Build.0 = Debug|x64
 		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|Win32.ActiveCfg = Release|Win32
 		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|Win32.Build.0 = Release|Win32
+		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|x64.ActiveCfg = Release|x64
+		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|x64.Build.0 = Release|x64
 		{0E723473-FDBB-48D7-8141-1273B917D681}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0E723473-FDBB-48D7-8141-1273B917D681}.Debug|Win32.Build.0 = Debug|Win32
+		{0E723473-FDBB-48D7-8141-1273B917D681}.Debug|x64.ActiveCfg = Debug|x64
+		{0E723473-FDBB-48D7-8141-1273B917D681}.Debug|x64.Build.0 = Debug|x64
 		{0E723473-FDBB-48D7-8141-1273B917D681}.Release|Win32.ActiveCfg = Release|Win32
 		{0E723473-FDBB-48D7-8141-1273B917D681}.Release|Win32.Build.0 = Release|Win32
+		{0E723473-FDBB-48D7-8141-1273B917D681}.Release|x64.ActiveCfg = Release|x64
+		{0E723473-FDBB-48D7-8141-1273B917D681}.Release|x64.Build.0 = Release|x64
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|Win32.ActiveCfg = Debug|Win32
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|Win32.Build.0 = Debug|Win32
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|x64.ActiveCfg = Debug|x64
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|x64.Build.0 = Debug|x64
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|Win32.ActiveCfg = Release|Win32
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|Win32.Build.0 = Release|Win32
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|x64.ActiveCfg = Release|x64
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|x64.Build.0 = Release|x64
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|Win32.Build.0 = Debug|Win32
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|x64.ActiveCfg = Debug|x64
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|x64.Build.0 = Debug|x64
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|Win32.ActiveCfg = Release|Win32
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|Win32.Build.0 = Release|Win32
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|x64.ActiveCfg = Release|x64
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|x64.Build.0 = Release|x64
 		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|Win32.Build.0 = Debug|Win32
+		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|x64.ActiveCfg = Debug|x64
+		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|x64.Build.0 = Debug|x64
 		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|Win32.ActiveCfg = Release|Win32
 		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|Win32.Build.0 = Release|Win32
+		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|x64.ActiveCfg = Release|x64
+		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|x64.Build.0 = Release|x64
 		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|Win32.Build.0 = Debug|Win32
+		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|x64.ActiveCfg = Debug|x64
+		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|x64.Build.0 = Debug|x64
 		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|Win32.ActiveCfg = Release|Win32
 		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|Win32.Build.0 = Release|Win32
+		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|x64.ActiveCfg = Release|x64
+		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|x64.Build.0 = Release|x64
 		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|Win32.ActiveCfg = Debug|Win32
 		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|Win32.Build.0 = Debug|Win32
+		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|x64.ActiveCfg = Debug|x64
+		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|x64.Build.0 = Debug|x64
 		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|Win32.ActiveCfg = Release|Win32
 		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|Win32.Build.0 = Release|Win32
+		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|x64.ActiveCfg = Release|x64
+		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|x64.Build.0 = Release|x64
 		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|Win32.Build.0 = Debug|Win32
+		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|x64.ActiveCfg = Debug|x64
+		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|x64.Build.0 = Debug|x64
 		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|Win32.ActiveCfg = Release|Win32
 		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|Win32.Build.0 = Release|Win32
+		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|x64.ActiveCfg = Release|x64
+		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|x64.Build.0 = Release|x64
 		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|Win32.Build.0 = Debug|Win32
+		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|x64.ActiveCfg = Debug|x64
+		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|x64.Build.0 = Debug|x64
 		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|Win32.ActiveCfg = Release|Win32
 		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|Win32.Build.0 = Release|Win32
+		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|x64.ActiveCfg = Release|x64
+		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|x64.Build.0 = Release|x64
 		{23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Debug|Win32.Build.0 = Debug|Win32
+		{23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Debug|x64.ActiveCfg = Debug|x64
+		{23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Debug|x64.Build.0 = Debug|x64
 		{23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Release|Win32.ActiveCfg = Release|Win32
 		{23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Release|Win32.Build.0 = Release|Win32
+		{23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Release|x64.ActiveCfg = Release|x64
+		{23DCF574-1CEB-4DF4-9C59-D614580AC0C0}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

code/nel/src/misc/system_info.cpp

@@ -477,8 +477,10 @@ string CSystemInfo::getOS()
 			{
 				if( GetSystemMetrics(89 /* SM_SERVERR2 */) )
 					OSString += " Windows Server 2003 R2";
+#ifdef VER_SUITE_STORAGE_SERVER
 				else if ( osvi.wSuiteMask == VER_SUITE_STORAGE_SERVER )
 					OSString += " Windows Storage Server 2003";
+#endif
 #ifdef VER_SUITE_WH_SERVER
 				else if ( osvi.wSuiteMask == VER_SUITE_WH_SERVER )
 					OSString += " Windows Home Server";
@@ -512,14 +514,20 @@ string CSystemInfo::getOS()
 
 					else
 					{
-						if ( osvi.wSuiteMask & VER_SUITE_COMPUTE_SERVER )
+						if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
-							OSString += " Compute Cluster Edition";
+							OSString += " Enterprise Edition";
+#ifdef VER_SUITE_DATACENTER
 						else if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
 							OSString += " Datacenter Edition";
-						else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
+#endif
-							OSString += " Enterprise Edition";
+#ifdef VER_SUITE_BLADE
 						else if ( osvi.wSuiteMask & VER_SUITE_BLADE )
 							OSString += " Web Edition";
+#endif
+#ifdef VER_SUITE_COMPUTE_SERVER
+						else if ( osvi.wSuiteMask & VER_SUITE_COMPUTE_SERVER )
+							OSString += " Compute Cluster Edition";
+#endif
 						else
 							OSString += " Standard Edition";
 					}

code/nelns/admin_executor_service/admin_executor_service.vcproj

@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -178,6 +181,170 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="LIBXML_STATIC;WIN32;_DEBUG;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(RootNamespace)_d.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(RootNamespace)_d.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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="LIBXML_STATIC;WIN32;NDEBUG;ASSERT_THROW_EXCEPTION;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				DisableLanguageExtensions="false"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib"
+				OutputFile="$(RootNamespace)_r.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrtd"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(RootNamespace)_r.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>
 	</Configurations>
 	<References>
 	</References>
@@ -189,6 +356,16 @@
 		<File
 			RelativePath="admin_executor_service.cpp"
 			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					PreprocessorDefinitions=""
+					BasicRuntimeChecks="3"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
 				>
@@ -199,7 +376,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Win32"
+				Name="Debug|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -208,6 +385,15 @@
 					BasicRuntimeChecks="3"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="DebugFast|Win32"
 				>
@@ -231,6 +417,16 @@
 		<File
 			RelativePath="log_report.cpp"
 			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					PreprocessorDefinitions=""
+					BasicRuntimeChecks="3"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release|Win32"
 				>
@@ -241,7 +437,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Win32"
+				Name="Debug|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -250,6 +446,15 @@
 					BasicRuntimeChecks="3"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					PreprocessorDefinitions=""
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="DebugFast|Win32"
 				>

code/nelns/admin_service/admin_service.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="admin_service"
 	ProjectGUID="{AA03E539-FE77-4B63-BE0E-DE637635E5A9}"
 	RootNamespace="admin_service"
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -64,10 +67,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib mysqlclient.lib"
+				AdditionalDependencies="mysqlclient.lib"
 				OutputFile="$(RootNamespace)_d.exe"
 				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrt"
+				IgnoreDefaultLibraryNames="msvcrt"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
 				SubSystem="2"
@@ -96,6 +99,88 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="LIBXML_STATIC;WIN32;_DEBUG;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="mysqlclient.lib"
+				OutputFile="$(RootNamespace)_d.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(RootNamespace)_d.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|Win32"
 			OutputDirectory="obj\$(ConfigurationName)\$(ProjectName)"
@@ -178,6 +263,89 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="LIBXML_STATIC;WIN32;NDEBUG;ASSERT_THROW_EXCEPTION;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				DisableLanguageExtensions="false"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib mysqlclient.lib"
+				OutputFile="$(RootNamespace)_r.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrtd"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(RootNamespace)_r.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>
 	</Configurations>
 	<References>
 	</References>

code/nelns/login_service/login_service.vcproj

@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -178,6 +181,171 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="LIBXML_STATIC;WIN32;_DEBUG;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="mysqlclient.lib"
+				OutputFile="$(RootNamespace)_d.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(RootNamespace)_d.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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="LIBXML_STATIC;WIN32;NDEBUG;ASSERT_THROW_EXCEPTION;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				DisableLanguageExtensions="false"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib mysqlclient.lib"
+				OutputFile="$(RootNamespace)_r.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrtd"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(RootNamespace)_r.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>
 	</Configurations>
 	<References>
 	</References>

code/nelns/login_system/nel_launcher_windows/nel_launcher.vcproj

@@ -12,6 +12,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -185,6 +188,176 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="2"
+			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="LIBXML_STATIC;WIN32;_DEBUG;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="StdAfx.h"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(RootNamespace)_d.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(RootNamespace)_d.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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="2"
+			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="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="LIBXML_STATIC;WIN32;NDEBUG;ASSERT_THROW_EXCEPTION;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				DisableLanguageExtensions="false"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="StdAfx.h"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib"
+				OutputFile="$(RootNamespace)_r.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrtd"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(RootNamespace)_r.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>
 	</Configurations>
 	<References>
 	</References>
@@ -228,6 +401,22 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="webbrowser2.cpp"

code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.dsp

@@ -1,189 +0,0 @@
-# Microsoft Developer Studio Project File - Name="nel_launcher" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=nel_launcher - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "nel_launcher.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "nel_launcher.mak" CFG="nel_launcher - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "nel_launcher - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "nel_launcher - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "nel_launcher - Win32 ReleaseDebug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "nel_launcher - Win32 Release"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"std_afx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"std_afx.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 curllib_static.lib libcurl.lib zlib.lib wininet.lib /nologo /subsystem:windows /machine:I386
-
-!ELSEIF  "$(CFG)" == "nel_launcher - Win32 Debug"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"std_afx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "__STL_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_DEBUG" /D "WIN32" /D "_MBCS" /Yu"std_afx.h" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x40c /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 curllib_static.lib zlib.lib wininet.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "nel_launcher - Win32 ReleaseDebug"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "nel_launcher___Win32_ReleaseDebug"
-# PROP BASE Intermediate_Dir "nel_launcher___Win32_ReleaseDebug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDebug"
-# PROP Intermediate_Dir "ReleaseDebug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"std_afx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /D "NL_RELEASE_DEBUG" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "_MBCS" /Yu"std_afx.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x40c /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 curllib_static.lib zlib.lib wininet.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "nel_launcher - Win32 Release"
-# Name "nel_launcher - Win32 Debug"
-# Name "nel_launcher - Win32 ReleaseDebug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\connection.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nel_launcher.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\nel_launcher.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\nel_launcher_dlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\patch.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\std_afx.cpp
-# ADD CPP /Yc"std_afx.h"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\connection.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nel_launcher.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\nel_launcher_dlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\patch.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\std_afx.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\res\nel_launcher.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\nel_launcher.rc2
-# End Source File
-# End Group
-# End Target
-# End Project

code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.dsw

@@ -1,59 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "misc"=..\..\..\nel\src\misc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "nel_launcher"=.\nel_launcher.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name net
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "net"=..\..\..\nel\src\net.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

code/nelns/login_system/nel_launcher_windows_ext2/nel_launcher.vcproj

@@ -2,8 +2,8 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="zviewer"
+	Name="nel_launcher_ext2"
-	ProjectGUID="{B798D9FF-AA33-4918-8B51-1B4FA9C5160A}"
+	ProjectGUID="{FA36BCFD-BC9D-4C5C-A026-5D6B20CC85DA}"
 	>
 	<Platforms>
 		<Platform
@@ -18,9 +18,10 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\obj\$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory="..\..\obj\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory="..\obj\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="..\..\obj\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
+			UseOfMFC="2"
 			CharacterSet="2"
 			>
 			<Tool
@@ -41,11 +42,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				SmallerTypeCheck="true"
 				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="std_afx.h"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -60,10 +63,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libcurl.lib"
 				OutputFile="..\bin\$(ProjectName)_d.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="2"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -90,10 +94,10 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="..\obj64\$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory="..\..\obj64\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory="..\obj64\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="..\..\obj64\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
-			UseOfMFC="0"
+			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
@@ -115,11 +119,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				SmallerTypeCheck="true"
 				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="std_afx.h"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -134,11 +140,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libcurl.lib"
 				OutputFile="..\bin64\$(ProjectName)_d.exe"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
 				GenerateDebugInformation="true"
-				SubSystem="1"
+				SubSystem="2"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -165,10 +171,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\obj\$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory="..\..\obj\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory="..\obj\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="..\..\obj\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
-			UseOfMFC="0"
+			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
@@ -195,9 +201,11 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="std_afx.h"
 				WarningLevel="3"
 			/>
 			<Tool
@@ -211,9 +219,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libcurl.lib"
 				OutputFile="..\bin\$(ProjectName)_r.exe"
 				LinkIncremental="1"
-				SubSystem="1"
+				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
@@ -242,9 +251,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="..\obj64\$(ConfigurationName)\$(ProjectName)"
+			OutputDirectory="..\..\obj64\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory="..\obj64\$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="..\..\obj64\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
+			UseOfMFC="2"
 			CharacterSet="2"
 			>
 			<Tool
@@ -270,9 +280,11 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
 				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="std_afx.h"
 				WarningLevel="3"
 			/>
 			<Tool
@@ -286,9 +298,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="libcurl.lib"
 				OutputFile="..\bin64\$(ProjectName)_r.exe"
 				LinkIncremental="1"
-				SubSystem="1"
+				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				TargetMachine="17"
@@ -319,34 +332,113 @@
 	<References>
 	</References>
 	<Files>
-		<File
+		<Filter
-			RelativePath="move_listener.cpp"
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
-		</File>
+			<File
-		<File
+				RelativePath="connection.cpp"
-			RelativePath="move_listener.h"
+				>
+			</File>
+			<File
+				RelativePath="nel_launcher.cpp"
+				>
+			</File>
+			<File
+				RelativePath="nel_launcher.rc"
+				>
+			</File>
+			<File
+				RelativePath="nel_launcher_dlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="patch.cpp"
+				>
+			</File>
+			<File
+				RelativePath="std_afx.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
 			>
-		</File>
+			<File
-		<File
+				RelativePath="connection.h"
-			RelativePath="nevraxpill.ico"
+				>
+			</File>
+			<File
+				RelativePath="nel_launcher.h"
+				>
+			</File>
+			<File
+				RelativePath="nel_launcher_dlg.h"
+				>
+			</File>
+			<File
+				RelativePath="patch.h"
+				>
+			</File>
+			<File
+				RelativePath="resource.h"
+				>
+			</File>
+			<File
+				RelativePath="std_afx.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
-		</File>
+			<File
-		<File
+				RelativePath="res\nel_launcher.ico"
-			RelativePath="resource.h"
+				>
-			>
+			</File>
-		</File>
+			<File
-		<File
+				RelativePath="res\nel_launcher.rc2"
-			RelativePath="zviewer.cfg"
+				>
-			>
+			</File>
-		</File>
+		</Filter>
-		<File
-			RelativePath="zviewer.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\zviewer.rc"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>

code/nelns/naming_service/naming_service.vcproj

@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -178,6 +181,170 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="LIBXML_STATIC;WIN32;_DEBUG;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(RootNamespace)_d.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(RootNamespace)_d.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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="LIBXML_STATIC;WIN32;NDEBUG;ASSERT_THROW_EXCEPTION;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				DisableLanguageExtensions="false"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib"
+				OutputFile="$(RootNamespace)_r.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrtd"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(RootNamespace)_r.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>
 	</Configurations>
 	<References>
 	</References>

code/nelns/services.sln

@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "admin_executor_service", "admin_executor_service\admin_executor_service.vcproj", "{1578CF93-8455-46CF-BADF-C6374D27B8E0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}
@@ -43,41 +43,75 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1578CF93-8455-46CF-BADF-C6374D27B8E0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1578CF93-8455-46CF-BADF-C6374D27B8E0}.Debug|Win32.Build.0 = Debug|Win32
+		{1578CF93-8455-46CF-BADF-C6374D27B8E0}.Debug|x64.ActiveCfg = Debug|x64
+		{1578CF93-8455-46CF-BADF-C6374D27B8E0}.Debug|x64.Build.0 = Debug|x64
 		{1578CF93-8455-46CF-BADF-C6374D27B8E0}.Release|Win32.ActiveCfg = Release|Win32
 		{1578CF93-8455-46CF-BADF-C6374D27B8E0}.Release|Win32.Build.0 = Release|Win32
+		{1578CF93-8455-46CF-BADF-C6374D27B8E0}.Release|x64.ActiveCfg = Release|x64
+		{1578CF93-8455-46CF-BADF-C6374D27B8E0}.Release|x64.Build.0 = Release|x64
 		{AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Debug|Win32.Build.0 = Debug|Win32
+		{AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Debug|x64.ActiveCfg = Debug|x64
+		{AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Debug|x64.Build.0 = Debug|x64
 		{AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Release|Win32.ActiveCfg = Release|Win32
 		{AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Release|Win32.Build.0 = Release|Win32
+		{AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Release|x64.ActiveCfg = Release|x64
+		{AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Release|x64.Build.0 = Release|x64
 		{002C429C-2959-40DB-902E-BB2F807C99AA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{002C429C-2959-40DB-902E-BB2F807C99AA}.Debug|Win32.Build.0 = Debug|Win32
+		{002C429C-2959-40DB-902E-BB2F807C99AA}.Debug|x64.ActiveCfg = Debug|x64
+		{002C429C-2959-40DB-902E-BB2F807C99AA}.Debug|x64.Build.0 = Debug|x64
 		{002C429C-2959-40DB-902E-BB2F807C99AA}.Release|Win32.ActiveCfg = Release|Win32
 		{002C429C-2959-40DB-902E-BB2F807C99AA}.Release|Win32.Build.0 = Release|Win32
+		{002C429C-2959-40DB-902E-BB2F807C99AA}.Release|x64.ActiveCfg = Release|x64
+		{002C429C-2959-40DB-902E-BB2F807C99AA}.Release|x64.Build.0 = Release|x64
 		{28C6A107-445A-4411-A5E6-465B0FF24276}.Debug|Win32.ActiveCfg = Debug|Win32
 		{28C6A107-445A-4411-A5E6-465B0FF24276}.Debug|Win32.Build.0 = Debug|Win32
+		{28C6A107-445A-4411-A5E6-465B0FF24276}.Debug|x64.ActiveCfg = Debug|x64
+		{28C6A107-445A-4411-A5E6-465B0FF24276}.Debug|x64.Build.0 = Debug|x64
 		{28C6A107-445A-4411-A5E6-465B0FF24276}.Release|Win32.ActiveCfg = Release|Win32
 		{28C6A107-445A-4411-A5E6-465B0FF24276}.Release|Win32.Build.0 = Release|Win32
+		{28C6A107-445A-4411-A5E6-465B0FF24276}.Release|x64.ActiveCfg = Release|x64
+		{28C6A107-445A-4411-A5E6-465B0FF24276}.Release|x64.Build.0 = Release|x64
 		{2D8FB9C3-C7B9-4BAB-8718-A337E45F30C7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2D8FB9C3-C7B9-4BAB-8718-A337E45F30C7}.Debug|Win32.Build.0 = Debug|Win32
+		{2D8FB9C3-C7B9-4BAB-8718-A337E45F30C7}.Debug|x64.ActiveCfg = Debug|x64
+		{2D8FB9C3-C7B9-4BAB-8718-A337E45F30C7}.Debug|x64.Build.0 = Debug|x64
 		{2D8FB9C3-C7B9-4BAB-8718-A337E45F30C7}.Release|Win32.ActiveCfg = Release|Win32
 		{2D8FB9C3-C7B9-4BAB-8718-A337E45F30C7}.Release|Win32.Build.0 = Release|Win32
+		{2D8FB9C3-C7B9-4BAB-8718-A337E45F30C7}.Release|x64.ActiveCfg = Release|x64
+		{2D8FB9C3-C7B9-4BAB-8718-A337E45F30C7}.Release|x64.Build.0 = Release|x64
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|Win32.ActiveCfg = Debug|Win32
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|Win32.Build.0 = Debug|Win32
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|x64.ActiveCfg = Debug|x64
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|x64.Build.0 = Debug|x64
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|Win32.ActiveCfg = Release|Win32
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|Win32.Build.0 = Release|Win32
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|x64.ActiveCfg = Release|x64
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|x64.Build.0 = Release|x64
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|Win32.Build.0 = Debug|Win32
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|x64.ActiveCfg = Debug|x64
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|x64.Build.0 = Debug|x64
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|Win32.ActiveCfg = Release|Win32
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|Win32.Build.0 = Release|Win32
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|x64.ActiveCfg = Release|x64
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|x64.Build.0 = Release|x64
 		{AADAF637-5C55-4A4B-B3C5-26DC6477FD55}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AADAF637-5C55-4A4B-B3C5-26DC6477FD55}.Debug|Win32.Build.0 = Debug|Win32
+		{AADAF637-5C55-4A4B-B3C5-26DC6477FD55}.Debug|x64.ActiveCfg = Debug|x64
+		{AADAF637-5C55-4A4B-B3C5-26DC6477FD55}.Debug|x64.Build.0 = Debug|x64
 		{AADAF637-5C55-4A4B-B3C5-26DC6477FD55}.Release|Win32.ActiveCfg = Release|Win32
 		{AADAF637-5C55-4A4B-B3C5-26DC6477FD55}.Release|Win32.Build.0 = Release|Win32
+		{AADAF637-5C55-4A4B-B3C5-26DC6477FD55}.Release|x64.ActiveCfg = Release|x64
+		{AADAF637-5C55-4A4B-B3C5-26DC6477FD55}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

code/nelns/welcome_service/welcome_service.cpp

@@ -118,7 +118,7 @@ CVariable<bool>		UsePatchMode("ws", "UsePatchMode", "Use Frontends as Patch serv
 /**
  * Use Patch mode
  */
-CVariable<bool>		DontUseLS("ws", "DontUseLS", "Dont use the login service", false, 0, true);
+CVariable<bool>		DontUseLS("ws", "DontUseLS", "Don't use the login service", false, 0, true);
 
 
 // Shortcut to the module instance

code/nelns/welcome_service/welcome_service.vcproj

@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -178,6 +181,170 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="LIBXML_STATIC;WIN32;_DEBUG;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(RootNamespace)_d.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				ImportLibrary="$(RootNamespace)_d.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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="LIBXML_STATIC;WIN32;NDEBUG;ASSERT_THROW_EXCEPTION;_WINDOWS"
+				StringPooling="true"
+				ExceptionHandling="2"
+				RuntimeLibrary="2"
+				DisableLanguageExtensions="false"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib odbc32.lib odbccp32.lib ws2_32.lib libxml2.lib zlib.lib freetype.lib"
+				OutputFile="$(RootNamespace)_r.exe"
+				SuppressStartupBanner="true"
+				IgnoreDefaultLibraryNames="libc;libcmt;libcmtd;msvcrtd"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(RootNamespace)_r.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>
 	</Configurations>
 	<References>
 	</References>

code/ryzom/client/src/client.vcproj

@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lualib.lib gnu_regex.lib libcurl.lib libjpeg.lib lua.lib luabind_d.lib wwwapp.lib wwwcache.lib wwwcore.lib wwwfile.lib wwwhtml.lib wwwhttp.lib wwwmime.lib wwwmux.lib wwwstream.lib wwwtrans.lib wwwutils.lib libeay32.lib ssleay32.lib"
+				AdditionalDependencies="gnu_regex.lib libcurl.lib libjpeg.lib lua.lib luabind_d.lib wwwapp.lib wwwcache.lib wwwcore.lib wwwfile.lib wwwhtml.lib wwwhttp.lib wwwmime.lib wwwmux.lib wwwstream.lib wwwtrans.lib wwwutils.lib libeay32.lib ssleay32.lib"
 				OutputFile="..\..\bin\client_ryzom_d.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="msvcrt.lib"
@@ -153,7 +153,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lualib.lib gnu_regex.lib libcurl.lib libjpeg.lib lua.lib luabind_d.lib wwwapp.lib wwwcache.lib wwwcore.lib wwwfile.lib wwwhtml.lib wwwhttp.lib wwwmime.lib wwwmux.lib wwwstream.lib wwwtrans.lib wwwutils.lib libeay32.lib ssleay32.lib"
+				AdditionalDependencies="gnu_regex.lib libcurl.lib libjpeg.lib lua.lib luabind_d.lib wwwapp.lib wwwcache.lib wwwcore.lib wwwfile.lib wwwhtml.lib wwwhttp.lib wwwmime.lib wwwmux.lib wwwstream.lib wwwtrans.lib wwwutils.lib libeay32.lib ssleay32.lib"
 				OutputFile="..\..\bin64\client_ryzom_d.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="msvcrt.lib"
@@ -236,7 +236,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lualib.lib gnu_regex.lib libcurl.lib libjpeg.lib lua.lib luabind.lib wwwapp.lib wwwcache.lib wwwcore.lib wwwfile.lib wwwhtml.lib wwwhttp.lib wwwmime.lib wwwmux.lib wwwstream.lib wwwtrans.lib wwwutils.lib libeay32.lib ssleay32.lib"
+				AdditionalDependencies="gnu_regex.lib libcurl.lib libjpeg.lib lua.lib luabind.lib wwwapp.lib wwwcache.lib wwwcore.lib wwwfile.lib wwwhtml.lib wwwhttp.lib wwwmime.lib wwwmux.lib wwwstream.lib wwwtrans.lib wwwutils.lib libeay32.lib ssleay32.lib"
 				OutputFile="..\..\bin\client_ryzom_r.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""
@@ -324,7 +324,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lualib.lib gnu_regex.lib libcurl.lib lua.lib luabind.lib wwwapp.lib wwwcache.lib wwwcore.lib wwwfile.lib wwwhtml.lib wwwhttp.lib wwwmime.lib wwwmux.lib wwwstream.lib wwwtrans.lib wwwutils.lib libeay32.lib ssleay32.lib"
+				AdditionalDependencies="gnu_regex.lib libcurl.lib lua.lib luabind.lib wwwapp.lib wwwcache.lib wwwcore.lib wwwfile.lib wwwhtml.lib wwwhttp.lib wwwmime.lib wwwmux.lib wwwstream.lib wwwtrans.lib wwwutils.lib libeay32.lib ssleay32.lib"
 				OutputFile="..\..\bin64\client_ryzom_r.exe"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames=""

code/ryzom/client/src/client_cfg.cpp

@@ -382,9 +382,7 @@ CClientConfig::CClientConfig()
 	///////////
 	// SOUND //
 	SoundOn				= true;						// Default is with sound.
-	// hulud patch force fmod
+	DriverSound			= SoundDrvAuto;
-	// DriverSound			= SoundDrvAuto;
-	DriverSound			= SoundDrvFMod;
 	SoundForceSoftwareBuffer = true;
 	SoundOutGameMusic	= "Main Menu Loop.ogg";
 	SoundSFXVolume		= 1.f;
@@ -1119,19 +1117,17 @@ void CClientConfig::setValues()
 	// SoundOn
 	READ_BOOL_FV(SoundOn)
 	// Sound Driver
-#if !FINAL_VERSION
 	varPtr = ClientCfg.ConfigFile.getVarPtr ("DriverSound");
 	if (varPtr)
 	{
-		/* hulud patch force fmod
 		if (nlstricmp(varPtr->asString(), "Auto") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvAuto;
 		else if (nlstricmp(varPtr->asString(), "FMod") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvFMod;
-		*/
+		else if (nlstricmp(varPtr->asString(), "OpenAL") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvOpenAL;
-		ClientCfg.DriverSound = CClientConfig::SoundDrvFMod;
+		else if (nlstricmp(varPtr->asString(), "DirectSound") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvDirectSound;
+		else if (nlstricmp(varPtr->asString(), "XAudio2") == 0) ClientCfg.DriverSound = CClientConfig::SoundDrvXAudio2;
 	}
 	else
 		cfgWarning ("Default value used for 'DriverSound' !!!");
-#endif // FINAL_VERSION
 	// SoundForceSoftwareBuffer
 	READ_BOOL_FV(SoundForceSoftwareBuffer);
 	// SoundOutGameMusic

code/ryzom/client/src/client_cfg.h

@@ -49,7 +49,7 @@ using std::string;
 struct CClientConfig
 {
 	enum TDriver3D { DrvAuto = 0, OpenGL, Direct3D };
-	enum TDriverSound { SoundDrvAuto = 0, SoundDrvFMod };
+	enum TDriverSound { SoundDrvAuto = 0, SoundDrvFMod, SoundDrvOpenAL, SoundDrvDirectSound, SoundDrvXAudio2 };
 	enum TStageLCTUsage { StageUseNoLCT = 0, StageUseAllLCT, StageUsePosOnlyLCT };
 
 	// the config file must be always be available

code/ryzom/client/src/interface_v3/group_html.h

@@ -525,21 +525,21 @@ private:
 
 	// decode all HTML entities
 	static ucstring decodeHTMLEntities(const ucstring &str);
-
-	// ImageDownload system
-
-	struct CImageDownload
-	{
-		CImageDownload(CURL *c, const std::string &u, FILE *f, CViewBase *i) : curl(c), url(u), fp(f) { imgs.push_back(i); }
-		CURL *curl;
-		std::string url;
-		FILE *fp;
-		std::vector<CViewBase *> imgs;
-	};
 
-	std::vector<CImageDownload> Curls;
+	// ImageDownload system
-	CURLM *MultiCurl;
+
-	int RunningCurls;
+	struct CImageDownload
+	{
+		CImageDownload(CURL *c, const std::string &u, FILE *f, CViewBase *i) : curl(c), url(u), fp(f) { imgs.push_back(i); }
+		CURL *curl;
+		std::string url;
+		FILE *fp;
+		std::vector<CViewBase *> imgs;
+	};
+
+	std::vector<CImageDownload> Curls;
+	CURLM *MultiCurl;
+	int RunningCurls;
 
 	void initImageDownload();
 	void releaseImageDownload();

code/ryzom/client/src/interface_v3/lua_ihm.cpp

@@ -131,6 +131,21 @@ std::ostream &operator<<(std::ostream &str, const ucstring &value)
 	return str << value.toString();
 }
 
+struct CMiscFunctions
+{
+	static std::string fileLookup(const std::string &fileName)
+	{
+		return NLMISC::CPath::lookup(fileName,   false);
+	}
+	static void shellExecute(const char *operation,   const char *fileName,   const char *parameters)
+	{
+	#if !FINAL_VERSION
+		#ifdef NL_OS_WINDOWS
+			ShellExecute(NULL,   operation,   fileName,   parameters,  NULL,   SW_SHOWDEFAULT);
+		#endif
+	#endif
+	}
+};
 
 
 /**
@@ -191,6 +206,7 @@ bool CLuaIHM::pop(CLuaState &ls,   NLMISC::CRGBA &dest)
 		if (ls.isNil(-1)) return false;
 #if LUABIND_VERSION == 07
 		luabind::object obj(luabind::from_stack(ls.getStatePointer(), -1));
+		ls.pop();
 #else
 		luabind::object obj(ls.getStatePointer());
 		obj.set();
@@ -213,6 +229,7 @@ bool CLuaIHM::pop(CLuaState &ls,NLMISC::CVector2f &dest)
 		if (ls.isNil(-1)) return false;
 #if LUABIND_VERSION == 07
 		luabind::object obj(luabind::from_stack(ls.getStatePointer(), -1));
+		ls.pop();
 #else
 		luabind::object obj(ls.getStatePointer());
 		obj.set();
@@ -235,6 +252,7 @@ bool CLuaIHM::pop(CLuaState &ls,   ucstring &dest)
 		if (ls.isNil(-1)) return false;
 #if LUABIND_VERSION == 07
 		luabind::object obj(luabind::from_stack(ls.getStatePointer(), -1));
+		ls.pop();
 #else
 		luabind::object obj(ls.getStatePointer());
 		obj.set();
@@ -441,12 +459,12 @@ CLuaState * ELuaIHMException::getLuaState()
 
 // ***************************************************************************
 #define LUA_REGISTER_BASIC(_type_)															\
-yes_t is_user_defined(by_value<_type_>);													\
+luabind::detail::yes_t is_user_defined(luabind::detail::by_value<_type_>);													\
-_type_ convert_lua_to_cpp(lua_State* L,    by_value<_type_>,    int index)						\
+_type_ convert_lua_to_cpp(lua_State* L,    luabind::detail::by_value<_type_>,    int index)						\
 {																							\
 	return (_type_)lua_tonumber(L,    index);													\
 }																							\
-int match_lua_to_cpp(lua_State* L,    by_value<_type_>,    int index)								\
+int match_lua_to_cpp(lua_State* L,    luabind::detail::by_value<_type_>,    int index)								\
 {																							\
 	if (lua_isnumber(L,    index)) return 0; else return -1;									\
 }																							\
@@ -1202,7 +1220,8 @@ void CLuaIHM::createLuaEnumTable(CLuaState &ls, const std::string &str)
 	} \
 
 // ***************************************************************************
-#define LUABIND_FUNC(__func__) luabind::function(L,    #__func__,    &__func__);
+#define LUABIND_FUNC(__func__) luabind::def(#__func__,    &__func__)
+
 void	CLuaIHM::registerIHM(CLuaState &ls)
 {
 	//H_AUTO(Lua_CLuaIHM_registerIHM)
@@ -1323,89 +1342,101 @@ void	CLuaIHM::registerIHM(CLuaState &ls)
 	ls.registerFunc("getUserRace",  getUserRace);
 	// Through LUABind API
 	lua_State	*L= ls.getStatePointer();
-	LUABIND_FUNC(getDbProp);
-	LUABIND_FUNC(setDbProp);
-	LUABIND_FUNC(debugInfo);
-	LUABIND_FUNC(rawDebugInfo);
-	LUABIND_FUNC(dumpCallStack);
-	LUABIND_FUNC(getDefine);
-	LUABIND_FUNC(setContextHelpText);
-	luabind::function(L,    "messageBox",    (void(*)(const ucstring &)) &messageBox);
-	luabind::function(L,    "messageBox",    (void(*)(const ucstring &, const std::string &)) &messageBox);
-	luabind::function(L,    "messageBox",    (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBox);
-	luabind::function(L,    "messageBox",    (void(*)(const std::string &)) &messageBox);
-	luabind::function(L,    "messageBoxWithHelp",    (void(*)(const ucstring &)) &messageBoxWithHelp);
-	luabind::function(L,    "messageBoxWithHelp",    (void(*)(const ucstring &, const std::string &)) &messageBoxWithHelp);
-	luabind::function(L,    "messageBoxWithHelp",    (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBoxWithHelp);
-	luabind::function(L,    "messageBoxWithHelp",    (void(*)(const std::string &)) &messageBoxWithHelp);
-	luabind::function(L,    "findReplaceAll",    (std::string(*)(const std::string &,  const std::string &,  const std::string &)) &findReplaceAll);
-	luabind::function(L,    "findReplaceAll",    (ucstring(*)(const ucstring &,  const ucstring &,  const ucstring &)) &findReplaceAll);
-	luabind::function(L,    "findReplaceAll",    (ucstring(*)(const ucstring &,  const std::string &,  const std::string &)) &findReplaceAll);
-	luabind::function(L,    "findReplaceAll",    (ucstring(*)(const ucstring &,  const ucstring &,  const std::string &)) &findReplaceAll);
-	luabind::function(L,    "findReplaceAll",    (ucstring(*)(const ucstring &,  const std::string &,  const ucstring &)) &findReplaceAll);
-	LUABIND_FUNC(getPlayerSelectedSlot)
-	LUABIND_FUNC(isInGame)
-	LUABIND_FUNC(pauseBGDownloader);
-	LUABIND_FUNC(unpauseBGDownloader);
-	LUABIND_FUNC(requestBGDownloaderPriority);
-	LUABIND_FUNC(getBGDownloaderPriority);
-	LUABIND_FUNC(getPatchLastErrorMessage);
-	LUABIND_FUNC(isPlayerSlotNewbieLand)
-	LUABIND_FUNC(getSkillIdFromName);
-	LUABIND_FUNC(getSkillLocalizedName);
-	LUABIND_FUNC(getMaxSkillValue);
-	LUABIND_FUNC(getBaseSkillValueMaxChildren);
-	LUABIND_FUNC(getMagicResistChance);
-	LUABIND_FUNC(getDodgeParryChance);
-	LUABIND_FUNC(browseNpcWebPage);
-	LUABIND_FUNC(clearHtmlUndoRedo);
-	LUABIND_FUNC(getDynString);
-	LUABIND_FUNC(isDynStringAvailable);
-	LUABIND_FUNC(isFullyPatched);
-	LUABIND_FUNC(getSheetType);
-	LUABIND_FUNC(getSheetName);
-	LUABIND_FUNC(getFameIndex);
-	LUABIND_FUNC(getFameName);
-	LUABIND_FUNC(getFameDBIndex);
-	LUABIND_FUNC(getFirstTribeFameIndex);
-	LUABIND_FUNC(getNbTribeFameIndex);
-	LUABIND_FUNC(getClientCfg);
-	LUABIND_FUNC(fileExists);
-	LUABIND_FUNC(sendMsgToServer);
-	LUABIND_FUNC(sendMsgToServerPvpTag);
-	LUABIND_FUNC(isGuildQuitAvailable);
-	LUABIND_FUNC(sortGuildMembers);
-	LUABIND_FUNC(getNbGuildMembers);
-	LUABIND_FUNC(getGuildMemberName);
-	LUABIND_FUNC(getGuildMemberGrade);
-	LUABIND_FUNC(isR2Player);
-	LUABIND_FUNC(getR2PlayerRace);
-	LUABIND_FUNC(isR2PlayerMale);
-	LUABIND_FUNC(getCharacterSheetSkel);
-	LUABIND_FUNC(getSheetId)
-	LUABIND_FUNC(getCharacterSheetRegionForce)
-	LUABIND_FUNC(getCharacterSheetRegionLevel)
-	LUABIND_FUNC(replacePvpEffectParam);
-	LUABIND_FUNC(getRegionByAlias);
-	LUABIND_FUNC(tell);
-	LUABIND_FUNC(isRingAccessPointInReach);
-	LUABIND_FUNC(updateTooltipCoords);
-	LUABIND_FUNC(secondsSince1970ToHour);
-	LUABIND_FUNC(isCtrlKeyDown);
-	LUABIND_FUNC(encodeURLUnicodeParam);
 
-	LUABIND_ENUM(PVP_CLAN::TPVPClan, "game.TPVPClan", PVP_CLAN::NbClans, PVP_CLAN::toString)
+	luabind::module(L)
-	LUABIND_ENUM(BONUS_MALUS::TBonusMalusSpecialTT, "game.TBonusMalusSpecialTT", BONUS_MALUS::NbSpecialTT, BONUS_MALUS::toString)
+	[
+		LUABIND_FUNC(getDbProp),
+		LUABIND_FUNC(setDbProp),
+		LUABIND_FUNC(debugInfo),
+		LUABIND_FUNC(rawDebugInfo),
+		LUABIND_FUNC(dumpCallStack),
+		LUABIND_FUNC(getDefine),
+		LUABIND_FUNC(setContextHelpText),
+		luabind::def("messageBox",    (void(*)(const ucstring &)) &messageBox),
+		luabind::def("messageBox",    (void(*)(const ucstring &, const std::string &)) &messageBox),
+		luabind::def("messageBox",    (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBox),
+		luabind::def("messageBox",    (void(*)(const std::string &)) &messageBox),
+		luabind::def("messageBoxWithHelp",    (void(*)(const ucstring &)) &messageBoxWithHelp),
+		luabind::def("messageBoxWithHelp",    (void(*)(const ucstring &, const std::string &)) &messageBoxWithHelp),
+		luabind::def("messageBoxWithHelp",    (void(*)(const ucstring &, const std::string &, int caseMode)) &messageBoxWithHelp),
+		luabind::def("messageBoxWithHelp",    (void(*)(const std::string &)) &messageBoxWithHelp),
+		luabind::def("findReplaceAll",    (std::string(*)(const std::string &,  const std::string &,  const std::string &)) &findReplaceAll),
+		luabind::def("findReplaceAll",    (ucstring(*)(const ucstring &,  const ucstring &,  const ucstring &)) &findReplaceAll),
+		luabind::def("findReplaceAll",    (ucstring(*)(const ucstring &,  const std::string &,  const std::string &)) &findReplaceAll),
+		luabind::def("findReplaceAll",    (ucstring(*)(const ucstring &,  const ucstring &,  const std::string &)) &findReplaceAll),
+		luabind::def("findReplaceAll",    (ucstring(*)(const ucstring &,  const std::string &,  const ucstring &)) &findReplaceAll),
+		LUABIND_FUNC(getPlayerSelectedSlot),
+		LUABIND_FUNC(isInGame),
+		LUABIND_FUNC(pauseBGDownloader),
+		LUABIND_FUNC(unpauseBGDownloader),
+		LUABIND_FUNC(requestBGDownloaderPriority),
+		LUABIND_FUNC(getBGDownloaderPriority),
+		LUABIND_FUNC(getPatchLastErrorMessage),
+		LUABIND_FUNC(isPlayerSlotNewbieLand),
+		LUABIND_FUNC(getSkillIdFromName),
+		LUABIND_FUNC(getSkillLocalizedName),
+		LUABIND_FUNC(getMaxSkillValue),
+		LUABIND_FUNC(getBaseSkillValueMaxChildren),
+		LUABIND_FUNC(getMagicResistChance),
+		LUABIND_FUNC(getDodgeParryChance),
+		LUABIND_FUNC(browseNpcWebPage),
+		LUABIND_FUNC(clearHtmlUndoRedo),
+		LUABIND_FUNC(getDynString),
+		LUABIND_FUNC(isDynStringAvailable),
+		LUABIND_FUNC(isFullyPatched),
+		LUABIND_FUNC(getSheetType),
+		LUABIND_FUNC(getSheetName),
+		LUABIND_FUNC(getFameIndex),
+		LUABIND_FUNC(getFameName),
+		LUABIND_FUNC(getFameDBIndex),
+		LUABIND_FUNC(getFirstTribeFameIndex),
+		LUABIND_FUNC(getNbTribeFameIndex),
+		LUABIND_FUNC(getClientCfg),
+		LUABIND_FUNC(fileExists),
+		LUABIND_FUNC(sendMsgToServer),
+		LUABIND_FUNC(sendMsgToServerPvpTag),
+		LUABIND_FUNC(isGuildQuitAvailable),
+		LUABIND_FUNC(sortGuildMembers),
+		LUABIND_FUNC(getNbGuildMembers),
+		LUABIND_FUNC(getGuildMemberName),
+		LUABIND_FUNC(getGuildMemberGrade),
+		LUABIND_FUNC(isR2Player),
+		LUABIND_FUNC(getR2PlayerRace),
+		LUABIND_FUNC(isR2PlayerMale),
+		LUABIND_FUNC(getCharacterSheetSkel),
+		LUABIND_FUNC(getSheetId),
+		LUABIND_FUNC(getCharacterSheetRegionForce),
+		LUABIND_FUNC(getCharacterSheetRegionLevel),
+		LUABIND_FUNC(replacePvpEffectParam),
+		LUABIND_FUNC(getRegionByAlias),
+		LUABIND_FUNC(tell),
+		LUABIND_FUNC(isRingAccessPointInReach),
+		LUABIND_FUNC(updateTooltipCoords),
+		LUABIND_FUNC(secondsSince1970ToHour),
+		LUABIND_FUNC(isCtrlKeyDown),
+		LUABIND_FUNC(encodeURLUnicodeParam),
 
-	LUABIND_FUNC(getPlayerLevel);
+	#if !FINAL_VERSION
-	LUABIND_FUNC(getTargetLevel);
+		LUABIND_FUNC(openDoc),
-	LUABIND_FUNC(getTargetForceRegion);
+		LUABIND_FUNC(launchProgram),
-	LUABIND_FUNC(getTargetLevelForce);
+	#endif
-	LUABIND_FUNC(isTargetNPC)
+
-	LUABIND_FUNC(isTargetPlayer) // return 'true' if the target is an npc
+		luabind::def("fileLookup",    CMiscFunctions::fileLookup),
-	LUABIND_FUNC(isTargetUser)
+		luabind::def("shellExecute",  CMiscFunctions::shellExecute),
-	LUABIND_FUNC(isPlayerInPVPMode)
+
-	LUABIND_FUNC(isTargetInPVPMode)
+		LUABIND_FUNC(getPlayerLevel),
+		LUABIND_FUNC(getTargetLevel),
+		LUABIND_FUNC(getTargetForceRegion),
+		LUABIND_FUNC(getTargetLevelForce),
+		LUABIND_FUNC(isTargetNPC),
+		LUABIND_FUNC(isTargetPlayer), // return 'true' if the target is an npc
+		LUABIND_FUNC(isTargetUser),
+		LUABIND_FUNC(isPlayerInPVPMode),
+		LUABIND_FUNC(isTargetInPVPMode)
+	];
+
+	LUABIND_ENUM(PVP_CLAN::TPVPClan, "game.TPVPClan", PVP_CLAN::NbClans, PVP_CLAN::toString);
+	LUABIND_ENUM(BONUS_MALUS::TBonusMalusSpecialTT, "game.TBonusMalusSpecialTT", BONUS_MALUS::NbSpecialTT, BONUS_MALUS::toString);
 
 	// inside i18n table
 	luabind::module(L, "i18n")
@@ -1428,31 +1459,6 @@ void	CLuaIHM::registerIHM(CLuaState &ls)
 		luabind::def("getLocalTime", getLocalTime)	// NB : use CLuaIHM::getLocalTime instead of NLMISC::CTime::getLocalTime, because the NLMISC
 		                                            // version returns a uint64, which can't be casted into lua numbers (doubles ...)
 	];
-
-
-
-	#if !FINAL_VERSION
-		LUABIND_FUNC(openDoc)
-		LUABIND_FUNC(launchProgram)
-	#endif
-
-	#ifdef NL_OS_WINDOWS
-		struct CMiscFunctions
-		{
-			static std::string fileLookup(const std::string &fileName)
-			{
-				return NLMISC::CPath::lookup(fileName,   false);
-			}
-			static void shellExecute(const char *operation,   const char *fileName,   const char *parameters)
-			{
-			#if !FINAL_VERSION
-				ShellExecute(NULL,   operation,   fileName,   parameters,  NULL,   SW_SHOWDEFAULT);
-			#endif
-			}
-		};
-		luabind::function(L,    "fileLookup",    CMiscFunctions::fileLookup);
-		luabind::function(L,    "shellExecute",    CMiscFunctions::shellExecute);
-	#endif
 }
 
 
@@ -3317,6 +3323,7 @@ bool CLuaIHM::popString(CLuaState &ls, std::string & dest)
 	{
 #if LUABIND_VERSION == 07
 		luabind::object obj(luabind::from_stack(ls.getStatePointer(), -1));
+		ls.pop();
 #else
 		luabind::object obj(ls.getStatePointer());
 		obj.set();
@@ -3338,6 +3345,7 @@ bool CLuaIHM::popSINT32(CLuaState &ls, sint32 & dest)
 	{
 #if LUABIND_VERSION == 07
 		luabind::object obj(luabind::from_stack(ls.getStatePointer(), -1));
+		ls.pop();
 #else
 		luabind::object obj(ls.getStatePointer());
 		obj.set();

code/ryzom/client/src/libwww.cpp

@@ -586,7 +586,7 @@ void initLibWWW()
 
 		/* Register the default set of MIME header parsers */
 		struct {
-			char * string;
+			const char * string;
 		HTParserCallback * pHandler;
 		} fixedHandlers[] = {
 		{"accept", &HTMIME_accept},

code/ryzom/client/src/progress.cpp

@@ -68,7 +68,7 @@ CProgress::CProgress ()
 	HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
 
 	// instanciate the taskbar control COM object
-	if (SUCCEEDED(hr)) CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pTaskbarList));
+//	if (SUCCEEDED(hr)) CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&pTaskbarList));
 #endif // TASKBAR_PROGRESS
 }
 

code/ryzom/client/src/sound_manager.cpp

@@ -464,6 +464,12 @@ void CSoundManager::init(IProgressCallback *progressCallBack)
 		UAudioMixer::TDriver	driverType= UAudioMixer::DriverAuto;
 		if(ClientCfg.DriverSound==CClientConfig::SoundDrvFMod)
 			driverType= UAudioMixer::DriverFMod;
+		else if(ClientCfg.DriverSound==CClientConfig::SoundDrvOpenAL)
+			driverType= UAudioMixer::DriverOpenAl;
+		else if(ClientCfg.DriverSound==CClientConfig::SoundDrvDirectSound)
+			driverType= UAudioMixer::DriverDSound;
+		else if(ClientCfg.DriverSound==CClientConfig::SoundDrvXAudio2)
+			driverType= UAudioMixer::DriverXAudio2;
 		_AudioMixer->init(ClientCfg.MaxTrack, ClientCfg.UseEax, ClientCfg.UseADPCM, progressCallBack, false, driverType, ClientCfg.SoundForceSoftwareBuffer);
 /*		int nbVoice = _AudioMixer->getPolyphony();
 		_AudioMixer->setPriorityReserve(HighPri, max(1, nbVoice /2));

code/ryzom/tools/all.sln

@@ -166,125 +166,243 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|Win32.Build.0 = Debug|Win32
+		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|x64.ActiveCfg = Debug|x64
+		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|x64.Build.0 = Debug|x64
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|Win32.ActiveCfg = Release|Win32
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|Win32.Build.0 = Release|Win32
+		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|x64.ActiveCfg = Release|x64
+		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|x64.Build.0 = Release|x64
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|Win32.ActiveCfg = Debug|Win32
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|Win32.Build.0 = Debug|Win32
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|x64.ActiveCfg = Debug|x64
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Debug|x64.Build.0 = Debug|x64
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|Win32.ActiveCfg = Release|Win32
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|Win32.Build.0 = Release|Win32
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|x64.ActiveCfg = Release|x64
+		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516}.Release|x64.Build.0 = Release|x64
 		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|Win32.Build.0 = Debug|Win32
+		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|x64.ActiveCfg = Debug|x64
+		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Debug|x64.Build.0 = Debug|x64
 		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|Win32.ActiveCfg = Release|Win32
 		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|Win32.Build.0 = Release|Win32
+		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|x64.ActiveCfg = Release|x64
+		{1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}.Release|x64.Build.0 = Release|x64
 		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|Win32.Build.0 = Debug|Win32
+		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|x64.ActiveCfg = Debug|x64
+		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Debug|x64.Build.0 = Debug|x64
 		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|Win32.ActiveCfg = Release|Win32
 		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|Win32.Build.0 = Release|Win32
+		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|x64.ActiveCfg = Release|x64
+		{C5253970-8728-4A6F-8BF2-E1D9CF0F3861}.Release|x64.Build.0 = Release|x64
 		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|Win32.Build.0 = Debug|Win32
+		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|x64.ActiveCfg = Debug|x64
+		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Debug|x64.Build.0 = Debug|x64
 		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|Win32.ActiveCfg = Release|Win32
 		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|Win32.Build.0 = Release|Win32
+		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|x64.ActiveCfg = Release|x64
+		{9D284C6B-BE12-4549-87E5-2337D64F31BE}.Release|x64.Build.0 = Release|x64
 		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|Win32.Build.0 = Debug|Win32
+		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|x64.ActiveCfg = Debug|x64
+		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Debug|x64.Build.0 = Debug|x64
 		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|Win32.ActiveCfg = Release|Win32
 		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|Win32.Build.0 = Release|Win32
+		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|x64.ActiveCfg = Release|x64
+		{4AF7ADB2-DAF8-4F04-9793-F92010001470}.Release|x64.Build.0 = Release|x64
 		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|Win32.ActiveCfg = Debug|Win32
 		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|Win32.Build.0 = Debug|Win32
+		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|x64.ActiveCfg = Debug|x64
+		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Debug|x64.Build.0 = Debug|x64
 		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|Win32.ActiveCfg = Release|Win32
 		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|Win32.Build.0 = Release|Win32
+		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|x64.ActiveCfg = Release|x64
+		{89064E9B-14E9-4FB2-8536-A9151DF55C68}.Release|x64.Build.0 = Release|x64
 		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|Win32.Build.0 = Debug|Win32
+		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|x64.ActiveCfg = Debug|x64
+		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Debug|x64.Build.0 = Debug|x64
 		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|Win32.ActiveCfg = Release|Win32
 		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|Win32.Build.0 = Release|Win32
+		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|x64.ActiveCfg = Release|x64
+		{1D9576F6-3321-4036-8C86-B5361CCCD4FB}.Release|x64.Build.0 = Release|x64
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|Win32.Build.0 = Debug|Win32
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|x64.ActiveCfg = Debug|x64
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Debug|x64.Build.0 = Debug|x64
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|Win32.ActiveCfg = Release|Win32
 		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|Win32.Build.0 = Release|Win32
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|x64.ActiveCfg = Release|x64
+		{67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}.Release|x64.Build.0 = Release|x64
 		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|Win32.Build.0 = Debug|Win32
+		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|x64.ActiveCfg = Debug|x64
+		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Debug|x64.Build.0 = Debug|x64
 		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|Win32.ActiveCfg = Release|Win32
 		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|Win32.Build.0 = Release|Win32
+		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|x64.ActiveCfg = Release|x64
+		{46CD3ED8-A9E1-49ED-BA1B-586CF147143A}.Release|x64.Build.0 = Release|x64
 		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|Win32.Build.0 = Debug|Win32
+		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|x64.ActiveCfg = Debug|x64
+		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Debug|x64.Build.0 = Debug|x64
 		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|Win32.ActiveCfg = Release|Win32
 		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|Win32.Build.0 = Release|Win32
+		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|x64.ActiveCfg = Release|x64
+		{263C0F2E-112D-437F-A6AB-DEA151A7A1F0}.Release|x64.Build.0 = Release|x64
 		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|Win32.Build.0 = Debug|Win32
+		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|x64.ActiveCfg = Debug|x64
+		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Debug|x64.Build.0 = Debug|x64
 		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|Win32.ActiveCfg = Release|Win32
 		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|Win32.Build.0 = Release|Win32
+		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|x64.ActiveCfg = Release|x64
+		{9440443B-97BA-43C2-A762-31EEC8958BEE}.Release|x64.Build.0 = Release|x64
 		{F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Debug|Win32.Build.0 = Debug|Win32
+		{F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Debug|x64.ActiveCfg = Debug|x64
+		{F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Debug|x64.Build.0 = Debug|x64
 		{F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Release|Win32.ActiveCfg = Release|Win32
 		{F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Release|Win32.Build.0 = Release|Win32
+		{F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Release|x64.ActiveCfg = Release|x64
+		{F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}.Release|x64.Build.0 = Release|x64
 		{F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Debug|Win32.Build.0 = Debug|Win32
+		{F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Debug|x64.ActiveCfg = Debug|x64
+		{F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Debug|x64.Build.0 = Debug|x64
 		{F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Release|Win32.ActiveCfg = Release|Win32
 		{F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Release|Win32.Build.0 = Release|Win32
+		{F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Release|x64.ActiveCfg = Release|x64
+		{F926ACBF-A18F-4937-8DE1-6395A3DE7F13}.Release|x64.Build.0 = Release|x64
 		{AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Debug|Win32.Build.0 = Debug|Win32
+		{AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Debug|x64.ActiveCfg = Debug|x64
+		{AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Debug|x64.Build.0 = Debug|x64
 		{AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Release|Win32.ActiveCfg = Release|Win32
 		{AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Release|Win32.Build.0 = Release|Win32
+		{AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Release|x64.ActiveCfg = Release|x64
+		{AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}.Release|x64.Build.0 = Release|x64
 		{38A8CF85-4F48-4420-84D6-CC1E764C6291}.Debug|Win32.ActiveCfg = Debug|Win32
 		{38A8CF85-4F48-4420-84D6-CC1E764C6291}.Debug|Win32.Build.0 = Debug|Win32
+		{38A8CF85-4F48-4420-84D6-CC1E764C6291}.Debug|x64.ActiveCfg = Debug|x64
+		{38A8CF85-4F48-4420-84D6-CC1E764C6291}.Debug|x64.Build.0 = Debug|x64
 		{38A8CF85-4F48-4420-84D6-CC1E764C6291}.Release|Win32.ActiveCfg = Release|Win32
 		{38A8CF85-4F48-4420-84D6-CC1E764C6291}.Release|Win32.Build.0 = Release|Win32
+		{38A8CF85-4F48-4420-84D6-CC1E764C6291}.Release|x64.ActiveCfg = Release|x64
+		{38A8CF85-4F48-4420-84D6-CC1E764C6291}.Release|x64.Build.0 = Release|x64
 		{6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Debug|Win32.Build.0 = Debug|Win32
+		{6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Debug|x64.ActiveCfg = Debug|x64
+		{6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Debug|x64.Build.0 = Debug|x64
 		{6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Release|Win32.ActiveCfg = Release|Win32
 		{6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Release|Win32.Build.0 = Release|Win32
+		{6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Release|x64.ActiveCfg = Release|x64
+		{6602D6B7-C644-4DA6-A457-49767C4DA7ED}.Release|x64.Build.0 = Release|x64
 		{4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Debug|Win32.Build.0 = Debug|Win32
+		{4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Debug|x64.ActiveCfg = Debug|x64
+		{4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Debug|x64.Build.0 = Debug|x64
 		{4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Release|Win32.ActiveCfg = Release|Win32
 		{4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Release|Win32.Build.0 = Release|Win32
+		{4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Release|x64.ActiveCfg = Release|x64
+		{4B320F68-0B9B-4065-A2ED-AF5D4B163006}.Release|x64.Build.0 = Release|x64
 		{565DA67F-C546-415B-9256-F4046866B59C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{565DA67F-C546-415B-9256-F4046866B59C}.Debug|Win32.Build.0 = Debug|Win32
+		{565DA67F-C546-415B-9256-F4046866B59C}.Debug|x64.ActiveCfg = Debug|x64
+		{565DA67F-C546-415B-9256-F4046866B59C}.Debug|x64.Build.0 = Debug|x64
 		{565DA67F-C546-415B-9256-F4046866B59C}.Release|Win32.ActiveCfg = Release|Win32
 		{565DA67F-C546-415B-9256-F4046866B59C}.Release|Win32.Build.0 = Release|Win32
+		{565DA67F-C546-415B-9256-F4046866B59C}.Release|x64.ActiveCfg = Release|x64
+		{565DA67F-C546-415B-9256-F4046866B59C}.Release|x64.Build.0 = Release|x64
 		{CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Debug|Win32.Build.0 = Debug|Win32
+		{CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Debug|x64.ActiveCfg = Debug|x64
+		{CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Debug|x64.Build.0 = Debug|x64
 		{CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Release|Win32.ActiveCfg = Release|Win32
 		{CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Release|Win32.Build.0 = Release|Win32
+		{CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Release|x64.ActiveCfg = Release|x64
+		{CB678E97-789D-4FA9-BB42-7D6DB673EC77}.Release|x64.Build.0 = Release|x64
 		{B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Debug|Win32.Build.0 = Debug|Win32
+		{B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Debug|x64.ActiveCfg = Debug|x64
+		{B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Debug|x64.Build.0 = Debug|x64
 		{B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Release|Win32.ActiveCfg = Release|Win32
 		{B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Release|Win32.Build.0 = Release|Win32
+		{B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Release|x64.ActiveCfg = Release|x64
+		{B579068A-FE3B-46A8-AE14-289BEAE5EBC0}.Release|x64.Build.0 = Release|x64
 		{358403E3-B05D-4793-A87B-BA2FF7AB122D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{358403E3-B05D-4793-A87B-BA2FF7AB122D}.Debug|Win32.Build.0 = Debug|Win32
+		{358403E3-B05D-4793-A87B-BA2FF7AB122D}.Debug|x64.ActiveCfg = Debug|x64
+		{358403E3-B05D-4793-A87B-BA2FF7AB122D}.Debug|x64.Build.0 = Debug|x64
 		{358403E3-B05D-4793-A87B-BA2FF7AB122D}.Release|Win32.ActiveCfg = Release|Win32
 		{358403E3-B05D-4793-A87B-BA2FF7AB122D}.Release|Win32.Build.0 = Release|Win32
+		{358403E3-B05D-4793-A87B-BA2FF7AB122D}.Release|x64.ActiveCfg = Release|x64
+		{358403E3-B05D-4793-A87B-BA2FF7AB122D}.Release|x64.Build.0 = Release|x64
 		{F27E79A2-9B78-4497-A829-FD3D80B8E861}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F27E79A2-9B78-4497-A829-FD3D80B8E861}.Debug|Win32.Build.0 = Debug|Win32
+		{F27E79A2-9B78-4497-A829-FD3D80B8E861}.Debug|x64.ActiveCfg = Debug|x64
+		{F27E79A2-9B78-4497-A829-FD3D80B8E861}.Debug|x64.Build.0 = Debug|x64
 		{F27E79A2-9B78-4497-A829-FD3D80B8E861}.Release|Win32.ActiveCfg = Release|Win32
 		{F27E79A2-9B78-4497-A829-FD3D80B8E861}.Release|Win32.Build.0 = Release|Win32
+		{F27E79A2-9B78-4497-A829-FD3D80B8E861}.Release|x64.ActiveCfg = Release|x64
+		{F27E79A2-9B78-4497-A829-FD3D80B8E861}.Release|x64.Build.0 = Release|x64
 		{296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Debug|Win32.ActiveCfg = Debug|Win32
 		{296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Debug|Win32.Build.0 = Debug|Win32
+		{296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Debug|x64.ActiveCfg = Debug|x64
+		{296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Debug|x64.Build.0 = Debug|x64
 		{296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Release|Win32.ActiveCfg = Release|Win32
 		{296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Release|Win32.Build.0 = Release|Win32
+		{296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Release|x64.ActiveCfg = Release|x64
+		{296D8FB5-DB32-48DD-A6AF-10A77A5DEE70}.Release|x64.Build.0 = Release|x64
 		{079E2366-3714-4B09-B553-41A44D290F04}.Debug|Win32.ActiveCfg = Debug|Win32
 		{079E2366-3714-4B09-B553-41A44D290F04}.Debug|Win32.Build.0 = Debug|Win32
+		{079E2366-3714-4B09-B553-41A44D290F04}.Debug|x64.ActiveCfg = Debug|x64
+		{079E2366-3714-4B09-B553-41A44D290F04}.Debug|x64.Build.0 = Debug|x64
 		{079E2366-3714-4B09-B553-41A44D290F04}.Release|Win32.ActiveCfg = Release|Win32
 		{079E2366-3714-4B09-B553-41A44D290F04}.Release|Win32.Build.0 = Release|Win32
+		{079E2366-3714-4B09-B553-41A44D290F04}.Release|x64.ActiveCfg = Release|x64
+		{079E2366-3714-4B09-B553-41A44D290F04}.Release|x64.Build.0 = Release|x64
 		{CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Debug|Win32.Build.0 = Debug|Win32
+		{CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Debug|x64.ActiveCfg = Debug|x64
+		{CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Debug|x64.Build.0 = Debug|x64
 		{CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Release|Win32.ActiveCfg = Release|Win32
 		{CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Release|Win32.Build.0 = Release|Win32
+		{CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Release|x64.ActiveCfg = Release|x64
+		{CBEDEB8E-18EA-4699-BF0F-061F0F644780}.Release|x64.Build.0 = Release|x64
 		{DAB4B616-E628-433E-92CA-AFAB614A1656}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DAB4B616-E628-433E-92CA-AFAB614A1656}.Debug|Win32.Build.0 = Debug|Win32
+		{DAB4B616-E628-433E-92CA-AFAB614A1656}.Debug|x64.ActiveCfg = Debug|x64
+		{DAB4B616-E628-433E-92CA-AFAB614A1656}.Debug|x64.Build.0 = Debug|x64
 		{DAB4B616-E628-433E-92CA-AFAB614A1656}.Release|Win32.ActiveCfg = Release|Win32
 		{DAB4B616-E628-433E-92CA-AFAB614A1656}.Release|Win32.Build.0 = Release|Win32
+		{DAB4B616-E628-433E-92CA-AFAB614A1656}.Release|x64.ActiveCfg = Release|x64
+		{DAB4B616-E628-433E-92CA-AFAB614A1656}.Release|x64.Build.0 = Release|x64
 		{3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Debug|Win32.Build.0 = Debug|Win32
+		{3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Debug|x64.ActiveCfg = Debug|x64
+		{3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Debug|x64.Build.0 = Debug|x64
 		{3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Release|Win32.ActiveCfg = Release|Win32
 		{3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Release|Win32.Build.0 = Release|Win32
+		{3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Release|x64.ActiveCfg = Release|x64
+		{3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}.Release|x64.Build.0 = Release|x64
 		{FA681701-91A3-44D7-878B-92E3B3BCBE43}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FA681701-91A3-44D7-878B-92E3B3BCBE43}.Debug|Win32.Build.0 = Debug|Win32
+		{FA681701-91A3-44D7-878B-92E3B3BCBE43}.Debug|x64.ActiveCfg = Debug|x64
+		{FA681701-91A3-44D7-878B-92E3B3BCBE43}.Debug|x64.Build.0 = Debug|x64
 		{FA681701-91A3-44D7-878B-92E3B3BCBE43}.Release|Win32.ActiveCfg = Release|Win32
 		{FA681701-91A3-44D7-878B-92E3B3BCBE43}.Release|Win32.Build.0 = Release|Win32
+		{FA681701-91A3-44D7-878B-92E3B3BCBE43}.Release|x64.ActiveCfg = Release|x64
+		{FA681701-91A3-44D7-878B-92E3B3BCBE43}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

code/ryzom/tools/leveldesign/LevelDesign.dsw

@@ -1,503 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "3d"=..\..\..\..\code\nel\src\3d.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "driver_opengl"=..\..\..\..\code\nel\src\3d\driver\opengl\driver_opengl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name 3d
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "export"=.\export\export.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "game_share"=..\..\..\..\code\ryzom\src_v2\game_share.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "georges"=..\..\..\..\code\nel\src\georges.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "georges_edit_dll"=.\georges_dll\georges_edit_dll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name georges
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "georges_exe"=.\georges_exe\georges_exe.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name georges_dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name georges_edit_dll
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name georges
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "land_export_lib"=..\3d\ligo\land_export_lib\land_export_lib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ligo"=..\..\..\..\code\nel\src\ligo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "logic"=..\..\..\..\code\nel\src\logic.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "logic_editor_dll"=.\logic_editor_dll\logic_editor_dll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name logic
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name net
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "logic_editor_exe"=.\logic_editor_exe\logic_editor_exe.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name logic_editor_dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "master"=.\master\master.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name georges_exe
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name logic_editor_exe
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name 3d
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name zviewer
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name georges
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name export
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ligo
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name driver_opengl
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name georges_edit_dll
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "memory"=..\..\..\..\code\nel\src\memory.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "misc"=..\..\..\..\code\nel\src\misc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "mission_compiler_fe"=.\mission_compiler_fe\mission_compiler_fe.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name mission_compiler_lib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ligo
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name memory
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mission_compiler_lib"=.\mission_compiler_lib\mission_compiler_lib.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "net"=..\..\..\..\code\nel\src\net.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "pacs"=..\..\..\..\code\nel\src\pacs.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "sound"=..\..\..\..\code\nel\src\sound.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "world_editor"=..\3d\ligo\world_editor\world_editor.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name 3d
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ligo
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pacs
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name georges
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name memory
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "world_editor_fauna_graph_plugin"=..\3d\ligo\world_editor_fauna_graph_plugin\world_editor_fauna_graph_plugin.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name 3d
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ligo
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "world_editor_graph_plugin"=..\3d\ligo\world_editor_graph_plugin\world_editor_graph_plugin.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ligo
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mission_compiler_lib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "world_editor_primitive_plugin"=..\3d\ligo\world_editor_primitive_plugin\world_editor_primitive_plugin.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name georges
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ligo
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "world_editor_service"=..\3d\ligo\world_editor_service\world_editor_service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "world_editor_shard_monitor_plugin"=..\3d\ligo\world_editor_shard_monitor_plugin\world_editor_shard_monitor_plugin.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ligo
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name net
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name game_share
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "worldeditor_sound_plugin"=..\3d\ligo\worldeditor_sound_plugin\worldeditor_sound_plugin.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name game_share
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name georges
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name sound
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name 3d
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ligo
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "zviewer"=..\..\..\..\code\tool\zviewer\zviewer.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name 3d
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

code/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp

@@ -280,8 +280,8 @@ struct TSetLastFolder
 		vector<string> folders;
 		str = CPath::standardizePath(str, false);
 #ifdef NL_OS_WINDOWS 
-		explode(str, "/", folders, true);
+		explode(str, std::string("/"), folders, true);
-#else // NL_OS_WINDOW 
+#else // NL_OS_WINDOW
 		NLMISC::splitString(str, "/", folders); 
 #endif // NL_OS_WINDOWS 
 		if (!folders.empty())
@@ -367,13 +367,13 @@ int main()
 	CConfigFile::CVar &filters = cf.getVar("Filters");
 
 	// store the filters
-	for (int i=0; i<filters.size(); ++i)
+	for (uint i=0; i<filters.size(); ++i)
 	{
 		Filters.push_back(filters.asString(i));
 	}
 
 	// add the search paths
-	for (int i=0; i<paths.size(); ++i)
+	for (uint i=0; i<paths.size(); ++i)
 	{
 		CPath::addSearchPath(paths.asString(i), true, false);
 	}

code/ryzom/tools/leveldesign/csv_transform/csv_transform.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="csv_transform"
 	ProjectGUID="{FA681701-91A3-44D7-878B-92E3B3BCBE43}"
 	TargetFrameworkVersion="0"
@@ -10,6 +10,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -35,6 +38,9 @@
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="3"
@@ -113,6 +119,9 @@
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
@@ -166,6 +175,166 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			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="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(ProjectName)_r.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			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;_CONSOLE"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(ProjectName)_d.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -193,6 +362,14 @@
 						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="test.scr"
@@ -205,6 +382,14 @@
 						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="test1.out"
@@ -217,6 +402,14 @@
 						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="test1.scr"
@@ -229,6 +422,14 @@
 						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="test2.out"
@@ -241,6 +442,14 @@
 						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="test2.scr"
@@ -253,6 +462,14 @@
 						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="test3.out"
@@ -265,6 +482,14 @@
 						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>

code/ryzom/tools/leveldesign/georges_dll/georges_edit_dll.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="georges_dll"
 	ProjectGUID="{358403E3-B05D-4793-A87B-BA2FF7AB122D}"
 	RootNamespace="georges_dll"
@@ -12,6 +12,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -180,6 +183,172 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfMFC="2"
+			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"
+				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"
+				ModuleDefinitionFile="georges_debug.def"
+				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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\install\$(ProjectName)_r.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="georges_release.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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>
 	</Configurations>
 	<References>
 	</References>
@@ -307,6 +476,22 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="type_dialog.cpp"

code/ryzom/tools/leveldesign/georges_exe/georges_exe.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="georges_exe"
 	ProjectGUID="{B579068A-FE3B-46A8-AE14-289BEAE5EBC0}"
 	RootNamespace="georges_exe"
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -175,6 +178,168 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			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;LIBXML_STATIC"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="..\install\$(ProjectName)_d.exe"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="msvcrt.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				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|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LIBXML_STATIC"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="..\install\$(ProjectName)_r.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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>
 	</Configurations>
 	<References>
 	</References>

code/ryzom/tools/leveldesign/georges_plugin_sound/georges_plugin_sound.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="georges_plugin_sound"
 	ProjectGUID="{F27E79A2-9B78-4497-A829-FD3D80B8E861}"
 	Keyword="MFCProj"
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -177,6 +180,170 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfMFC="2"
+			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"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				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"
+				ModuleDefinitionFile="georges_plugin_sound.def"
+				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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\install\$(ProjectName)_r.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="georges_plugin_sound.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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>
 	</Configurations>
 	<References>
 	</References>

code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.dsp

@@ -1,154 +0,0 @@
-# Microsoft Developer Studio Project File - Name="georges_plugin_test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=georges_plugin_test - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "georges_plugin_test.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "georges_plugin_test.mak" CFG="georges_plugin_test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "georges_plugin_test - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "georges_plugin_test - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "georges_plugin_test - Win32 Release"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "georges_plugin_test - Win32 Debug"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "georges_plugin_test - Win32 Release"
-# Name "georges_plugin_test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\georges_plugin_test.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\georges_plugin_test.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\georges_plugin_test.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.cpp
-# ADD CPP /Yc"stdafx.h"
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_global_dialog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_local_dialog.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\georges_plugin_test.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_global_dialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_local_dialog.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\res\georges_plugin_test.rc2
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\ReadMe.txt
-# End Source File
-# End Target
-# End Project

code/ryzom/tools/leveldesign/georges_plugin_test/georges_plugin_test.vcproj

@@ -0,0 +1,645 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="georges_plugin_test"
+	ProjectGUID="{36DE80C1-0519-4177-847C-17A8D846D365}"
+	Keyword="MFCProj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/georges_plugin_test.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="stdafx.h"
+				PrecompiledHeaderFile=".\Release/georges_plugin_test.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile=".\Release/georges_plugin_test.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ModuleDefinitionFile=".\georges_plugin_test.def"
+				ProgramDatabaseFile=".\Release/georges_plugin_test.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary=".\Release/georges_plugin_test.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/georges_plugin_test.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/georges_plugin_test.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="stdafx.h"
+				PrecompiledHeaderFile=".\Debug/georges_plugin_test.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile=".\Debug/georges_plugin_test.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				ModuleDefinitionFile=".\georges_plugin_test.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/georges_plugin_test.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary=".\Debug/georges_plugin_test.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/georges_plugin_test.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Release/georges_plugin_test.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="stdafx.h"
+				PrecompiledHeaderFile=".\Release/georges_plugin_test.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile=".\Release/georges_plugin_test.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ModuleDefinitionFile=".\georges_plugin_test.def"
+				ProgramDatabaseFile=".\Release/georges_plugin_test.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary=".\Release/georges_plugin_test.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/georges_plugin_test.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="2"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Debug/georges_plugin_test.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="stdafx.h"
+				PrecompiledHeaderFile=".\Debug/georges_plugin_test.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile=".\Debug/georges_plugin_test.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				ModuleDefinitionFile=".\georges_plugin_test.def"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/georges_plugin_test.pdb"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary=".\Debug/georges_plugin_test.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/georges_plugin_test.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="georges_plugin_test.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="georges_plugin_test.def"
+				>
+			</File>
+			<File
+				RelativePath="georges_plugin_test.rc"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="StdAfx.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="test_global_dialog.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="test_local_dialog.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="georges_plugin_test.h"
+				>
+			</File>
+			<File
+				RelativePath="Resource.h"
+				>
+			</File>
+			<File
+				RelativePath="StdAfx.h"
+				>
+			</File>
+			<File
+				RelativePath="test_global_dialog.h"
+				>
+			</File>
+			<File
+				RelativePath="test_local_dialog.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+			<File
+				RelativePath="res\georges_plugin_test.rc2"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="ReadMe.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

code/ryzom/tools/leveldesign/master/master.dsp

@@ -1,325 +0,0 @@
-# Microsoft Developer Studio Project File - Name="master" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=master - Win32 DebugFast
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "master.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "master.mak" CFG="master - Win32 DebugFast"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "master - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "master - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE "master - Win32 DebugFast" (based on "Win32 (x86) Application")
-!MESSAGE "master - Win32 ReleaseDebug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "master - Win32 Release"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../../code/nel/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 libxml2.lib freetype.lib /nologo /subsystem:windows /machine:I386
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Imports all DLLs
-PostBuild_Cmds=copy ..\..\3d\ligo\worldeditor\release\worldeditor.dll .	copy ..\georges_dll\georges_dll.dll .	copy ..\logic_editor_dll\release\logic_editor.dll .
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "master - Win32 Debug"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../../../code/nel/include" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "__STL_DEBUG" /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libxml2_debug.lib freetype.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Imports all DLLs
-PostBuild_Cmds=copy ..\..\3d\ligo\worldeditor\debug\worldeditor_debug.dll .	copy ..\georges_dll\georges_dll_debug.dll .	copy ..\logic_editor_dll\debug\logic_editor_debug.dll .
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "master - Win32 DebugFast"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugFast"
-# PROP BASE Intermediate_Dir "DebugFast"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugFast"
-# PROP Intermediate_Dir "DebugFast"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../../../code/nel/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /D "NL_DEBUG_FAST" /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libxml2.lib msvcrtd.lib libc.lib freetype.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /nodefaultlib
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Imports all DLLs
-PostBuild_Cmds=copy ..\..\3d\ligo\worldeditor\debugfast\worldeditor_df.dll .	copy ..\georges_dll\georges_dll_debug_fast.dll .	copy ..\logic_editor_dll\debugfast\logic_editor_df.dll .
-# End Special Build Tool
-
-!ELSEIF  "$(CFG)" == "master - Win32 ReleaseDebug"
-
-# PROP BASE Use_MFC 6
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseDebug"
-# PROP BASE Intermediate_Dir "ReleaseDebug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 6
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDebug"
-# PROP Intermediate_Dir "ReleaseDebug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../../../../../code/nel/include" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /D "NL_RELEASE_DEBUG" /D "WIN32" /D "NDEBUG" /Yu"stdafx.h" /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
-# ADD LINK32 freetype.lib libxml2.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Imports all DLLs
-PostBuild_Cmds=copy ..\..\3d\ligo\worldeditor\releasedebug\worldeditor_rd.dll .	copy ..\georges_dll\georges_dll_rd.dll .	copy ..\logic_editor_dll\releasedebug\logic_editor_rd.dll .
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "master - Win32 Release"
-# Name "master - Win32 Debug"
-# Name "master - Win32 DebugFast"
-# Name "master - Win32 ReleaseDebug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\ChooseDir.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ChooseTag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ContinentCfg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ContinentPropertiesDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\easy_cfg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ExportCBDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ExportDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MainFrm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\master.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MasterTree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\NameEditDlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.cpp
-# ADD CPP /Yc"stdafx.h"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\ChooseDir.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ChooseTag.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ContinentCfg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ContinentPropertiesDlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\easy_cfg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ExportCBDlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ExportDlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MainFrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\master.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MasterTree.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\NameEditDlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\res\backup.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\continents.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\file.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\folder.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\master.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\master.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\master.rc2
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\masterDoc.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\regions.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\res\trash.ico
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\ReadMe.txt
-# End Source File
-# End Target
-# End Project

code/ryzom/tools/leveldesign/master/master.dsw

@@ -1,137 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "3d"=..\..\..\..\..\code\nel\src\3d.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "driver_opengl"=..\..\..\..\..\code\nel\src\3d\driver\opengl\driver_opengl.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name 3d
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "export"=..\export\export.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name 3d
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name lib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name georges_lib
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "georges"=..\..\..\..\..\code\nel\src\georges.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ligo"=..\..\..\..\..\code\nel\src\ligo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "master"=.\master.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name misc
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name export
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name 3d
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name georges
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name ligo
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name driver_opengl
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "misc"=..\..\..\..\..\code\nel\src\misc.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

code/ryzom/tools/leveldesign/mission_compiler_fe/mission_compiler_fe.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="mission_compiler_fe"
 	ProjectGUID="{F926ACBF-A18F-4937-8DE1-6395A3DE7F13}"
 	Keyword="MFCProj"
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -175,6 +178,168 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="2"
+			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"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\install\$(ProjectName)_d.exe"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="msvcrt.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				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|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\install\$(ProjectName)_r.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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>
 	</Configurations>
 	<References>
 	</References>
@@ -226,6 +391,22 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter

code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler_lib.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="mission_compiler_lib"
 	ProjectGUID="{AA8827FF-28D6-4E1E-BED6-32745C4DEBC7}"
 	TargetFrameworkVersion="0"
@@ -10,6 +10,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -148,6 +151,142 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			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;NDEBUG;_LIB"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\$(ProjectName)_d.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\$(ProjectName)_r.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

code/ryzom/tools/leveldesign/uni_conv/uni_conv.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="uni_conv"
 	ProjectGUID="{3FD4F688-BE1D-4782-ACF6-701DC16DE3BC}"
 	TargetFrameworkVersion="0"
@@ -10,6 +10,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -35,6 +38,9 @@
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="3"
@@ -113,6 +119,9 @@
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"
 			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="4"
@@ -166,6 +175,166 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			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="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(ProjectName)_r.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			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;_CONSOLE"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(ProjectName)_d.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

code/ryzom/tools/leveldesign/world_editor/world_editor/world_editor.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="world_editor"
 	ProjectGUID="{F1BFAA2A-425B-4D46-A4EF-C3AA613E4BFF}"
 	RootNamespace="world_editor"
@@ -12,6 +12,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -178,6 +181,170 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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"
+				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.exe"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="msvcrt.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				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|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			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="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="..\..\install\$(ProjectName)_r.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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>
 	</Configurations>
 	<References>
 	</References>
@@ -309,6 +476,22 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="tools_logic.cpp"

code/ryzom/tools/leveldesign/world_editor/world_editor_fauna_graph_plugin/world_editor_fauna_graph_plugin.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="world_editor_fauna_graph_plugin"
 	ProjectGUID="{CB678E97-789D-4FA9-BB42-7D6DB673EC77}"
 	Keyword="MFCProj"
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -179,6 +182,172 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			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"
+				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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			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="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<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
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -218,6 +387,22 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="world_editor_fauna_graph_plugin.cpp"

code/ryzom/tools/leveldesign/world_editor/world_editor_graph_plugin/world_editor_graph_plugin.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="world_editor_graph_plugin"
 	ProjectGUID="{38A8CF85-4F48-4420-84D6-CC1E764C6291}"
 	Keyword="MFCProj"
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -179,6 +182,172 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			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"
+				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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			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="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<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
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -210,6 +379,22 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="world_editor_graph_plugin.cpp"

code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/world_editor_primitive_plugin.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="world_editor_primitive_plugin"
 	ProjectGUID="{565DA67F-C546-415B-9256-F4046866B59C}"
 	Keyword="MFCProj"
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -177,6 +180,170 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			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;WIN32_DLL_EXPORTS"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			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="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN32_DLL_EXPORTS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<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
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>

code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/world_editor_shard_monitor_plugin.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="world_editor_shard_monitor_plugin"
 	ProjectGUID="{6602D6B7-C644-4DA6-A457-49767C4DA7ED}"
 	Keyword="MFCProj"
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -179,6 +182,172 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			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"
+				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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			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="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<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
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -230,6 +399,22 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter

code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/world_editor_sound_plugin.vcproj

@@ -1,16 +1,17 @@
 <?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}"
-	Keyword="MFCProj"
-	TargetFrameworkVersion="0"
 	>
 	<Platforms>
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -21,7 +22,6 @@
 			IntermediateDirectory="..\..\..\..\obj\$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="2"
 			UseOfMFC="2"
-			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
 			>
 			<Tool
@@ -179,6 +179,172 @@
 				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)"
+			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="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WORLDEDITOR_SOUND_PLUGIN_EXPORTS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<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
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -222,6 +388,22 @@
 						UsePrecompiledHeader="1"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter

code/ryzom/tools/translation_tools/translation_tools.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="translation_tools"
 	ProjectGUID="{DAB4B616-E628-433E-92CA-AFAB614A1656}"
 	RootNamespace="translation_tools"
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -178,6 +181,171 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			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"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
+				BasicRuntimeChecks="3"
+				SmallerTypeCheck="true"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="$(ProjectName)_d.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="1"
+				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="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			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="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1036"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="$(ProjectName)_r.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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>
 	</Configurations>
 	<References>
 	</References>

code/tool/all.sln

@@ -25,11 +25,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ren_date", "ren_date\ren_da
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ResSwap", "resswap\ResSwap.vcproj", "{45255B61-CD45-484A-89DB-B4D75EF04993}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zviewer", "zviewer\zviewer.vcproj", "{B798D9FF-AA33-4918-8B51-1B4FA9C5160A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A} = {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3d", "..\nel\src\3d.vcproj", "{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}
@@ -115,14 +110,6 @@ Global
 		{45255B61-CD45-484A-89DB-B4D75EF04993}.Release|Win32.Build.0 = Release|Win32
 		{45255B61-CD45-484A-89DB-B4D75EF04993}.Release|x64.ActiveCfg = Release|x64
 		{45255B61-CD45-484A-89DB-B4D75EF04993}.Release|x64.Build.0 = Release|x64
-		{B798D9FF-AA33-4918-8B51-1B4FA9C5160A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B798D9FF-AA33-4918-8B51-1B4FA9C5160A}.Debug|Win32.Build.0 = Debug|Win32
-		{B798D9FF-AA33-4918-8B51-1B4FA9C5160A}.Debug|x64.ActiveCfg = Debug|x64
-		{B798D9FF-AA33-4918-8B51-1B4FA9C5160A}.Debug|x64.Build.0 = Debug|x64
-		{B798D9FF-AA33-4918-8B51-1B4FA9C5160A}.Release|Win32.ActiveCfg = Release|Win32
-		{B798D9FF-AA33-4918-8B51-1B4FA9C5160A}.Release|Win32.Build.0 = Release|Win32
-		{B798D9FF-AA33-4918-8B51-1B4FA9C5160A}.Release|x64.ActiveCfg = Release|x64
-		{B798D9FF-AA33-4918-8B51-1B4FA9C5160A}.Release|x64.Build.0 = Release|x64
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|Win32.Build.0 = Debug|Win32
 		{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Debug|x64.ActiveCfg = Debug|x64

code/tool/zviewer/move_listener.cpp

@@ -1,230 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include <nel/misc/event_server.h>
-#include <nel/3d/driver.h>
-#include <nel/3d/nelu.h>
-
-#include "move_listener.h"
-
-
-using namespace NLMISC;
-
-namespace NL3D {
-
-
-
-
-
-/****************************************************************\
-						 CMoveListener()
-\****************************************************************/
-CMoveListener::CMoveListener()
-{
-	_ViewMatrix.identity();
-	_Viewport.initFullScreen();
-	
-	_Mode = WALK;
-
-	_MouseFree = false;
-
-	_CursorInit = false;
-
-	_Width = 0;
-	_Height = 0;
-
-	_Top=1.f;
-	_Bottom=1.f;
-	_Left=1.f;
-	_Right=1.f;
-	_Depth=1.f;
-
-	_RotZ = 0;
-	_RotX = 0;
-
-	_TransSpeed = 1.66f;
-	_RotSpeed = 1;
-
-	_CurrentTime = 0;
-	_LastTime = 0;
-
-	_EyesHeight = 1.80f;
-}
-
-
-/****************************************************************\
-						 changeViewMatrix()
-\****************************************************************/
-void CMoveListener::changeViewMatrix()
-{
-	float time = (sint64)(_CurrentTime-_LastTime)*0.001f;
-
-	// Forward
-	if(CNELU::AsyncListener.isKeyDown(KeyUP))
-	{
-		if(_Mode==WALK)
-		{
-			_Pos.x -= time*_TransSpeed * (float)sin(_RotZ);
-			_Pos.y += time*_TransSpeed * (float)cos(_RotZ);
-		}
-		else
-		{
-			_Pos.x -= time*_TransSpeed * (float)sin(_RotZ)*(float)cos(_RotX);
-			_Pos.y += time*_TransSpeed * (float)cos(_RotZ)*(float)cos(_RotX);
-			_Pos.z += time*_TransSpeed * (float)sin(_RotX);
-		}
-	}
-	// Backward
-	if(CNELU::AsyncListener.isKeyDown(KeyDOWN))
-	{
-		if(_Mode==WALK)
-		{
-			_Pos.x += time*_TransSpeed * (float)sin(_RotZ);
-			_Pos.y -= time*_TransSpeed * (float)cos(_RotZ);
-		}
-		else
-		{
-			_Pos.x += time*_TransSpeed * (float)sin(_RotZ)*(float)cos(_RotX);
-			_Pos.y -= time*_TransSpeed * (float)cos(_RotZ)*(float)cos(_RotX);
-			_Pos.z -= time*_TransSpeed * (float)sin(_RotX);
-		}
-	}
-
-	// Strafe left
-	if(CNELU::AsyncListener.isKeyDown(KeyLEFT))
-	{
-		_Pos.x = _Pos.x - time*_TransSpeed*(float)cos(_RotZ);
-		_Pos.y = _Pos.y - time*_TransSpeed*(float)sin(_RotZ);
-	}
-	// Strafe right
-	if(CNELU::AsyncListener.isKeyDown(KeyRIGHT))
-	{
-		_Pos.x = _Pos.x + time*_TransSpeed*(float)cos(_RotZ);
-		_Pos.y = _Pos.y + time*_TransSpeed*(float)sin(_RotZ);
-	}
-	// Up
-	if(CNELU::AsyncListener.isKeyDown(KeySHIFT))
-	{
-		_Pos.z += time*_TransSpeed;
-	}
-	// Down
-	if(CNELU::AsyncListener.isKeyDown(KeyCONTROL))
-	{
-		_Pos.z -= time*_TransSpeed;
-	}
-	
-	if(CNELU::AsyncListener.isKeyPushed(Key1))
-	{
-		_TransSpeed = 5/3.6f; // 5km/h
-	}
-	if(CNELU::AsyncListener.isKeyPushed(Key2))
-	{
-		_TransSpeed = 10/3.6f; // 10km/h
-	}
-	if(CNELU::AsyncListener.isKeyPushed(Key3))
-	{
-		_TransSpeed = 20/3.6f; // 20km/h
-	}
-	if(CNELU::AsyncListener.isKeyPushed(Key4))
-	{
-		_TransSpeed = 40/3.6f; //40km/h
-	}
-	if(CNELU::AsyncListener.isKeyPushed(Key5))
-	{
-		_TransSpeed = 80/3.6f; //80km/h
-	}
-	if(CNELU::AsyncListener.isKeyPushed(Key6))
-	{
-		_TransSpeed = 160/3.6f; //160km/h
-	}
-	if(CNELU::AsyncListener.isKeyPushed(Key7))
-	{
-		_TransSpeed = 320/3.6f; //320km/h
-	}
-	if(CNELU::AsyncListener.isKeyPushed(Key8))
-	{
-		_TransSpeed = 640/3.6f; //640km/h
-	}
-	
-	// Transform view matrix
-	_ViewMatrix.identity();
-	_ViewMatrix.translate(CVector(0,0,_EyesHeight));
-	_ViewMatrix.translate(_Pos);
-	_ViewMatrix.rotateZ(_RotZ);
-	_ViewMatrix.rotateX(_RotX);
-
-	CNELU::Camera->setMatrix(_ViewMatrix);
-
-}
-
-
-/****************************************************************\
-						 operator()
-\****************************************************************/
-void CMoveListener::operator()(const CEvent& event)
-{
-	static const float eps = 0.001f;
-
-	// Rotation
-	if (event==EventMouseMoveId)
-	{
-		CEventMouse* mouseEvent=(CEventMouse*)&event;
-
-		if(!_MouseFree)
-		{
-			if(_CursorInit)
-			{
-				float difx =  0.5f-mouseEvent->X;
-				if ( (float)fabs(difx) > eps)
-				{
-					_RotZ += _RotSpeed*(difx);
-				}
-				float dify =  -(0.5f-mouseEvent->Y);
-				if ( (float)fabs(dify) > eps)
-				{
-					_RotX += _RotSpeed*(dify);
-				}	
-			}
-			else
-			{
-				_CursorInit = true;
-			}
-			_Scene->getDriver()->setMousePos(0.5,0.5);
-		}
-	}
-
-	changeViewMatrix();
-}
-
-
-/****************************************************************\
-						 addToServer()
-\****************************************************************/
-void CMoveListener::addToServer(CEventServer& server)
-{
-	server.addListener (EventMouseMoveId, this);
-}
-
-
-/****************************************************************\
-						 removeFromServer()
-\****************************************************************/
-void CMoveListener::removeFromServer (CEventServer& server)
-{
-	server.removeListener (EventMouseMoveId, this);
-}
-
-}; // NL3D

code/tool/zviewer/move_listener.h

@@ -1,221 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef NL_MOVE_LISTENER_H
-#define NL_MOVE_LISTENER_H
-
-#include <nel/misc/types_nl.h>
-#include <nel/misc/time_nl.h>
-#include <nel/misc/event_listener.h>
-#include <nel/misc/matrix.h>
-#include <nel/3d/viewport.h>
-#include <nel/3d/scene.h>
-#include <nel/3d/camera.h>
-#include <nel/3d/driver.h>
-
-
-
-namespace NL3D 
-{
-
-
-/**
- * CMoveListener is a listener that handle a 3d matrix with mouse events.
- * \author Stephane Coutelas
- * \author Nevrax France
- * \date 2000
- */
-class CMoveListener : public NLMISC::IEventListener
-{
-
-public :
-	
-	/** 
-	 * TMoveMode. 
-	 * moving modes
-	 */
-	enum TMoveMode
-	{
-		WALK,
-		FREE
-	};
-
-private:
-	
-	/// Internal use
-	virtual void operator()(const NLMISC::CEvent& event);
-
-	/// moving mode
-	TMoveMode _Mode;
-	
-	/// view matrix
-	NLMISC::CMatrix _ViewMatrix;
-
-	/// viewport
-	NL3D::CViewport	_Viewport;
-	
-	/// true if first setMousePos done
-	bool _CursorInit;
-
-	CScene * _Scene;
-	
-	/// screen width
-	uint _Width;
-
-	/// screen height
-	uint _Height;
-
-	///frustum parameters
-	float _Top;
-	float _Bottom;
-	float _Left;
-	float _Right;
-	float _Depth;
-	
-	/// current position
-	CVector _Pos;
-
-	/// eyes height
-	float _EyesHeight;
-
-	///current rotation z angle
-	float _RotZ;
-
-	///current rotation x angle
-	float _RotX;
-	
-	/// last local time measured
-	NLMISC::TTime _LastTime;
-
-	/// current local time
-	NLMISC::TTime _CurrentTime;
-
-	/// step for translation
-	float _TransSpeed;
-
-	/// step for rotation
-	float _RotSpeed;
-
-	/// false if mouse is use to move
-	bool _MouseFree;
-
-public:
-	
-	
-	/** 
-	 * Constructor. 
-	 * You should call init then.
-	 */
-	CMoveListener();
-
-
-	/** 
-	 * Constructor. 
-	 * You should call init then.
-	 * \param scene the scene
-	 * \param w screen width in pixels
-	 * \param h screen height in pixels
-	 * \param camera the camera
-	 */
-	void init(CScene * scene, uint w, uint h, const class CCamera& camera)
-	{
-		_Scene = scene;
-		_Width = w;
-		_Height = h;
-		
-		_Viewport = scene->getViewport();
-
-		float dummy;
-		_ViewMatrix = camera.getMatrix ();
-		camera.getFrustum (_Left, _Right, _Bottom, _Top, _Depth, dummy);
-	}
-
-	/**
-	 * Set the moving mode
-	 * \param m the moving mode
-	 */
-	void setMode(TMoveMode m)
-	{
-		_Mode = m;
-	}
-
-	void swapMode()
-	{
-		if(_Mode==WALK)
-		{
-			_Mode = FREE;
-		}
-		else
-		{
-			_Mode = WALK;
-		}
-	}
-
-	TMoveMode getMode() const
-	{
-		return _Mode;
-	}
-
-	void changeViewMatrix();
-
-	/** 
-     * Register the listener to the server.
-	 */
-	void addToServer (NLMISC::CEventServer& server);
-
-	/** 
-	  * Unregister the listener to the server.
-	  */
-	void removeFromServer (NLMISC::CEventServer& server);
-
-	void setEyesHeight(float eh) { _EyesHeight = eh; }
-	float getEyesHeight() const { return _EyesHeight; }
-
-	void setPos(CVector pos) { _Pos = pos; }
-	CVector getPos() const { return _Pos; }
-
-	float getRotX() const { return _RotX; }
-	float getRotZ() const { return _RotZ; }
-
-	float getSpeed() const { return _TransSpeed; }
-
-	void setLocalTime(NLMISC::TTime time)
-	{
-		_LastTime = _CurrentTime;
-		_CurrentTime = time;
-	}
-
-	void changeControlMode()
-	{
-		_MouseFree = ! _MouseFree;
-		if(_MouseFree)
-		{
-			_Scene->getDriver()->showCursor(true);
-		}
-		else
-		{
-			_Scene->getDriver()->showCursor(false);
-		}	
-	}
-		
-
-}; // NL3D
-
-}
-
-#endif // NL_MOVE_LISTENER_H
-
-/* End of move_listener.h */

code/tool/zviewer/readme.txt

@@ -1,175 +0,0 @@
-
- ====================
-      ZVIEWER 
- ====================
-
-
-ZVIEWER permet de visioner une ou plusieurs zones exportées depuis 3DSMax 
-au format de NeL, en utilisant le moteur.
-
-
-1. Le fichier zviewer.cfg
-   -----------------------
-
-Le répertoire d'où est exécuté le programme doit contenir le fichier ZVIEWER.CFG
-qui contient les paramètres de configuration. Sans ce fichier aucune zone ne sera 
-affichée.
-Lorsqu'il n'y a pas de fichier de configuration à l'execution un fichier type est
-généré.
-
-Exemple de config :
-
-FullScreen = 0;	
-Width = 800;    
-Height = 600; 
-Depth = 32;	
-Position = { 1088.9, -925.7, -1234.0 }; 
-EyesHeight = 1.80;  
-Background = { 100, 100, 255 }; 
-ZFar = 1000.0;	               
-LandscapeTileNear = 50.0;       
-LandscapeThreshold = 0.001;    
-BanksPath = "C:\WINDOWS\Bureau\zviewer\" ;
-Bank = "fyros_landf.bank" ;
-TilesPath = "C:\WINDOWS\Bureau\zviewer\tiles" ;
-ZonesPath = "C:\WINDOWS\Bureau\zviewer\zones" ;
-IgPath = "C:\WINDOWS\Bureau\zviewer\ig" ;
-ShapePath = "C:\WINDOWS\Bureau\zviewer\shapes" ;
-MapsPath = "C:\WINDOWS\Bureau\zviewer\maps" ;
-Zones = { "3_AC.zonel","3_AD.zonel" }; 
-Zonessave = { "3_AC.zonel","3_AD.zonel" }; 
-Zones = { "3_AC.zonel","3_AD.zonel" }; 
-Ig = { "3_AC.ig","3_AD.ig" }; 
-
-Avec :
-
-Fullscreen :
-0 : windowed 
-1 : fullscreen
-
-Width :
-largeur de la fenetre.
-
-Height :
-hauteur de la fenetre.
-
-Depth :
-nombre de couleurs (32bits,24bits,...).
-
-Position :
-position initiale (x,y,z). Correspond aux coordonnées dans Max (Generic Units).
-La position est automatiquement snapée au sol quelque soit la coordonnée en z.
-
-EyesHeight :
-hauteur des yeux pour le mode Walk.
-
-Background :
-couleur rgb du fond.
-
-ZFar :
-distance de clipping. Plus la distance est grande, plus on voit loin.
-
-LandscapeTileNear :
-valeur du near. Plus cette valeur est grande, plus la zone du near est grande.
-
-LandscapeThreshold :
-seuil utilisé pour la subdivision adaptative. Quand la valeur augmente, la qualité
-de la subdivision diminue (reduit le temps de calcul). Mis au minimum par defaut (0.001).
-
-BanksPath :
-chemin des banks (<bank>.bank et <bank>.farbank).
-
-Bank :
-nom de la bank (meme racine que la farbank)
-
-ZonesPath :
-chemin des zones.
-
-Zones :
-liste des noms des zones
-
-
-2. Les déplacements
-   ----------------
-
-Les déplacements se font à l'aide de la combinaison clavier/souris. 
-Il existe 2 modes de déplacement : FreeLook et Walk (defaut). 
-
-- Le mode FreeLook permet de se déplacer dans la direction du regard(idem cstrike). 
-- Dans le mode Walk le déplacement se fait au niveau du sol, à hauteur des yeux. 
-  L'utilisateur reste collé au sol.
-
-La souris permet d'orienter le regard dans toutes les directions
-Le clavier permet de se déplacer.
-
-
-3. Les touches
-   -----------
-ESC      : quitter le viewer
-F1       : Afficher/Masquer les infos
-F3       : basculer entre le mode plein et le mode fil de fer
-F12      : faire un screenshot
-ESPACE   : basculer entre les modes Walk et Free-Look
-RETURN   : libérer ou capturer la souris
-UP       : avancer
-DOWN     : reculer
-LEFT     : déplacement latéral à gauche
-RIGHT    : déplacement latéral à droite
-SHIFT    : augmenter l'altitude 
-CTRL     : baisser d'altitude 
-1        : 5 km/h
-2        : 10 km/h
-3        : 20 km/h
-4        : 40 km/h
-5        : 80 km/h
-6        : 160 km/h
-7        : 320 km/h
-8        : 640 km/h
-PAGEUP   : augmenter la distance de clipping
-PAGEDOWN : diminuer la distance de clipping
-HOME     : augmenter le near
-END      : diminuer le near
-INSERT   : augmenter le threshold
-DELETE   : diminuer le threshold
-ADD      : augmenter la hauteur des yeux
-SUBTRACT : diminuer la hauteur des yeux
-
-==================== ZVIEWER ENGLISH ====================
- 
-ZViewer allows you to view one or more zones exported from 3DSMax inside the NeL Engine
-
-
-When you run ZViewer for the first time if no configuration file is located one will be created with default values.
-The Configuration file defines the zones to load and other vital information and will not work in it's default state
-
-
-Keys 
-
-ESC: exit ZViewer
-F1: toggles information
-F3: toggles between full and the wire frame mode
-F12: screenshot
-SPACE: toggles between Walk and Free-Look mode
-RETURN: release or capture mouse
-UP: move forward
-DOWN: move back
-LEFT: turn left
-RIGHT: turn right
-SHIFT: increases altitude
-CTRL: decreases altitude
-1: 5 km/h
-2: 10 km/h
-3: 20 km/h
-4: 40 km/h
-5: 80 km/h
-6: 160 km/h
-7: 320 km/h
-8: 640 km/h
-PAGEUP: increases the clipping distance
-PAGEDOWN: decreases the clipping distance
-HOME: increases tilenear
-END: decreases the tilenear
-INSERT: increases threshold
-DELETE: decreases threshold
-ADD: increases the eye height
-SUBTRACT: decreases the eye height

code/tool/zviewer/resource.h

@@ -1,32 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by zviewer.rc
-//
-#define IDI_ICON1                       101
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

code/tool/zviewer/zviewer.cfg

@@ -1,37 +0,0 @@
-FullScreen = 0;
-Width = 800;
-Height = 600;
-Depth = 32;
-Position = { 1676, -7361, 0.000000 };
-EyesHeight = 1.800000;
-Background = { 100, 100, 255 };
-ZFar = 1000.000000;
-AutoLight = 0;
-LightDir = { 1.000000, 0.000000, 0.000000 };
-LandscapeNoise = 0;
-LandscapeTileNear = 50.000000;
-LandscapeThreshold = 0.001000;
-BanksPath = "R:\code\snowballs2\client\data\tiles";
-TilesPath = "R:\code\snowballs2\client\data\tiles";
-UseDDS = "1";
-AllPathRelative = "0";
-Bank = "bank.bank";
-ZonesPath = "R:\code\snowballs2\client\data\zones";
-IgPath = "R:\code\snowballs2\client\data\zones";
-ShapePath = "R:\code\snowballs2\client\data\shapes";
-MapsPath = "R:\code\snowballs2\client\data\maps";
-FontPath = "C:\Windows\fonts\arial.ttf";
-HeightFieldName = "";
-HeightFieldMaxZ = 100.000000;
-HeightFieldOriginX = 16000.000000;
-HeightFieldOriginY = -24000.000000;
-HeightFieldSizeX = 160.000000;
-HeightFieldSizeY = 160.000000;
-LandAmbient = { 0, 0, 0};
-LandDiffuse = { 255, 255, 255};
-Zones = {
-"3_AC.zonel",
-"3_AD.zonel",
-};
-Ig = {
-};

code/tool/zviewer/zviewer.cpp

@@ -1,975 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include <nel/misc/types_nl.h>
-#include <nel/misc/config_file.h>
-#include <nel/misc/debug.h>
-#include <nel/misc/path.h>
-#include <nel/misc/i18n.h>
-
-#include <nel/3d/driver.h>
-#include <nel/3d/camera.h>
-#include <nel/3d/landscape_model.h>
-#include <nel/3d/landscape.h>
-#include <nel/3d/text_context.h>
-#include <nel/3d/mini_col.h>
-#include <nel/3d/nelu.h>
-#include <nel/3d/scene_group.h>
-#include <nel/3d/texture_file.h>
-
-//#include "nel/net/local_entity.h"
-
-#include "move_listener.h"
-
-// Tempyoyo.
-#include <nel/3d/height_map.h>
-
-
-#include <string>
-#include <deque>
-
-using namespace std;
-using namespace NLMISC;
-using namespace NL3D;
-
-
-#define BANK_PAH_RELATIVE
-
-
-/**
- * CViewerConfig
- */
-struct CViewerConfig
-{
-	bool			Windowed;
-	uint			Width;
-	uint			Height;
-	uint			Depth;
-	CVector			Position;
-	CVector			Heading;
-	CVector			EyesHeight;
-	CRGBA			Background;
-
-	// Landscape
-	bool			AutoLight;
-	CVector			LightDir;
-	string			ZonesPath;
-	string			BanksPath;
-	string			TilesPath;
-	bool			UseDDS;
-	bool			AllPathRelative;
-
-	string			IgPath;
-	string			ShapePath;
-	string			MapsPath;
-	string			Bank;
-	string			FontPath;
-	CTextContext	TextContext;
-	CFontManager	FontManager;
-	float			ZFar;
-	float			LandscapeTileNear;
-	float			LandscapeThreshold;
-	bool			LandscapeNoise;
-	vector<string>	Zones;
-	vector<string>	Igs;
-
-	// HeightField.
-	string			HeightFieldName;
-	float			HeightFieldMaxZ;
-	float			HeightFieldOriginX;
-	float			HeightFieldOriginY;
-	float			HeightFieldSizeX;
-	float			HeightFieldSizeY;
-
-	// StaticLight
-	CRGBA			LandAmbient;
-	CRGBA			LandDiffuse;
-
-	CViewerConfig()
-	{
-		Windowed = true;
-		Width = 800;
-		Height = 600;
-		Depth = 32;
-		Position = CVector( 1088.987793f, -925.732178f, 0.0f );
-		Heading = CVector(0,1,0);
-		EyesHeight = CVector(0,0,1.8f);
-		Background = CRGBA(100,100,255);
-		AutoLight = false;
-		LightDir = CVector (1, 0, 0);
-		ZonesPath = "./";
-		BanksPath = "./";
-		TilesPath = "./";
-		UseDDS = false;
-		AllPathRelative = false;
-		IgPath = "./";
-		ShapePath = "./";
-		MapsPath = "./";
-		Bank = "bank.bank";
-		FontPath = "\\\\server\\code\\fonts\\arialuni.ttf";
-		ZFar = 1000;
-		LandscapeTileNear = 50.0f;
-		LandscapeThreshold = 0.001f;
-		LandscapeNoise = true;
-
-		HeightFieldName= "";
-		HeightFieldMaxZ= 100;
-		HeightFieldOriginX= 16000;
-		HeightFieldOriginY= -24000;
-		HeightFieldSizeX= 160;
-		HeightFieldSizeY= 160;
-
-		CRGBA diffuse (241, 226, 244);
-		CRGBA ambiant  (17, 54, 100);
-		LandDiffuse= diffuse;
-		LandAmbient= ambiant;
-
-	}
-};
-
-CViewerConfig			ViewerCfg;
-
-
-
-CLandscapeModel			*Landscape = NULL;
-CMoveListener			MoveListener;
-CMiniCol				CollisionManager;
-
-
-
-
-
-
-
-
-
-
-
-/*******************************************************************\
-						getZoneNameByCoord()
-\*******************************************************************/
-string getZoneNameByCoord(float x, float y)
-{
-	const float zoneDim = 160.0f;
-
-	float xcount = x/zoneDim;
-	float ycount = -y/zoneDim + 1;
-
-	string zoneName;
-	char ych[32];
-	sprintf(ych,"%d",(sint)ycount);
-	sint sz = strlen(ych);
-	for(sint i = 0; i<sz; i++)
-	{
-		zoneName += ych[i];
-	}
-	zoneName += '_';
-	zoneName += 'A' + (sint)xcount/26;
-	zoneName += 'A' + (sint)xcount%26;
-
-	return zoneName;
-}
-
-
-
-
-/*********************************************************\
-					displayOrientation()
-\*********************************************************/
-void displayOrientation()
-{
-	float x = 0.9f*4.f/3.f;
-	float y = 0.1f;
-	float radius = 0.015f;
-
-	// Triangle
-	CMaterial mat;
-	mat.initUnlit();
-	mat.setSrcBlend(CMaterial::srcalpha);
-	mat.setDstBlend(CMaterial::invsrcalpha);
-	mat.setBlend(true);
-	
-	CVertexBuffer vb;
-	vb.setVertexFormat (CVertexBuffer::PositionFlag);
-	vb.setNumVertices (7);
-	{
-		CVertexBufferReadWrite vba;
-		vb.lock(vba);
-		
-		// tri
-		vba.setVertexCoord (0, CVector (-radius, 0, 0));
-		vba.setVertexCoord (1, CVector (radius, 0, 0));
-		vba.setVertexCoord (2, CVector (0, 0, 3*radius));
-
-		// quad
-		vba.setVertexCoord (3, CVector (-radius, 0, -radius));
-		vba.setVertexCoord (4, CVector (radius, 0, -radius));
-		vba.setVertexCoord (5, CVector (radius, 0, radius));
-		vba.setVertexCoord (6, CVector (-radius, 0, radius));
-	}
-	
-	CNELU::Driver->activeVertexBuffer(vb);
-
-	CIndexBuffer pbTri;
-	pbTri.setNumIndexes (3);
-	{
-		CIndexBufferReadWrite iba;
-		pbTri.lock (iba);
-		iba.setTri (0, 0, 1, 2);
-	}
-	
-	CIndexBuffer pbQuad;
-	pbQuad.setNumIndexes (6);
-	{
-		CIndexBufferReadWrite iba;
-		pbQuad.lock(iba);
-		iba.setTri (0, 3, 4, 5);
-		iba.setTri (3, 5, 6, 3);
-	}
-	
-	CNELU::Driver->setFrustum (0.f, 4.f/3.f, 0.f, 1.f, -1.f, 1.f, false);
-	CMatrix mtx;
-	mtx.identity();
-	CNELU::Driver->setupViewMatrix (mtx);
-
-	mat.setColor(CRGBA(50,255,255,150));
-
-	// up
-	mtx.identity();
-	mtx.translate(CVector(x,0,y));
-	mtx.rotateY(MoveListener.getRotZ() );
-	mtx.translate(CVector(0,0,radius));
-	CNELU::Driver->setupModelMatrix (mtx);
-	CNELU::Driver->activeVertexBuffer(vb);
-	CNELU::Driver->activeIndexBuffer(pbTri);
-	CNELU::Driver->renderTriangles(mat, 0, pbTri.getNumIndexes()/3);
-
-	mat.setColor(CRGBA(50,50,255,150));
-
-	// down
-	mtx.identity();
-	mtx.translate(CVector(x,0,y));
-	mtx.rotateY(MoveListener.getRotZ() + (float)Pi);
-	mtx.translate(CVector(0,0,radius));
-	CNELU::Driver->setupModelMatrix (mtx);
-	CNELU::Driver->renderTriangles(mat, 0, pbTri.getNumIndexes()/3);
-
-	// left
-	mtx.identity();
-	mtx.translate(CVector(x,0,y));
-	mtx.rotateY(MoveListener.getRotZ() - (float)Pi/2);
-	mtx.translate(CVector(0,0,radius));
-	CNELU::Driver->setupModelMatrix (mtx);
-	CNELU::Driver->renderTriangles(mat, 0, pbTri.getNumIndexes()/3);
-
-	// right
-	mtx.identity();
-	mtx.translate(CVector(x,0,y));
-	mtx.rotateY(MoveListener.getRotZ() + (float)Pi/2);
-	mtx.translate(CVector(0,0,radius));
-	CNELU::Driver->setupModelMatrix (mtx);
-	CNELU::Driver->renderTriangles(mat, 0, pbTri.getNumIndexes()/3);
-	
-	// center
-	mtx.identity();
-	mtx.translate(CVector(x,0,y));
-	mtx.rotateY(MoveListener.getRotZ());
-	CNELU::Driver->setupModelMatrix (mtx);
-	CNELU::Driver->activeIndexBuffer(pbQuad);
-	CNELU::Driver->renderTriangles(mat, 0, pbQuad.getNumIndexes()/3);	
-}
-
-
-
-
-
-/*********************************************************\
-					displayZone()
-\*********************************************************/
-void displayZones()
-{
-	const float zFarStep = 5.0f;
-	const float	tileNearStep = 10.0f;
-	const float thresholdStep = 0.005f;
-
-	ViewerCfg.TextContext.setHotSpot(CComputedString::MiddleMiddle);
-	ViewerCfg.TextContext.setColor(CRGBA(255,255,255));
-	ViewerCfg.TextContext.setFontSize(20);
-	
-	CNELU::clearBuffers(CRGBA(0,0,0));
-	CNELU::swapBuffers();
-
-
-
-	// Create landscape
-	CNELU::clearBuffers(CRGBA(0,0,0));
-	ViewerCfg.TextContext.printfAt(0.5f,0.5f,"Creating landscape...");
-	CNELU::swapBuffers();
-	
-	Landscape = (CLandscapeModel*)CNELU::Scene->createModel(LandscapeModelId);
-	Landscape->Landscape.setNoiseMode (ViewerCfg.LandscapeNoise);
-	Landscape->Landscape.setTileNear(ViewerCfg.LandscapeTileNear);
-	Landscape->Landscape.setThreshold(ViewerCfg.LandscapeThreshold);
-
-	Landscape->Landscape.enableAutomaticLighting (ViewerCfg.AutoLight);
-	Landscape->Landscape.setupAutomaticLightDir (ViewerCfg.LightDir);
-
-	// Enable Additive Tiles.
-	Landscape->enableAdditive(true);
-
-	// HeightField.
-	CBitmap		heightBitmap;
-	if( ViewerCfg.HeightFieldName!="" && heightBitmap.load(CIFile(ViewerCfg.HeightFieldName)) )
-	{
-		CHeightMap	heightMap;
-		heightMap.buildFromBitmap(heightBitmap);
-		heightMap.MaxZ= ViewerCfg.HeightFieldMaxZ;
-		heightMap.OriginX= ViewerCfg.HeightFieldOriginX;
-		heightMap.OriginY= ViewerCfg.HeightFieldOriginY;
-		heightMap.SizeX = ViewerCfg.HeightFieldSizeX;
-		heightMap.SizeY = ViewerCfg.HeightFieldSizeY;
-		Landscape->Landscape.setHeightField(heightMap);
-	}
-
-	
-	// Init TileBank.
-	CNELU::clearBuffers(CRGBA(0,0,0));
-	ViewerCfg.TextContext.printfAt(0.5f,0.5f,"Initializing TileBanks...");
-	CNELU::swapBuffers();
-
-	try 
-	{
-		CIFile bankFile (ViewerCfg.BanksPath + "/" + ViewerCfg.Bank);
-		Landscape->Landscape.TileBank.serial(bankFile);
-	}
-	catch(Exception)
-	{
-		string tmp = string("Cant load bankfile ")+ViewerCfg.BanksPath + "/" + ViewerCfg.Bank;
-		nlerror (tmp.c_str());
-	}
-
-	if ((Landscape->Landscape.TileBank.getAbsPath ()!="")&&(ViewerCfg.TilesPath!=""))
-		Landscape->Landscape.TileBank.setAbsPath (ViewerCfg.TilesPath + "/");
-
-	if (ViewerCfg.UseDDS)
-	{
-		Landscape->Landscape.TileBank.makeAllExtensionDDS();
-	}
-
-	if (ViewerCfg.AllPathRelative)
-		Landscape->Landscape.TileBank.makeAllPathRelative();
-
-	sint idx = ViewerCfg.Bank.find(".");
-	string farBank = ViewerCfg.Bank.substr(0,idx);
-	farBank += ".farbank";
-
-	try
-	{
-		CIFile farbankFile(ViewerCfg.BanksPath + "/" + farBank);
-		Landscape->Landscape.TileFarBank.serial(farbankFile);
-	}
-	catch(Exception)
-	{
-		string tmp = string("Cant load bankfile ")+ViewerCfg.BanksPath + "/" + farBank;
-		nlerror (tmp.c_str());
-	}
-	
-	if ( ! Landscape->Landscape.initTileBanks() )
-	{
-		nlwarning( "You need to recompute bank.farbank for the far textures" );
-	}
-	
-	// Init light color
-	CNELU::clearBuffers(CRGBA(0,0,0));
-	ViewerCfg.TextContext.printfAt(0.5f,0.5f,"Initializing Light...");
-	CNELU::swapBuffers();
-	
-	Landscape->Landscape.setupStaticLight (ViewerCfg.LandDiffuse, ViewerCfg.LandAmbient, 1.1f);
-
-	// Init collision manager
-	CollisionManager.init( &(Landscape->Landscape), 200);
-	
-
-	// Preload of TileBank
-	CNELU::clearBuffers(CRGBA(0,0,0));
-	ViewerCfg.TextContext.printfAt(0.5f,0.5f,"Loading TileBank...");
-	CNELU::swapBuffers();
-	
-	for (int ts=0; ts<Landscape->Landscape.TileBank.getTileSetCount (); ts++)
-	{
-		CTileSet *tileSet=Landscape->Landscape.TileBank.getTileSet (ts);
-		sint tl;
-		for (tl=0; tl<tileSet->getNumTile128(); tl++)
-			Landscape->Landscape.flushTiles (CNELU::Scene->getDriver(), (uint16)tileSet->getTile128(tl), 1);
-		for (tl=0; tl<tileSet->getNumTile256(); tl++)
-			Landscape->Landscape.flushTiles (CNELU::Scene->getDriver(), (uint16)tileSet->getTile256(tl), 1);
-		for (tl=0; tl<CTileSet::count; tl++)
-			Landscape->Landscape.flushTiles (CNELU::Scene->getDriver(), (uint16)tileSet->getTransition(tl)->getTile (), 1);
-	}
-		
-
-	// Build zones.
-	CNELU::clearBuffers(CRGBA(0,0,0));
-	ViewerCfg.TextContext.printfAt(0.5f,0.5f,"Loading zones...");
-	CNELU::swapBuffers();
-	uint32 i;
-	for(i =0; i<ViewerCfg.Zones.size(); i++)
-	{
-		CZone zone;
-		try
-		{
-			CIFile file(CPath::lookup(ViewerCfg.Zones[i]));
-			zone.serial(file);
-			file.close();
-
-			// Add it to landscape.
-			Landscape->Landscape.addZone(zone);
-
-			// Add it to collision manager.
-			CollisionManager.addZone(zone.getZoneId());
-		}
-		catch(Exception &e)
-		{
-			printf(e.what ());
-		}		
-	}
-	
-
-		
-
-	// Load instance group.
-	CNELU::clearBuffers(CRGBA(0,0,0));
-	ViewerCfg.TextContext.printfAt(0.5f,0.5f,"Loading objects...");
-	CNELU::swapBuffers();
-	for(i =0; i<ViewerCfg.Igs.size(); i++)
-	{
-		CInstanceGroup *group = new CInstanceGroup;
-		try
-		{
-			CIFile file(CPath::lookup(ViewerCfg.Igs[i]));
-			group->serial(file);
-			file.close();
-
-			// Add it to the scene.
-			group->addToScene (*CNELU::Scene);
-		}
-		catch(Exception &e)
-		{
-			printf(e.what ());
-		}		
-	}
-	
-	// Init collision Manager.
-	CNELU::clearBuffers(CRGBA(0,0,0));
-	ViewerCfg.TextContext.printfAt(0.5f,0.5f,"Initializing collision manager...");
-	CNELU::swapBuffers();
-	
-	
-	CollisionManager.setCenter(ViewerCfg.Position);
-	ViewerCfg.Position.z = 0.0f;
-	CollisionManager.snapToGround( ViewerCfg.Position, 1000.0f );
-
-	
-
-	// hide mouse cursor
-	CNELU::Driver->showCursor(false);
-#ifdef NL_RELEASE
-	CNELU::Driver->setCapture(true);
-#endif
-
-	
-		
-	// Events management
-	CNELU::EventServer.addEmitter(CNELU::Driver->getEventEmitter());
-	CNELU::AsyncListener.addToServer(CNELU::EventServer);
-	
-	MoveListener.init(CNELU::Scene, ViewerCfg.Width, ViewerCfg.Height, *CNELU::Camera);
-	MoveListener.addToServer(CNELU::EventServer);
-	MoveListener.setPos( ViewerCfg.Position );	
-
-	CNELU::Camera->setPerspective (float(80.0*Pi/180.0), 1.33f, 0.1f, 1000.0f);
-	
-	bool showInfos = true;
-
-
-	// initializing Z-Clip Far
-	float left;
-	float right;
-	float bottom;
-	float top; 
-	float znear;
-	float zfar;
-	CNELU::Camera->getFrustum(left, right, bottom, top, znear, zfar);
-	zfar = ViewerCfg.ZFar;
-	CNELU::Camera->setFrustum(left, right, bottom, top, znear, zfar);
-	
-	
-	do
-	{
-		// Time mgt.
-		//==========
-		static sint64 t0 = (sint64)CTime::getLocalTime();
-		static sint64 t1 = (sint64)CTime::getLocalTime();
-		static sint64 ts = 0;
-
-		t0 = t1;
-		t1 = (sint64)CTime::getLocalTime();
-		sint64 dt64 = t1-t0;
-		ts += dt64;
-		float	dt= ((float)dt64)*0.001f;
-
-	
-		CNELU::EventServer.pump();
-
-		
-		// Manage movement and collision
-		MoveListener.setLocalTime(CTime::getLocalTime());
-		CVector oldpos = MoveListener.getPos();
-		MoveListener.changeViewMatrix();
-		if(MoveListener.getMode()==CMoveListener::WALK)
-		{
-			CVector pos = MoveListener.getPos();
-			CollisionManager.snapToGround( pos , 1000.0f );
-			MoveListener.setPos( pos );
-		}
-		CollisionManager.setCenter(MoveListener.getPos()); 
-
-				
-		// Change move mode
-		if(CNELU::AsyncListener.isKeyPushed(KeySPACE))
-		{
-			MoveListener.swapMode();	
-		}
-		
-		
-		// Change displaying infos state
-		if(CNELU::AsyncListener.isKeyPushed(KeyF1))
-		{
-			showInfos = !showInfos;
-		}
-
-
-		// Change eyes height
-		float eh = MoveListener.getEyesHeight();
-		if(CNELU::AsyncListener.isKeyPushed(KeyADD))
-		{
-			ViewerCfg.EyesHeight.z += 0.1f;
-			eh += 0.1f;
-		}
-		if(CNELU::AsyncListener.isKeyPushed(KeySUBTRACT))
-		{
-			ViewerCfg.EyesHeight.z -= 0.1f;
-			eh -= 0.1f;
-		}
-		if(ViewerCfg.EyesHeight.z<0.1f) ViewerCfg.EyesHeight.z = 0.1f;
-		if(eh<0.1f) eh = 0.1f;
-		MoveListener.setEyesHeight(eh);
-
-
-		// Change TileNear
-		float tileNear = Landscape->Landscape.getTileNear();
-		if(CNELU::AsyncListener.isKeyPushed(KeyHOME))
-			tileNear += tileNearStep;
-		if(CNELU::AsyncListener.isKeyPushed(KeyEND))
-			tileNear -= tileNearStep;
-		if(tileNear<0) tileNear = 0;
-		Landscape->Landscape.setTileNear(tileNear);
-
-
-		// Change Z-Far
-		CNELU::Camera->getFrustum(left, right, bottom, top, znear, zfar);
-		if(CNELU::AsyncListener.isKeyDown(KeyPRIOR))
-			zfar += zFarStep;
-		if(CNELU::AsyncListener.isKeyDown(KeyNEXT))
-			zfar -= zFarStep;
-		if(zfar<0) zfar = 0;
-		CNELU::Camera->setFrustum(left, right, bottom, top, znear, zfar);
-
-
-		// Change Threshold
-		float threshold = Landscape->Landscape.getThreshold();
-		if(CNELU::AsyncListener.isKeyPushed(KeyINSERT))
-			threshold += thresholdStep;
-		if(CNELU::AsyncListener.isKeyPushed(KeyDELETE))
-			threshold -= thresholdStep;
-		if(threshold<0.001f) threshold = 0.001f;
-		if(threshold>0.1f) threshold = 0.1f;
-		Landscape->Landscape.setThreshold(threshold);
-
-
-		// Switch between wired and filled scene display
-		if(CNELU::AsyncListener.isKeyPushed(KeyF3))
-		{
-			if (CNELU::Driver->getPolygonMode ()==IDriver::Filled)
-				CNELU::Driver->setPolygonMode (IDriver::Line);
-			else
-				CNELU::Driver->setPolygonMode (IDriver::Filled);
-		}
-
-		
-		// Switch between mouse move and keyboard-only move
-		if(CNELU::AsyncListener.isKeyPushed(KeyRETURN))
-		{
-			MoveListener.changeControlMode();
-		}
-		
-
-		
-		// Render
-		//=======
-		CNELU::clearBuffers(ViewerCfg.Background);
-		CNELU::Driver->clearZBuffer();
-		CNELU::Scene->render();
-
-				
-		if(showInfos)
-		{
-			
-			// black top quad
-			CDRU::drawQuad(0,0.97f,1.0f,1.0f,*CNELU::Driver,CRGBA(0,0,0),CNELU::Scene->getViewport());
-
-			// black bottom quad
-			CDRU::drawQuad(0,0,1.0f,0.03f,*CNELU::Driver,CRGBA(0,0,0),CNELU::Scene->getViewport());
-
-			
-			ViewerCfg.TextContext.setFontSize(12);
-			ViewerCfg.TextContext.setHotSpot(CComputedString::MiddleTop);
-			ViewerCfg.TextContext.setColor(CRGBA(255,255,255));
-
-			// Display fps.
-			ViewerCfg.TextContext.printfAt(0.05f,0.99f,"%.1f fps",1/dt);
-
-			// Display ms
-			ViewerCfg.TextContext.printfAt(0.12f,0.99f,"%d ms",dt64);
-
-			// Display Tile Near
-			ViewerCfg.TextContext.printfAt(0.75f,0.99f,"Tile Near : %.1f",tileNear);
-
-			//Display moving mode
-			ViewerCfg.TextContext.setColor(CRGBA(255,0,0));
-			switch(MoveListener.getMode())
-			{
-				case CMoveListener::WALK :
-					ViewerCfg.TextContext.printfAt(0.5f,0.99f,"Walk Mode");
-					break;
-				case CMoveListener::FREE :
-					ViewerCfg.TextContext.printfAt(0.5f,0.99f,"Free-Look Mode");
-					break;
-				default:
-					break;
-			}
-			ViewerCfg.TextContext.setColor(CRGBA(255,255,255));
-
-			// Display Threshold
-			ViewerCfg.TextContext.printfAt(0.3f,0.99f,"Threshold : %.3f",threshold);
-
-			// Display Clip Far
-			ViewerCfg.TextContext.printfAt(0.92f,0.99f,"Clip Far : %.1f",zfar);
-
-			
-			ViewerCfg.TextContext.setHotSpot(CComputedString::MiddleBottom);
-			
-			// Display current zone name
-			CVector pos = MoveListener.getPos();
-			string zoneName = getZoneNameByCoord(pos.x, pos.y);
-			ViewerCfg.TextContext.printfAt(0.3f,0.01f,"Zone : %s",zoneName.c_str());
-
-			// Position
-			ViewerCfg.TextContext.printfAt(0.1f,0.01f,"Position : %d %d %d",(sint)pos.x,(sint)pos.y,(sint)pos.z);
-
-			// Eyes height
-			ViewerCfg.TextContext.printfAt(0.7f,0.01f,"Eyes : %.2f m",ViewerCfg.EyesHeight.z);
-
-			// Display speed in km/h
-			ViewerCfg.TextContext.setColor(CRGBA(255,0,0));
-			ViewerCfg.TextContext.printfAt(0.5f,0.01f,"Speed : %d km/h",(sint)(MoveListener.getSpeed()*3.6f));
-			ViewerCfg.TextContext.setColor(CRGBA(255,255,255));
-
-			// Heading
-			sint heading = -(sint)(MoveListener.getRotZ()*180/Pi)%360;
-			if(heading<0) heading += 360;
-			ViewerCfg.TextContext.printfAt(0.9f,0.01f,"Heading : %d degrees",heading);
-
-			// Display the cool compass.
-			displayOrientation();
-		}
-
-		
-		CNELU::swapBuffers();
-		CNELU::screenshot();
-	}
-	while(!CNELU::AsyncListener.isKeyPushed(KeyESCAPE));
-
-
-
-
-
-	ViewerCfg.Position = MoveListener.getPos();
-	
-	CNELU::AsyncListener.removeFromServer(CNELU::EventServer);
-	MoveListener.removeFromServer(CNELU::EventServer);
-
-	CNELU::Driver->showCursor(true);
-#ifdef NL_RELEASE
-	CNELU::Driver->setCapture(false);
-#endif
-}
-
-
-
-
-/****************************************************************\
-							writeConfigFile
-\****************************************************************/
-void writeConfigFile(const char * configFileName)
-{
-	FILE * f = fopen(configFileName,"wt");
-
-	if(f==NULL)
-	{
-		fprintf(stderr,"can't open file '%s'\n",configFileName);
-	}
-
-	fprintf(f,"FullScreen = %d;\n",ViewerCfg.Windowed?0:1);
-	fprintf(f,"Width = %d;\n",ViewerCfg.Width);
-	fprintf(f,"Height = %d;\n",ViewerCfg.Height);
-	fprintf(f,"Depth = %d;\n",ViewerCfg.Depth);
-	fprintf(f,"Position = { %f, %f, %f };\n", ViewerCfg.Position.x,ViewerCfg.Position.y,ViewerCfg.Position.z);
-	fprintf(f,"EyesHeight = %f;\n", ViewerCfg.EyesHeight.z);
-	fprintf(f,"Background = { %d, %d, %d };\n", ViewerCfg.Background.R,ViewerCfg.Background.G,ViewerCfg.Background.B);
-	fprintf(f,"ZFar = %f;\n", ViewerCfg.ZFar);
-
-	fprintf(f,"AutoLight = %d;\n", ViewerCfg.AutoLight?1:0);
-	fprintf(f,"LightDir = { %f, %f, %f };\n", ViewerCfg.LightDir.x, ViewerCfg.LightDir.y, ViewerCfg.LightDir.z);
-	fprintf(f,"LandscapeTileNear = %f;\n", ViewerCfg.LandscapeTileNear);
-	fprintf(f,"LandscapeThreshold = %f;\n", ViewerCfg.LandscapeThreshold);
-	fprintf(f,"LandscapeNoise = %d;\n", (int)ViewerCfg.LandscapeNoise);
-	fprintf(f,"BanksPath = \"%s\";\n",ViewerCfg.BanksPath.c_str());
-	fprintf(f,"TilesPath = \"%s\";\n",ViewerCfg.TilesPath.c_str());
-	fprintf(f,"UseDDS = \"%d\";\n",ViewerCfg.UseDDS?1:0);
-	fprintf(f,"AllPathRelative = \"%d\";\n",ViewerCfg.AllPathRelative?1:0);
-	fprintf(f,"Bank = \"%s\";\n",ViewerCfg.Bank.c_str());
-	fprintf(f,"ZonesPath = \"%s\";\n",ViewerCfg.ZonesPath.c_str());
-	fprintf(f,"IgPath = \"%s\";\n",ViewerCfg.IgPath.c_str());
-	fprintf(f,"ShapePath = \"%s\";\n",ViewerCfg.ShapePath.c_str());
-	fprintf(f,"MapsPath = \"%s\";\n",ViewerCfg.MapsPath.c_str());
-	fprintf(f,"FontPath = \"%s\";\n",ViewerCfg.FontPath.c_str());
-
-	fprintf(f,"HeightFieldName = \"%s\";\n", ViewerCfg.HeightFieldName.c_str());
-	fprintf(f,"HeightFieldMaxZ = %f;\n", ViewerCfg.HeightFieldMaxZ);
-	fprintf(f,"HeightFieldOriginX = %f;\n", ViewerCfg.HeightFieldOriginX);
-	fprintf(f,"HeightFieldOriginY = %f;\n", ViewerCfg.HeightFieldOriginY);
-	fprintf(f,"HeightFieldSizeX = %f;\n", ViewerCfg.HeightFieldSizeX);
-	fprintf(f,"HeightFieldSizeY = %f;\n", ViewerCfg.HeightFieldSizeY);
-
-	fprintf(f,"LandAmbient = { %d, %d, %d };\n", ViewerCfg.LandAmbient.R,ViewerCfg.LandAmbient.G,ViewerCfg.LandAmbient.B);
-	fprintf(f,"LandDiffuse = { %d, %d, %d };\n", ViewerCfg.LandDiffuse.R,ViewerCfg.LandDiffuse.G,ViewerCfg.LandDiffuse.B);
-
-	fprintf(f,"Zones = {\n");
-	fprintf(f,"};\n");
-
-	fprintf(f,"Ig = {\n");
-	fprintf(f,"};\n");
-
-	fclose(f);
-}
-
-
-
-/****************************************************************\
-						init()
-\****************************************************************/
-void initViewerConfig(const char * configFileName)
-{
-	FILE * f = fopen(configFileName,"rt");
-	if(f==NULL)
-	{
-		nlwarning("'%s' not found, default values used", configFileName);
-		writeConfigFile(configFileName);
-	}
-	else fclose (f);
-	
-	try
-	{
-		CConfigFile cf;
-	
-		cf.load(configFileName);
-	
-		CConfigFile::CVar &cvFullScreen = cf.getVar("FullScreen");
-		ViewerCfg.Windowed = cvFullScreen.asInt() ? false : true;
-		
-		CConfigFile::CVar &cvWidth = cf.getVar("Width");
-		ViewerCfg.Width = cvWidth.asInt();
-
-		CConfigFile::CVar &cvHeight = cf.getVar("Height");
-		ViewerCfg.Height = cvHeight.asInt();
-
-		CConfigFile::CVar &cvDepth = cf.getVar("Depth");
-		ViewerCfg.Depth = cvDepth.asInt();
-
-		CConfigFile::CVar &cvPosition = cf.getVar("Position");
-		nlassert(cvPosition.size()==3);
-		ViewerCfg.Position.x = cvPosition.asFloat(0);
-		ViewerCfg.Position.y = cvPosition.asFloat(1);
-		ViewerCfg.Position.z = cvPosition.asFloat(2);
-
-		CConfigFile::CVar &cvEyesHeight = cf.getVar("EyesHeight");
-		ViewerCfg.EyesHeight = CVector(0,0,cvEyesHeight.asFloat());
-
-		CConfigFile::CVar &cvBackColor = cf.getVar("Background");
-		nlassert(cvBackColor.size()==3);
-		ViewerCfg.Background.R = cvBackColor.asInt(0);
-		ViewerCfg.Background.G = cvBackColor.asInt(1);
-		ViewerCfg.Background.B = cvBackColor.asInt(2);
-
-		CConfigFile::CVar &cvZFar = cf.getVar("ZFar");
-		ViewerCfg.ZFar = cvZFar.asFloat();
-
-		CConfigFile::CVar &cvAutoLight = cf.getVar("AutoLight");
-		ViewerCfg.AutoLight = cvAutoLight.asInt() ? true : false;
-
-		CConfigFile::CVar &cvLightDir = cf.getVar("LightDir");
-		nlassert(cvLightDir.size()==3);
-		ViewerCfg.LightDir.x = cvLightDir.asFloat(0);
-		ViewerCfg.LightDir.y = cvLightDir.asFloat(1);
-		ViewerCfg.LightDir.z = cvLightDir.asFloat(2);
-
-		CConfigFile::CVar &cvLandscapeTileNear = cf.getVar("LandscapeTileNear");
-		ViewerCfg.LandscapeTileNear = cvLandscapeTileNear.asFloat();
-
-		CConfigFile::CVar &cvLandscapeThreshold = cf.getVar("LandscapeThreshold");
-		ViewerCfg.LandscapeThreshold = cvLandscapeThreshold.asFloat();
-
-		CConfigFile::CVar &cvLandscapeNoise = cf.getVar("LandscapeNoise");
-		ViewerCfg.LandscapeNoise = cvLandscapeNoise.asInt() != 0;
-
-		CConfigFile::CVar &cvBanksPath = cf.getVar("BanksPath");
-		ViewerCfg.BanksPath = cvBanksPath.asString();
-
-		CConfigFile::CVar &cvTilesPath = cf.getVar("TilesPath");
-		ViewerCfg.TilesPath = cvTilesPath.asString();
-
-		CConfigFile::CVar &cvUseDDS = cf.getVar("UseDDS");
-		ViewerCfg.UseDDS = cvUseDDS.asInt() ? true : false;
-
-		CConfigFile::CVar &cvAllPathRelative = cf.getVar("AllPathRelative");
-		ViewerCfg.AllPathRelative = cvAllPathRelative.asInt() ? true : false;
-
-		CConfigFile::CVar &cvBank = cf.getVar("Bank");
-		ViewerCfg.Bank = cvBank.asString();
-		
-		CConfigFile::CVar &cvZonesPath = cf.getVar("ZonesPath");
-		ViewerCfg.ZonesPath = cvZonesPath.asString();
-		CPath::addSearchPath(cvZonesPath.asString());
-
-		CConfigFile::CVar &cvIgPath = cf.getVar("IgPath");
-		ViewerCfg.IgPath = cvIgPath.asString();
-		CPath::addSearchPath(cvIgPath.asString());
-
-		CConfigFile::CVar &cvShapePath = cf.getVar("ShapePath");
-		ViewerCfg.ShapePath = cvShapePath.asString();
-		CPath::addSearchPath(cvShapePath.asString());
-
-		CConfigFile::CVar &cvMapsPath = cf.getVar("MapsPath");
-		ViewerCfg.MapsPath = cvMapsPath.asString();
-		CPath::addSearchPath(cvMapsPath.asString());
-
-		CConfigFile::CVar &cvFontPath = cf.getVar("FontPath");
-		ViewerCfg.FontPath = cvFontPath.asString();
-
-		CConfigFile::CVar &cvHeightFieldName = cf.getVar("HeightFieldName");
-		ViewerCfg.HeightFieldName = cvHeightFieldName.asString();
-		
-		CConfigFile::CVar &cvHeightFieldMaxZ = cf.getVar("HeightFieldMaxZ");
-		ViewerCfg.HeightFieldMaxZ = cvHeightFieldMaxZ.asFloat();
-
-		CConfigFile::CVar &cvHeightFieldOriginX = cf.getVar("HeightFieldOriginX");
-		ViewerCfg.HeightFieldOriginX = cvHeightFieldOriginX.asFloat();
-
-		CConfigFile::CVar &cvHeightFieldOriginY = cf.getVar("HeightFieldOriginY");
-		ViewerCfg.HeightFieldOriginY = cvHeightFieldOriginY.asFloat();
-
-		CConfigFile::CVar &cvHeightFieldSizeX = cf.getVar("HeightFieldSizeX");
-		ViewerCfg.HeightFieldSizeX = cvHeightFieldSizeX.asFloat();
-
-		CConfigFile::CVar &cvHeightFieldSizeY = cf.getVar("HeightFieldSizeY");
-		ViewerCfg.HeightFieldSizeY = cvHeightFieldSizeY.asFloat();
-
-
-		CConfigFile::CVar &cvLandAmb = cf.getVar("LandAmbient");
-		nlassert(cvLandAmb.size()==3);
-		ViewerCfg.LandAmbient.R = cvLandAmb.asInt(0);
-		ViewerCfg.LandAmbient.G = cvLandAmb.asInt(1);
-		ViewerCfg.LandAmbient.B = cvLandAmb.asInt(2);
-
-		CConfigFile::CVar &cvLandDiff = cf.getVar("LandDiffuse");
-		nlassert(cvLandDiff.size()==3);
-		ViewerCfg.LandDiffuse.R = cvLandDiff.asInt(0);
-		ViewerCfg.LandDiffuse.G = cvLandDiff.asInt(1);
-		ViewerCfg.LandDiffuse.B = cvLandDiff.asInt(2);
-
-
-		CConfigFile::CVar &cvZones = cf.getVar("Zones");
-		for(uint i=0; i<cvZones.size(); i++)
-		{
-			ViewerCfg.Zones.push_back(cvZones.asString(i));
-		}
-
-		CConfigFile::CVar &cvIgs = cf.getVar("Ig");
-		for(uint i=0; i<cvIgs.size(); i++)
-		{
-			ViewerCfg.Igs.push_back(cvIgs.asString(i));
-		}
-
-	}
-	catch (EConfigFile &e)
-	{
-		printf ("Problem in config file : %s\n", e.what ());
-	}
-
-}
-
-/****************************************************************\
-							MAIN
-\****************************************************************/
-void main()
-{
-	try
-	{
-		// Init NELU
-		NL3D::CNELU::init(ViewerCfg.Width, ViewerCfg.Height, CViewport(), ViewerCfg.Depth, ViewerCfg.Windowed, NULL, false, false);
-		NL3D::CNELU::Camera->setTransformMode(ITransformable::DirectMatrix);
-
-		// Init the font manager
-
-		initViewerConfig("zviewer.cfg");
-
-		ViewerCfg.TextContext.init (CNELU::Driver, &ViewerCfg.FontManager);
-		ViewerCfg.TextContext.setFontGenerator(ViewerCfg.FontPath);
-		ViewerCfg.TextContext.setFontSize(12);
-		ViewerCfg.FontManager.setMaxMemory(2000000);
-
-		displayZones();
-			
-		// release nelu
-		NL3D::CNELU::release();
-		
-	}
-	catch (Exception &e)
-	{
-		fprintf (stderr,"main trapped an exception: '%s'", e.what ());
-	}
-}

code/tool/zviewer/zviewer.rc

@@ -1,72 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <windows.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON                    "nevraxpill.ico"
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-