fix/update the urt q2map2 project

radiant.sln

@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "radiant", "radiant\radiant.vcproj", "{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B957BA35-F807-4C84-85A2-C1F9AC56713B} = {B957BA35-F807-4C84-85A2-C1F9AC56713B}
@@ -186,6 +186,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfsqlpk3", "plugins\vfsqlpk
 		{E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\urt\tools\quake3\q3map2\q3map2.urt.vcproj", "{7AF7537E-94C3-4680-8F5E-C1CE30DC2041}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -348,6 +350,10 @@ Global
 		{9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}.Debug|Win32.Build.0 = Debug|Win32
 		{9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}.Release|Win32.ActiveCfg = Release|Win32
 		{9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}.Release|Win32.Build.0 = Release|Win32
+		{7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Debug|Win32.Build.0 = Debug|Win32
+		{7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Release|Win32.ActiveCfg = Release|Win32
+		{7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

tools/urt/tools/quake3/q3map2/q3map2.urt.vcproj

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
-	Name="q3map2"
+	Name="q3map2.urt"
 	ProjectGUID="{7AF7537E-94C3-4680-8F5E-C1CE30DC2041}"
 	RootNamespace="q3map2"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -45,7 +46,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="H:\iourbanterror\q3map2\zlib\include\;..\..\..\include;..\common;..\..\..\libs;..\..\..\..\libxml2\include;..\q3map2;..\..\..\..\libpng;..\..\..\..\zlib;&quot;..\..\..\..\gtk2-win32\include\glib-2.0&quot;;&quot;..\..\..\..\gtk2-win32\lib\glib-2.0\include&quot;;&quot;c:\program files\subversion\mhash\lib&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\tools\quake3\common&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\libpng14&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\jpeg-8c\include&quot;"
 				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -72,16 +73,18 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib wsock32.lib jpeg6.lib l_net.lib mathlib.lib md5lib.lib picomodel.lib ddslib.lib zdll.lib libpng13.lib libxml2.lib libmhash.lib"
+				AdditionalDependencies="Ws2_32.lib glib-2.0.lib libpng.lib libxml2.lib libjpeg.lib md5lib.lib mathlib.lib picomodel.lib l_net.lib ddslib.lib quake3-common.lib"
-				OutputFile=".\Release/FS_q3map_Radbump_3.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\..\libpng\lib\;..\..\..\..\mhash\win32\libmhash\Release;..\..\..\..\zlib\lib\;..\..\..\libs\picomodel\Release;..\..\..\..\libxml2\win32\lib\;..\..\..\libs\ddslib\release;..\..\..\libs\md5lib\release;..\..\..\libs\mathlib\release;..\..\..\libs\pak\release;..\..\..\libs\jpeg6\release;..\..\..\libs\l_net\release;..\..\..\..\libxml2\win32\libxml2\release_so;&quot;..\..\..\..\gtk2-win32\lib\&quot;;..\common\glib\"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\..\jpeg-8c\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
 				ProgramDatabaseFile=".\Release/q3map2.pdb"
 				GenerateMapFile="true"
 				MapFileName=".\Release/q3map2.map"
 				SubSystem="1"
 				StackReserveSize="4194304"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -104,13 +107,10 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Python post build"
+				Description=""
-				CommandLine="cd ..\..\.. &amp;&amp; run_python.bat win32_install.py release Q3Map2"
+				CommandLine=""
 			/>
 		</Configuration>
 		<Configuration
@@ -143,7 +143,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\include;..\common;..\..\..\libs;..\..\..\..\libxml2\include;..\..\..\..\libpng;H:\iourbanterror\q3map2\zlib\include;&quot;..\..\..\..\gtk2-win32\include\glib-2.0&quot;;&quot;..\..\..\..\gtk2-win32\lib\glib-2.0\include&quot;;&quot;c:\program files\subversion\mhash\lib&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\include&quot;;&quot;$(SolutionDir)\tools\quake3\common&quot;;&quot;$(SolutionDir)\libs&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\glib-2.0&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\lib\glib-2.0\include&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\include\libxml2&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include\libpng14&quot;;&quot;$(SolutionDir)\..\gtk-2.16.6\include&quot;;&quot;$(SolutionDir)\..\jpeg-8c\include&quot;"
 				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE"
 				MinimalRebuild="true"
 				RuntimeLibrary="3"
@@ -169,11 +169,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib wsock32.lib jpeg6.lib l_net.lib mathlib.lib md5lib.lib zdll.lib libpng13.lib ddslib.lib libxml2.lib libmhash.lib picomodel.lib"
+				AdditionalDependencies="Ws2_32.lib glib-2.0.lib libpng.lib libxml2.lib libjpegd.lib md5lib.lib mathlib.lib picomodel.lib l_net.lib ddslib.lib quake3-common.lib"
-				OutputFile="Debug/FS_q3map_Radbump_3.exe"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="H:\iourbanterror\q3map2\GtkRadiant\libs\picomodel\Release;H:\iourbanterror\q3map2\mhash\win32\libmhash\Release\;H:\iourbanterror\q3map2\libxml2\win32\lib;H:\iourbanterror\q3map2\libpng\lib;..\..\..\libs\ddslib\Debug;..\..\..\libs\md5lib\Debug;..\..\..\libs\mathlib\Debug;..\..\..\libs\pak\Debug;..\..\..\libs\jpeg6\Debug;..\..\..\libs\l_net\Debug;..\..\..\..\libxml2\win32\libxml2\debug_so;..\..\..\..\lpng\projects\msvc\win32\libpng___Win32_Debug;..\..\..\libs\jpeg6\release;..\..\..\libs\l_net\release;..\..\..\..\libxml2\win32\libxml2\release_so;..\..\..\..\libpng\projects\msvc\libpng___Win32_Debug;..\..\..\..\libpng\projects\msvc\zlib___Win32_Debug;&quot;..\..\..\..\gtk2-win32\lib\&quot;;&quot;c:\program files\subversion\mhash\lib&quot;;..\common\glib\;H:\iourbanterror\q3map2\zlib\lib;&quot;c:\program files\subversion\libpng\lib&quot;;&quot;C:\Program Files\Subversion\libxml2\win32\lib&quot;;&quot;C:\Program Files\Subversion\mhash\win32\libmhash\Debug&quot;;&quot;C:\Program Files\Subversion\GtkRadiant\libs\picomodel\Debug&quot;"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\gtk-2.16.6\lib&quot;;&quot;$(SolutionDir)\..\libxml2-2.7.3\lib&quot;;&quot;$(SolutionDir)\..\jpeg-8c\lib&quot;;&quot;$(SolutionDir)\build\$(ConfigurationName)\libs&quot;"
 				IgnoreDefaultLibraryNames="libcd,libcmtd"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/FS_q3map2_1.pdb"
@@ -181,6 +181,8 @@
 				MapFileName=".\Debug/FS_q3map2_1.map"
 				SubSystem="1"
 				StackReserveSize="33554432"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -203,13 +205,10 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				Description="Python post build"
+				Description=""
-				CommandLine="cd ..\..\.. &amp;&amp; run_python.bat win32_install.py Q3Map2"
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
@@ -440,209 +439,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<Filter
-				Name="common"
-				Filter=".c"
-				>
-				<File
-					RelativePath="..\common\cmdlib.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\common\imagelib.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\common\inout.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\common\mutex.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\common\polylib.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\common\scriplib.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\common\threads.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\common\unzip.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath="..\common\vfs.c"
-					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories=""
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							AdditionalIncludeDirectories="..\..\..\..\src\glib"
-							PreprocessorDefinitions=""
-						/>
-					</FileConfiguration>
-				</File>
-			</Filter>
 			<Filter
 				Name="bsp"
 				Filter=".c"