msvc project files updated and moved to win32/msvc

temporary build dirs moved to win32/msvc/build
2005-12-12 17:38:03 +00:00 · 2005-12-12 17:38:03 +00:00 · 252ede0472
parent 52205d8d3c
commit 252ede0472
13 changed files with 1729 additions and 1915 deletions
--- a/code/win32/msvc/botlib.vcproj
+++ b/code/win32/msvc/botlib.vcproj
@ -3,8 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="botlib"
-	SccProjectName="&quot;$/MissionPack/code/botlib&quot;, HBAAAAAA"
-	SccLocalPath=".">
+	ProjectGUID="{A410161F-AE9F-485D-A01F-5294891430A6}">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@ -12,8 +11,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug TA|Win32"
-			OutputDirectory=".\Debug_TA"
-			IntermediateDirectory=".\Debug_TA"
+			OutputDirectory=".\build\botlib_debug_ta"
+			IntermediateDirectory=".\build\botlib_debug_ta"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -26,10 +25,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug_TA/botlib.pch"
-				AssemblerListingLocation=".\Debug_TA/"
-				ObjectFile=".\Debug_TA/"
-				ProgramDataBaseFileName=".\Debug_TA/"
+				PrecompiledHeaderFile="$(IntDir)\botlib.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@ -38,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile=".\Debug_TA\botlib.lib"
+				OutputFile="$(OutDir)\botlib.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
@ -63,8 +62,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\build\botlib_release"
+			IntermediateDirectory=".\build\botlib_release"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -79,17 +78,17 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/botlib.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile="$(IntDir)\botlib.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile=".\Release\botlib.lib"
+				OutputFile="$(OutDir)\botlib.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
@ -114,8 +113,8 @@
 		</Configuration>
 		<Configuration
 			Name="vector|Win32"
-			OutputDirectory=".\botlib___Win32_vector0"
-			IntermediateDirectory=".\botlib___Win32_vector0"
+			OutputDirectory=".\build\botlib_vector0"
+			IntermediateDirectory=".\build\botlib_vector0"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -131,17 +130,17 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\botlib___Win32_vector0/botlib.pch"
-				AssemblerListingLocation=".\botlib___Win32_vector0/"
-				ObjectFile=".\botlib___Win32_vector0/"
-				ProgramDataBaseFileName=".\botlib___Win32_vector0/"
+				PrecompiledHeaderFile="$(IntDir)\botlib.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile=".\botlib___Win32_vector0\botlib.lib"
+				OutputFile="$(OutDir)\botlib.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
@ -166,8 +165,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory=".\build\botlib_debug"
+			IntermediateDirectory=".\build\botlib_debug"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -176,14 +175,15 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				OptimizeForProcessor="1"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;BOTLIB;DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/botlib.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile="$(IntDir)\botlib.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@ -192,7 +192,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile=".\Debug\botlib.lib"
+				OutputFile="$(OutDir)\botlib.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
@ -217,8 +217,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release TA|Win32"
-			OutputDirectory=".\Release_TA"
-			IntermediateDirectory=".\Release_TA"
+			OutputDirectory=".\build\botlib_release_ta"
+			IntermediateDirectory=".\build\botlib_release_ta"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -233,17 +233,17 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release_TA/botlib.pch"
-				AssemblerListingLocation=".\Release_TA/"
-				ObjectFile=".\Release_TA/"
-				ProgramDataBaseFileName=".\Release_TA/"
+				PrecompiledHeaderFile="$(IntDir)\botlib.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile=".\Release_TA\botlib.lib"
+				OutputFile="$(OutDir)\botlib.lib"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCMIDLTool"/>
@ -274,7 +274,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath="be_aas_bspq3.c">
+				RelativePath="..\..\botlib\be_aas_bspq3.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -316,7 +316,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_cluster.c">
+				RelativePath="..\..\botlib\be_aas_cluster.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -358,7 +358,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_debug.c">
+				RelativePath="..\..\botlib\be_aas_debug.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -400,7 +400,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_entity.c">
+				RelativePath="..\..\botlib\be_aas_entity.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -442,7 +442,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_file.c">
+				RelativePath="..\..\botlib\be_aas_file.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -484,7 +484,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_main.c">
+				RelativePath="..\..\botlib\be_aas_main.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -526,7 +526,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_move.c">
+				RelativePath="..\..\botlib\be_aas_move.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -568,7 +568,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_optimize.c">
+				RelativePath="..\..\botlib\be_aas_optimize.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -610,7 +610,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_reach.c">
+				RelativePath="..\..\botlib\be_aas_reach.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -652,7 +652,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_route.c">
+				RelativePath="..\..\botlib\be_aas_route.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -694,7 +694,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_routealt.c">
+				RelativePath="..\..\botlib\be_aas_routealt.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -736,7 +736,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_aas_sample.c">
+				RelativePath="..\..\botlib\be_aas_sample.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -778,7 +778,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_ai_char.c">
+				RelativePath="..\..\botlib\be_ai_char.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -820,7 +820,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_ai_chat.c">
+				RelativePath="..\..\botlib\be_ai_chat.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -862,7 +862,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_ai_gen.c">
+				RelativePath="..\..\botlib\be_ai_gen.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -904,7 +904,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_ai_goal.c">
+				RelativePath="..\..\botlib\be_ai_goal.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -946,7 +946,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_ai_move.c">
+				RelativePath="..\..\botlib\be_ai_move.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -988,7 +988,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_ai_weap.c">
+				RelativePath="..\..\botlib\be_ai_weap.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1030,7 +1030,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_ai_weight.c">
+				RelativePath="..\..\botlib\be_ai_weight.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1072,7 +1072,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_ea.c">
+				RelativePath="..\..\botlib\be_ea.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1114,7 +1114,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="be_interface.c">
+				RelativePath="..\..\botlib\be_interface.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1156,7 +1156,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="l_crc.c">
+				RelativePath="..\..\botlib\l_crc.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1198,7 +1198,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="l_libvar.c">
+				RelativePath="..\..\botlib\l_libvar.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1240,7 +1240,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="l_log.c">
+				RelativePath="..\..\botlib\l_log.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1282,7 +1282,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="l_memory.c">
+				RelativePath="..\..\botlib\l_memory.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1324,7 +1324,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="l_precomp.c">
+				RelativePath="..\..\botlib\l_precomp.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1366,7 +1366,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="l_script.c">
+				RelativePath="..\..\botlib\l_script.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1408,7 +1408,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="l_struct.c">
+				RelativePath="..\..\botlib\l_struct.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1454,103 +1454,103 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath="aasfile.h">
+				RelativePath="..\..\botlib\aasfile.h">
 			</File>
 			<File
-				RelativePath="be_aas_bsp.h">
+				RelativePath="..\..\botlib\be_aas_bsp.h">
 			</File>
 			<File
-				RelativePath="be_aas_cluster.h">
+				RelativePath="..\..\botlib\be_aas_cluster.h">
 			</File>
 			<File
-				RelativePath="be_aas_debug.h">
+				RelativePath="..\..\botlib\be_aas_debug.h">
 			</File>
 			<File
-				RelativePath="be_aas_def.h">
+				RelativePath="..\..\botlib\be_aas_def.h">
 			</File>
 			<File
-				RelativePath="be_aas_entity.h">
+				RelativePath="..\..\botlib\be_aas_entity.h">
 			</File>
 			<File
-				RelativePath="be_aas_file.h">
+				RelativePath="..\..\botlib\be_aas_file.h">
 			</File>
 			<File
-				RelativePath="be_aas_funcs.h">
+				RelativePath="..\..\botlib\be_aas_funcs.h">
 			</File>
 			<File
-				RelativePath="be_aas_main.h">
+				RelativePath="..\..\botlib\be_aas_main.h">
 			</File>
 			<File
-				RelativePath="be_aas_move.h">
+				RelativePath="..\..\botlib\be_aas_move.h">
 			</File>
 			<File
-				RelativePath="be_aas_optimize.h">
+				RelativePath="..\..\botlib\be_aas_optimize.h">
 			</File>
 			<File
-				RelativePath="be_aas_reach.h">
+				RelativePath="..\..\botlib\be_aas_reach.h">
 			</File>
 			<File
-				RelativePath="be_aas_route.h">
+				RelativePath="..\..\botlib\be_aas_route.h">
 			</File>
 			<File
-				RelativePath="be_aas_routealt.h">
+				RelativePath="..\..\botlib\be_aas_routealt.h">
 			</File>
 			<File
-				RelativePath="be_aas_sample.h">
+				RelativePath="..\..\botlib\be_aas_sample.h">
 			</File>
 			<File
-				RelativePath="be_ai_weight.h">
+				RelativePath="..\..\botlib\be_ai_weight.h">
 			</File>
 			<File
-				RelativePath="be_interface.h">
+				RelativePath="..\..\botlib\be_interface.h">
 			</File>
 			<File
-				RelativePath="..\game\bg_public.h">
+				RelativePath="..\..\game\bg_public.h">
 			</File>
 			<File
-				RelativePath="..\qcommon\cm_public.h">
+				RelativePath="..\..\qcommon\cm_public.h">
 			</File>
 			<File
-				RelativePath="..\game\g_public.h">
+				RelativePath="..\\..\game\g_public.h">
 			</File>
 			<File
-				RelativePath="l_crc.h">
+				RelativePath="..\..\botlib\l_crc.h">
 			</File>
 			<File
-				RelativePath="l_libvar.h">
+				RelativePath="..\..\botlib\l_libvar.h">
 			</File>
 			<File
-				RelativePath="l_log.h">
+				RelativePath="..\..\botlib\l_log.h">
 			</File>
 			<File
-				RelativePath="l_memory.h">
+				RelativePath="..\..\botlib\l_memory.h">
 			</File>
 			<File
-				RelativePath="l_precomp.h">
+				RelativePath="..\..\botlib\l_precomp.h">
 			</File>
 			<File
-				RelativePath="l_script.h">
+				RelativePath="..\..\botlib\l_script.h">
 			</File>
 			<File
-				RelativePath="l_struct.h">
+				RelativePath="..\..\botlib\l_struct.h">
 			</File>
 			<File
-				RelativePath="l_utils.h">
+				RelativePath="..\..\botlib\l_utils.h">
 			</File>
 			<File
-				RelativePath="..\qcommon\q_shared.h">
+				RelativePath="..\..\qcommon\q_shared.h">
 			</File>
 			<File
-				RelativePath="..\qcommon\qcommon.h">
+				RelativePath="..\..\qcommon\qcommon.h">
 			</File>
 			<File
-				RelativePath="..\qcommon\qfiles.h">
+				RelativePath="..\..\qcommon\qfiles.h">
 			</File>
 			<File
-				RelativePath="..\server\server.h">
+				RelativePath="..\\..\server\server.h">
 			</File>
 			<File
-				RelativePath="..\qcommon\surfaceflags.h">
+				RelativePath="..\..\qcommon\surfaceflags.h">
 			</File>
 		</Filter>
 	</Files>
--- a/code/win32/msvc/cgame.def
+++ b/code/win32/msvc/cgame.def
--- a/code/win32/msvc/cgame.vcproj
+++ b/code/win32/msvc/cgame.vcproj
@ -3,8 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="cgame"
-	SccProjectName="&quot;$/MissionPack/code/cgame&quot;, NPAAAAAA"
-	SccLocalPath=".">
+	ProjectGUID="{C878E295-CB82-4B40-8ECF-5CE5525466FA}">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@ -12,8 +11,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release TA|Win32"
-			OutputDirectory=".\Release_TA"
-			IntermediateDirectory=".\Release_TA"
+			OutputDirectory=".\build\cgame_release_ta"
+			IntermediateDirectory=".\build\cgame_release_ta"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -27,10 +26,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release_TA/cgame.pch"
-				AssemblerListingLocation=".\Release_TA/"
-				ObjectFile=".\Release_TA/"
-				ProgramDataBaseFileName=".\Release_TA/"
+				PrecompiledHeaderFile="$(IntDir)\cgame.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -38,16 +37,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Release_TA/cgamex86.dll"
+				OutputFile="$(OutDir)\cgamex86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\cgame.def"
-				ProgramDatabaseFile=".\Release_TA/cgamex86.pdb"
+				ProgramDatabaseFile="$(IntDir)\cgamex86.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Release_TA/cgamex86.map"
+				MapFileName="$(IntDir)\cgamex86.map"
 				SubSystem="2"
 				BaseAddress="0x30000000"
-				ImportLibrary=".\Release_TA/cgamex86.lib"
+				ImportLibrary="$(IntDir)\/cgamex86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -55,7 +54,7 @@
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Release_TA/cgame.tlb"
+				TypeLibraryName=".\$(IntDir)\cgame.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@ -80,8 +79,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory=".\build\cgame_debug"
+			IntermediateDirectory=".\build\cgame_debug"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -92,10 +91,10 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/cgame.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile="$(IntDir)\cgame.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@ -105,17 +104,17 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Debug/cgamex86.dll"
+				OutputFile="$(OutDir)\cgamex86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\cgame.def"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/cgamex86.pdb"
+				ProgramDatabaseFile="$(IntDir)\cgamex86.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Debug/cgamex86.map"
+				MapFileName="$(IntDir)\cgamex86.map"
 				SubSystem="2"
 				BaseAddress="0x30000000"
-				ImportLibrary=".\Debug/cgamex86.lib"
+				ImportLibrary="$(IntDir)\cgamex86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -148,8 +147,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\build\cgame_release"
+			IntermediateDirectory=".\build\cgame_release"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -163,10 +162,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/cgame.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile="$(IntDir)\cgame.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -174,16 +173,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Release/cgamex86.dll"
+				OutputFile="$(OutDir)\cgamex86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\cgame.def"
-				ProgramDatabaseFile=".\Release/cgamex86.pdb"
+				ProgramDatabaseFile="$(IntDir)\cgamex86.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Release/cgamex86.map"
+				MapFileName="$(IntDir)\cgamex86.map"
 				SubSystem="2"
 				BaseAddress="0x30000000"
-				ImportLibrary=".\Release/cgamex86.lib"
+				ImportLibrary="$(IntDir)\cgamex86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -216,8 +215,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug TA|Win32"
-			OutputDirectory=".\Debug_TA"
-			IntermediateDirectory=".\Debug_TA"
+			OutputDirectory=".\build\cgame_debug_ta"
+			IntermediateDirectory=".\build\cgame_debug_ta"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -228,10 +227,10 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;MISSIONPACK"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug_TA/cgame.pch"
-				AssemblerListingLocation=".\Debug_TA/"
-				ObjectFile=".\Debug_TA/"
-				ProgramDataBaseFileName=".\Debug_TA/"
+				PrecompiledHeaderFile="$(IntDir)\cgame.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@ -241,17 +240,17 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="..\Debug_TA\cgamex86.dll"
+				OutputFile="$(OutDir)\cgamex86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\cgame.def"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug_TA/cgamex86.pdb"
+				ProgramDatabaseFile="$(IntDir)\cgamex86.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Debug_TA/cgamex86.map"
+				MapFileName="$(IntDir)\cgamex86.map"
 				SubSystem="2"
 				BaseAddress="0x30000000"
-				ImportLibrary=".\Debug_TA/cgamex86.lib"
+				ImportLibrary="$(IntDir)\cgamex86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -290,7 +289,7 @@
 			Name="Source Files"
 			Filter="c">
 			<File
-				RelativePath="..\game\bg_lib.c">
+				RelativePath="..\..\game\bg_lib.c">
 				<FileConfiguration
 					Name="Release TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -327,7 +326,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\game\bg_misc.c">
+				RelativePath="..\..\game\bg_misc.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -360,7 +359,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\game\bg_pmove.c">
+				RelativePath="..\..\game\bg_pmove.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -393,7 +392,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\game\bg_slidemove.c">
+				RelativePath="..\..\game\bg_slidemove.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -426,7 +425,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_consolecmds.c">
+				RelativePath="..\..\cgame\cg_consolecmds.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -459,7 +458,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_draw.c">
+				RelativePath="..\..\cgame\cg_draw.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -492,7 +491,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_drawtools.c">
+				RelativePath="..\..\cgame\cg_drawtools.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -525,7 +524,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_effects.c">
+				RelativePath="..\..\cgame\cg_effects.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -558,7 +557,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_ents.c">
+				RelativePath="..\..\cgame\cg_ents.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -591,7 +590,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_event.c">
+				RelativePath="..\..\cgame\cg_event.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -624,7 +623,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_info.c">
+				RelativePath="..\..\cgame\cg_info.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -657,7 +656,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_localents.c">
+				RelativePath="..\..\cgame\cg_localents.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -690,7 +689,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_main.c">
+				RelativePath="..\..\cgame\cg_main.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -723,7 +722,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_marks.c">
+				RelativePath="..\..\cgame\cg_marks.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -756,7 +755,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_newDraw.c">
+				RelativePath="..\..\cgame\cg_newDraw.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -791,7 +790,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_players.c">
+				RelativePath="..\..\cgame\cg_players.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -824,7 +823,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_playerstate.c">
+				RelativePath="..\..\cgame\cg_playerstate.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -857,7 +856,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_predict.c">
+				RelativePath="..\..\cgame\cg_predict.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -890,7 +889,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_scoreboard.c">
+				RelativePath="..\..\cgame\cg_scoreboard.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -923,7 +922,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_servercmds.c">
+				RelativePath="..\..\cgame\cg_servercmds.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -956,7 +955,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_snapshot.c">
+				RelativePath="..\..\cgame\cg_snapshot.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -989,7 +988,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_syscalls.c">
+				RelativePath="..\..\cgame\cg_syscalls.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1022,7 +1021,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_view.c">
+				RelativePath="..\..\cgame\cg_view.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1055,7 +1054,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="cg_weapons.c">
+				RelativePath="..\..\cgame\cg_weapons.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1088,13 +1087,13 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\qcommon\q_math.c">
+				RelativePath="..\..\qcommon\q_math.c">
 			</File>
 			<File
-				RelativePath="..\qcommon\q_shared.c">
+				RelativePath="..\..\qcommon\q_shared.c">
 			</File>
 			<File
-				RelativePath="..\ui\ui_shared.c">
+				RelativePath="..\..\ui\ui_shared.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1131,23 +1130,23 @@
 			Name="Header Files"
 			Filter="h">
 			<File
-				RelativePath="..\game\bg_public.h">
+				RelativePath="..\..\game\bg_public.h">
 			</File>
 			<File
-				RelativePath="cg_local.h">
+				RelativePath="..\..\cgame\cg_local.h">
 			</File>
 			<File
-				RelativePath="cg_public.h">
+				RelativePath="..\..\cgame\cg_public.h">
 			</File>
 			<File
-				RelativePath="..\qcommon\q_shared.h">
+				RelativePath="..\..\qcommon\q_shared.h">
 			</File>
 			<File
-				RelativePath="..\qcommon\surfaceflags.h">
+				RelativePath="..\..\qcommon\surfaceflags.h">
 			</File>
 		</Filter>
 		<File
-			RelativePath="cgame.def">
+			RelativePath="..\..\cgame\cgame.def">
 			<FileConfiguration
 				Name="Debug TA|Win32"
 				ExcludedFromBuild="TRUE">
--- a/code/win32/msvc/game.def
+++ b/code/win32/msvc/game.def
--- a/code/win32/msvc/game.vcproj
+++ b/code/win32/msvc/game.vcproj
@ -3,8 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="game"
-	SccProjectName="&quot;$/MissionPack/code/game&quot;, CYAAAAAA"
-	SccLocalPath=".">
+	ProjectGUID="{F9EE10DA-2404-4154-B904-F93C936C040A}">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@ -12,8 +11,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug TA|Win32"
-			OutputDirectory=".\Debug_TA"
-			IntermediateDirectory=".\Debug_TA"
+			OutputDirectory=".\build\game_debug_ta"
+			IntermediateDirectory=".\build\game_debug_ta"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -24,10 +23,10 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;MISSIONPACK;QAGAME"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug_TA/game.pch"
-				AssemblerListingLocation=".\Debug_TA/"
-				ObjectFile=".\Debug_TA/"
-				ProgramDataBaseFileName=".\Debug_TA/"
+				PrecompiledHeaderFile="$(IntDir)\game.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@ -37,17 +36,17 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib"
-				OutputFile="..\Debug_TA\qagamex86.dll"
+				OutputFile="$(OutDir)\qagamex86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\game.def"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug_TA/qagamex86.pdb"
+				ProgramDatabaseFile="$(IntDir)\qagamex86.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Debug_TA/qagamex86.map"
+				MapFileName="$(IntDir)\qagamex86.map"
 				SubSystem="2"
 				BaseAddress="0x20000000"
-				ImportLibrary=".\Debug_TA/qagamex86.lib"
+				ImportLibrary="$(IntDir)\qagamex86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -80,8 +79,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory=".\build\game_debug"
+			IntermediateDirectory=".\build\game_debug"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -92,10 +91,10 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/game.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile="$(IntDir)\game.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@ -105,17 +104,17 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib"
-				OutputFile="../Debug/qagamex86.dll"
+				OutputFile="$(OutDir)\qagamex86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\game.def"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/qagamex86.pdb"
+				ProgramDatabaseFile="$(IntDir)\qagamex86.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Debug/qagamex86.map"
+				MapFileName="$(IntDir)\qagamex86.map"
 				SubSystem="2"
 				BaseAddress="0x20000000"
-				ImportLibrary=".\Debug/qagamex86.lib"
+				ImportLibrary="$(IntDir)\qagamex86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -148,8 +147,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release Alpha|Win32"
-			OutputDirectory=".\..\ReleaseAXP"
-			IntermediateDirectory=".\ReleaseAXP"
+			OutputDirectory=".\build\game_release_alpha"
+			IntermediateDirectory=".\build\game_release_alpha"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -163,10 +162,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\ReleaseAXP/game.pch"
-				AssemblerListingLocation=".\ReleaseAXP/"
-				ObjectFile=".\ReleaseAXP/"
-				ProgramDataBaseFileName=".\ReleaseAXP/"
+				PrecompiledHeaderFile="$(IntDir)\game.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="2"/>
@ -175,14 +174,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib"
-				OutputFile="..\ReleaseAXP/qagameaxp.dll"
+				OutputFile="$(OutDir)\qagameaxp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\game.def"
-				ProgramDatabaseFile=".\..\ReleaseAXP/qagameaxp.pdb"
+				ProgramDatabaseFile="$(IntDir)\qagameaxp.pdb"
 				SubSystem="2"
 				BaseAddress="0x20000000"
-				ImportLibrary=".\..\ReleaseAXP/qagameaxp.lib"/>
+				ImportLibrary="$(IntDir)\qagameaxp.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
@ -214,8 +213,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug Alpha|Win32"
-			OutputDirectory=".\..\DebugAxp"
-			IntermediateDirectory=".\DebugAxp"
+			OutputDirectory=".\build\game_debug_alpha"
+			IntermediateDirectory=".\build\game_debug_alpha"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -226,10 +225,10 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;C_ONLY"
 				RuntimeLibrary="5"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\DebugAxp/game.pch"
-				AssemblerListingLocation=".\DebugAxp/"
-				ObjectFile=".\DebugAxp/"
-				ProgramDataBaseFileName=".\DebugAxp/"
+				PrecompiledHeaderFile="$(IntDir)\game.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="3"/>
@ -238,15 +237,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib"
-				OutputFile="..\DebugAxp/qagameaxp.dll"
+				OutputFile="$(OutDir)\qagameaxp.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\game.def"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\DebugAxp/qagameaxp.pdb"
+				ProgramDatabaseFile="$(IntDir)\qagameaxp.pdb"
 				SubSystem="2"
 				BaseAddress="0x20000000"
-				ImportLibrary=".\..\DebugAxp/qagameaxp.lib"/>
+				ImportLibrary="$(IntDir)\qagameaxp.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"
@ -278,8 +277,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\build\game_release"
+			IntermediateDirectory=".\build\game_release"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -293,10 +292,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/game.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile="$(IntDir)\game.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -304,16 +303,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib"
-				OutputFile="../Release/qagamex86.dll"
+				OutputFile="$(OutDir)\qagamex86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\game.def"
-				ProgramDatabaseFile=".\Release/qagamex86.pdb"
+				ProgramDatabaseFile="$(IntDir)\qagamex86.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Release/qagamex86.map"
+				MapFileName="$(IntDir)\qagamex86.map"
 				SubSystem="2"
 				BaseAddress="0x20000000"
-				ImportLibrary=".\Release/qagamex86.lib"
+				ImportLibrary="$(IntDir)\qagamex86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -346,8 +345,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release TA|Win32"
-			OutputDirectory=".\Release_TA"
-			IntermediateDirectory=".\Release_TA"
+			OutputDirectory=".\build\game_release_ta"
+			IntermediateDirectory=".\build\game_release_ta"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -361,10 +360,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release_TA/game.pch"
-				AssemblerListingLocation=".\Release_TA/"
-				ObjectFile=".\Release_TA/"
-				ProgramDataBaseFileName=".\Release_TA/"
+				PrecompiledHeaderFile="$(IntDir)\game.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -372,16 +371,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib"
-				OutputFile="../Release_TA/qagamex86.dll"
+				OutputFile="$(IntDir)\qagamex86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\game.def"
-				ProgramDatabaseFile=".\Release_TA/qagamex86.pdb"
+				ProgramDatabaseFile="$(IntDir)\qagamex86.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Release_TA/qagamex86.map"
+				MapFileName="$(IntDir)\qagamex86.map"
 				SubSystem="2"
 				BaseAddress="0x20000000"
-				ImportLibrary=".\Release_TA/qagamex86.lib"
+				ImportLibrary="$(IntDir)\qagamex86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -420,7 +419,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90">
 			<File
-				RelativePath="ai_chat.c">
+				RelativePath="..\..\game\ai_chat.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -467,7 +466,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ai_cmd.c">
+				RelativePath="..\..\game\ai_cmd.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -514,7 +513,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ai_dmnet.c">
+				RelativePath="..\..\game\ai_dmnet.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -561,7 +560,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ai_dmq3.c">
+				RelativePath="..\..\game\ai_dmq3.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -608,7 +607,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ai_main.c">
+				RelativePath="..\..\game\ai_main.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -655,7 +654,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ai_team.c">
+				RelativePath="..\..\game\ai_team.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -702,7 +701,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ai_vcmd.c">
+				RelativePath="..\..\game\ai_vcmd.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -749,7 +748,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="bg_lib.c">
+				RelativePath="..\..\game\bg_lib.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -800,7 +799,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="bg_misc.c">
+				RelativePath="..\..\game\bg_misc.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -847,7 +846,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="bg_pmove.c">
+				RelativePath="..\..\game\bg_pmove.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -894,7 +893,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="bg_slidemove.c">
+				RelativePath="..\..\game\bg_slidemove.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -941,7 +940,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_active.c">
+				RelativePath="..\..\game\g_active.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -988,7 +987,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_arenas.c">
+				RelativePath="..\..\game\g_arenas.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1035,7 +1034,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_bot.c">
+				RelativePath="..\..\game\g_bot.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1082,7 +1081,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_client.c">
+				RelativePath="..\..\game\g_client.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1129,7 +1128,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_cmds.c">
+				RelativePath="..\..\game\g_cmds.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1176,7 +1175,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_combat.c">
+				RelativePath="..\..\game\g_combat.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1223,7 +1222,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_items.c">
+				RelativePath="..\..\game\g_items.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1270,7 +1269,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_main.c">
+				RelativePath="..\..\game\g_main.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1317,7 +1316,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_mem.c">
+				RelativePath="..\..\game\g_mem.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1364,7 +1363,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_misc.c">
+				RelativePath="..\..\game\g_misc.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1411,7 +1410,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_missile.c">
+				RelativePath="..\..\game\g_missile.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1458,7 +1457,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_mover.c">
+				RelativePath="..\..\game\g_mover.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1505,7 +1504,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_session.c">
+				RelativePath="..\..\game\g_session.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1552,7 +1551,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_spawn.c">
+				RelativePath="..\..\game\g_spawn.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1599,7 +1598,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_svcmds.c">
+				RelativePath="..\..\game\g_svcmds.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1646,7 +1645,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_syscalls.c">
+				RelativePath="..\..\game\g_syscalls.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1693,7 +1692,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_target.c">
+				RelativePath="..\..\game\g_target.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1740,7 +1739,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_team.c">
+				RelativePath="..\..\game\g_team.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1787,7 +1786,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_trigger.c">
+				RelativePath="..\..\game\g_trigger.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1834,7 +1833,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_utils.c">
+				RelativePath="..\..\game\g_utils.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1881,7 +1880,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="g_weapon.c">
+				RelativePath="..\..\game\g_weapon.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1928,7 +1927,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="game.def">
+				RelativePath="..\..\game\game.def">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1943,95 +1942,95 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\qcommon\q_math.c">
+				RelativePath="..\..\qcommon\q_math.c">
 			</File>
 			<File
-				RelativePath="..\qcommon\q_shared.c">
+				RelativePath="..\..\qcommon\q_shared.c">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;fi;fd">
 			<File
-				RelativePath="ai_chat.h">
+				RelativePath="..\..\game\ai_chat.h">
 			</File>
 			<File
-				RelativePath="ai_cmd.h">
+				RelativePath="..\..\game\ai_cmd.h">
 			</File>
 			<File
-				RelativePath="ai_dmnet.h">
+				RelativePath="..\..\game\ai_dmnet.h">
 			</File>
 			<File
-				RelativePath="ai_dmq3.h">
+				RelativePath="..\..\game\ai_dmq3.h">
 			</File>
 			<File
-				RelativePath="ai_main.h">
+				RelativePath="..\..\game\ai_main.h">
 			</File>
 			<File
-				RelativePath="ai_team.h">
+				RelativePath="..\..\game\ai_team.h">
 			</File>
 			<File
-				RelativePath="ai_vcmd.h">
+				RelativePath="..\..\game\ai_vcmd.h">
 			</File>
 			<File
-				RelativePath="be_aas.h">
+				RelativePath="..\..\game\be_aas.h">
 			</File>
 			<File
-				RelativePath="be_ai_char.h">
+				RelativePath="..\..\game\be_ai_char.h">
 			</File>
 			<File
-				RelativePath="be_ai_chat.h">
+				RelativePath="..\..\game\be_ai_chat.h">
 			</File>
 			<File
-				RelativePath="be_ai_gen.h">
+				RelativePath="..\..\game\be_ai_gen.h">
 			</File>
 			<File
-				RelativePath="be_ai_goal.h">
+				RelativePath="..\..\game\be_ai_goal.h">
 			</File>
 			<File
-				RelativePath="be_ai_move.h">
+				RelativePath="..\..\game\be_ai_move.h">
 			</File>
 			<File
-				RelativePath="be_ai_weap.h">
+				RelativePath="..\..\game\be_ai_weap.h">
 			</File>
 			<File
-				RelativePath="be_ea.h">
+				RelativePath="..\..\game\be_ea.h">
 			</File>
 			<File
-				RelativePath="bg_local.h">
+				RelativePath="..\..\game\bg_local.h">
 			</File>
 			<File
-				RelativePath="bg_public.h">
+				RelativePath="..\..\game\bg_public.h">
 			</File>
 			<File
-				RelativePath="botlib.h">
+				RelativePath="..\..\game\botlib.h">
 			</File>
 			<File
-				RelativePath="chars.h">
+				RelativePath="..\..\game\chars.h">
 			</File>
 			<File
-				RelativePath="g_local.h">
+				RelativePath="..\..\game\g_local.h">
 			</File>
 			<File
-				RelativePath="g_public.h">
+				RelativePath="..\..\game\g_public.h">
 			</File>
 			<File
-				RelativePath="g_team.h">
+				RelativePath="..\..\game\g_team.h">
 			</File>
 			<File
-				RelativePath="inv.h">
+				RelativePath="..\..\game\inv.h">
 			</File>
 			<File
-				RelativePath="match.h">
+				RelativePath="..\..\game\match.h">
 			</File>
 			<File
-				RelativePath="..\qcommon\q_shared.h">
+				RelativePath="..\..\qcommon\q_shared.h">
 			</File>
 			<File
-				RelativePath="..\qcommon\surfaceflags.h">
+				RelativePath="..\..\qcommon\surfaceflags.h">
 			</File>
 			<File
-				RelativePath="syn.h">
+				RelativePath="..\..\game\syn.h">
 			</File>
 		</Filter>
 		<Filter
--- a/code/win32/msvc/q3_ui.def
+++ b/code/win32/msvc/q3_ui.def
--- a/code/win32/msvc/q3_ui.vcproj
+++ b/code/win32/msvc/q3_ui.vcproj
@ -3,8 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="q3_ui"
-	SccProjectName="&quot;$/MissionPack/code/q3_ui&quot;, VFLAAAAA"
-	SccLocalPath=".">
+	ProjectGUID="{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@ -12,8 +11,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug TA|Win32"
-			OutputDirectory=".\Debug_TA"
-			IntermediateDirectory=".\Debug_TA"
+			OutputDirectory=".\build\q3_ui_debug_ta"
+			IntermediateDirectory=".\build\q3_ui_debug_ta"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -26,10 +25,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile="Debug/q3_ui.pch"
-				AssemblerListingLocation=".\Debug_TA/"
-				ObjectFile="Debug/"
-				ProgramDataBaseFileName="Debug/"
+				PrecompiledHeaderFile="$(IntDir)\q3_ui.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@ -39,16 +38,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Debug_TA/uix86_old.dll"
+				OutputFile="$(OutDir)\uix86_old.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\ui.def"
+				ModuleDefinitionFile="q3_ui.def"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="../Debug_TA/ui.pdb"
+				ProgramDatabaseFile="$(IntDir)\ui.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName="Debug_TA/uix86.map"
+				MapFileName="$(IntDir)\uix86.map"
 				BaseAddress="0x40000000"
-				ImportLibrary="Debug_TA/uix86.lib"
+				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -81,8 +80,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release TA|Win32"
-			OutputDirectory=".\Release_TA"
-			IntermediateDirectory=".\Release_TA"
+			OutputDirectory=".\build\q3_ui_release_ta"
+			IntermediateDirectory=".\build\q3_ui_release_ta"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -96,10 +95,10 @@
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release_TA/q3_ui.pch"
-				AssemblerListingLocation=".\Release_TA/"
-				ObjectFile=".\Release_TA/"
-				ProgramDataBaseFileName=".\Release_TA/"
+				PrecompiledHeaderFile="$(IntDir)\q3_ui.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -107,12 +106,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Release_TA/uix86_old.dll"
+				OutputFile="$(OutDir)\uix86_old.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\ui.def"
-				ProgramDatabaseFile=".\Release_TA/uix86_old.pdb"
-				ImportLibrary="Release_TA/q3_ui.lib"
+				ModuleDefinitionFile="q3_ui.def"
+				ProgramDatabaseFile="$(IntDir)\uix86_old.pdb"
+				ImportLibrary="$(IntDir)\q3_ui.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -145,8 +144,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\build\q3_ui_release"
+			IntermediateDirectory=".\build\q3_ui_release"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -160,22 +159,23 @@
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/q3_ui.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile="$(IntDir)\q3_ui.pch"
+				AssemblerOutput="0"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="../Release/uix86.dll"
+				OutputFile="$(OutDir)\uix86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\ui.def"
-				ProgramDatabaseFile=".\Release/uix86.pdb"
-				ImportLibrary=".\Release/uix86.lib"
+				ModuleDefinitionFile=".\q3_ui.def"
+				ProgramDatabaseFile="$(IntDir)\uix86.pdb"
+				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -208,8 +208,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\q3_ui___Win32_Debug"
-			IntermediateDirectory=".\q3_ui___Win32_Debug"
+			OutputDirectory=".\build\q3_ui_debug"
+			IntermediateDirectory=".\build\q3_ui_debug"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -222,10 +222,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile="Debug/q3_ui.pch"
-				AssemblerListingLocation=".\q3_ui___Win32_Debug/"
-				ObjectFile="Debug/"
-				ProgramDataBaseFileName="Debug/"
+				PrecompiledHeaderFile="$(IntDir)\q3_ui.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@ -235,16 +235,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Debug/uix86.dll"
+				OutputFile="$(OutDir)\uix86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ModuleDefinitionFile=".\ui.def"
+				ModuleDefinitionFile="q3_ui.def"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="../Debug/ui.pdb"
+				ProgramDatabaseFile="$(IntDir)\ui.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName="Debug/uix86.map"
+				MapFileName="$(IntDir)\uix86.map"
 				BaseAddress="0x40000000"
-				ImportLibrary="Debug/uix86.lib"
+				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -283,7 +283,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath="..\game\bg_misc.c">
+				RelativePath="..\..\game\bg_misc.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -320,13 +320,13 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\qcommon\q_math.c">
+				RelativePath="..\..\qcommon\q_math.c">
 			</File>
 			<File
-				RelativePath="..\qcommon\q_shared.c">
+				RelativePath="..\..\qcommon\q_shared.c">
 			</File>
 			<File
-				RelativePath="ui.def">
+				RelativePath="..\..\q3_ui\ui.def">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -347,7 +347,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_addbots.c">
+				RelativePath="..\..\q3_ui\ui_addbots.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -384,7 +384,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_atoms.c">
+				RelativePath="..\..\q3_ui\ui_atoms.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -421,7 +421,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_cdkey.c">
+				RelativePath="..\..\q3_ui\ui_cdkey.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -458,7 +458,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_cinematics.c">
+				RelativePath="..\..\q3_ui\ui_cinematics.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -495,7 +495,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_confirm.c">
+				RelativePath="..\..\q3_ui\ui_confirm.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -532,7 +532,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_connect.c">
+				RelativePath="..\..\q3_ui\ui_connect.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -569,7 +569,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_controls2.c">
+				RelativePath="..\..\q3_ui\ui_controls2.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -606,7 +606,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_credits.c">
+				RelativePath="..\..\q3_ui\ui_credits.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -643,7 +643,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_demo2.c">
+				RelativePath="..\..\q3_ui\ui_demo2.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -680,7 +680,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_display.c">
+				RelativePath="..\..\q3_ui\ui_display.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -717,7 +717,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_gameinfo.c">
+				RelativePath="..\..\q3_ui\ui_gameinfo.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -754,7 +754,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_ingame.c">
+				RelativePath="..\..\q3_ui\ui_ingame.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -791,7 +791,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_loadconfig.c">
+				RelativePath="..\..\q3_ui\ui_loadconfig.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -830,7 +830,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_main.c">
+				RelativePath="..\..\q3_ui\ui_main.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -867,7 +867,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_menu.c">
+				RelativePath="..\..\q3_ui\ui_menu.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -904,7 +904,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_mfield.c">
+				RelativePath="..\..\q3_ui\ui_mfield.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -941,7 +941,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_mods.c">
+				RelativePath="..\..\q3_ui\ui_mods.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -978,7 +978,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_network.c">
+				RelativePath="..\..\q3_ui\ui_network.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1015,7 +1015,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_options.c">
+				RelativePath="..\..\q3_ui\ui_options.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1052,7 +1052,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_playermodel.c">
+				RelativePath="..\..\q3_ui\ui_playermodel.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1089,7 +1089,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_players.c">
+				RelativePath="..\..\q3_ui\ui_players.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1126,7 +1126,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_playersettings.c">
+				RelativePath="..\..\q3_ui\ui_playersettings.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1163,7 +1163,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_preferences.c">
+				RelativePath="..\..\q3_ui\ui_preferences.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1200,7 +1200,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_qmenu.c">
+				RelativePath="..\..\q3_ui\ui_qmenu.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1237,7 +1237,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_removebots.c">
+				RelativePath="..\..\q3_ui\ui_removebots.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1274,7 +1274,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_saveconfig.c">
+				RelativePath="..\..\q3_ui\ui_saveconfig.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1313,7 +1313,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_serverinfo.c">
+				RelativePath="..\..\q3_ui\ui_serverinfo.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1350,7 +1350,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_servers2.c">
+				RelativePath="..\..\q3_ui\ui_servers2.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1387,7 +1387,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_setup.c">
+				RelativePath="..\..\q3_ui\ui_setup.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1424,7 +1424,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_sound.c">
+				RelativePath="..\..\q3_ui\ui_sound.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1461,7 +1461,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_sparena.c">
+				RelativePath="..\..\q3_ui\ui_sparena.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1498,7 +1498,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_specifyserver.c">
+				RelativePath="..\..\q3_ui\ui_specifyserver.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1535,7 +1535,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_splevel.c">
+				RelativePath="..\..\q3_ui\ui_splevel.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1572,7 +1572,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_sppostgame.c">
+				RelativePath="..\..\q3_ui\ui_sppostgame.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1609,7 +1609,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_spreset.c">
+				RelativePath="..\..\q3_ui\ui_spreset.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1646,7 +1646,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_spskill.c">
+				RelativePath="..\..\q3_ui\ui_spskill.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1683,7 +1683,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_startserver.c">
+				RelativePath="..\..\q3_ui\ui_startserver.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1720,7 +1720,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\ui\ui_syscalls.c">
+				RelativePath="..\..\ui\ui_syscalls.c">
 				<FileConfiguration
 					Name="Debug TA|Win32">
 					<Tool
@ -1755,7 +1755,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_team.c">
+				RelativePath="..\..\q3_ui\ui_team.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1792,7 +1792,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_teamorders.c">
+				RelativePath="..\..\q3_ui\ui_teamorders.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1829,7 +1829,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_video.c">
+				RelativePath="..\..\q3_ui\ui_video.c">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1870,7 +1870,7 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath="keycodes.h">
+				RelativePath="..\..\q3_ui\keycodes.h">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1885,10 +1885,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\qcommon\q_shared.h">
+				RelativePath="..\..\qcommon\q_shared.h">
 			</File>
 			<File
-				RelativePath="ui_local.h">
+				RelativePath="..\..\q3_ui\ui_local.h">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
@ -1903,7 +1903,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_public.h">
+				RelativePath="..\..\q3_ui\ui_public.h">
 				<FileConfiguration
 					Name="Debug TA|Win32"
 					ExcludedFromBuild="TRUE">
--- a/code/win32/msvc/quake3.sln
+++ b/code/win32/msvc/quake3.sln
@ -1,75 +1,35 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Splines", "splines\Splines.vcproj", "{DBAF2C53-3858-455D-A1AE-3FC093515314}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "botlib", "botlib.vcproj", "{A410161F-AE9F-485D-A01F-5294891430A6}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "botlib", "botlib\botlib.vcproj", "{A410161F-AE9F-485D-A01F-5294891430A6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame.vcproj", "{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame\cgame.vcproj", "{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game\game.vcproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui\q3_ui.vcproj", "{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui.vcproj", "{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcproj", "{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A410161F-AE9F-485D-A01F-5294891430A6} = {A410161F-AE9F-485D-A01F-5294891430A6}
-		{DBAF2C53-3858-455D-A1AE-3FC093515314} = {DBAF2C53-3858-455D-A1AE-3FC093515314}
 		{AB424155-FBED-4D8D-B007-5B6CF93EA395} = {AB424155-FBED-4D8D-B007-5B6CF93EA395}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer\renderer.vcproj", "{AB424155-FBED-4D8D-B007-5B6CF93EA395}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer.vcproj", "{AB424155-FBED-4D8D-B007-5B6CF93EA395}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "ui\ui.vcproj", "{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "ui.vcproj", "{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(SourceCodeControl) = preSolution
-		SccNumberOfProjects = 8
-		SccProjectUniqueName0 = splines\\Splines.vcproj
-		SccProjectName0 = \u0022$/MissionPack/code/Splines\u0022,\u0020WJNAAAAA
-		SccLocalPath0 = splines
-		SccProvider0 = MSSCCI:Perforce\u0020SCM
-		SccProjectUniqueName1 = botlib\\botlib.vcproj
-		SccProjectName1 = \u0022$/MissionPack/code/botlib\u0022,\u0020HBAAAAAA
-		SccLocalPath1 = botlib
-		SccProvider1 = MSSCCI:Perforce\u0020SCM
-		SccProjectUniqueName2 = cgame\\cgame.vcproj
-		SccProjectName2 = \u0022$/MissionPack/code/cgame\u0022,\u0020NPAAAAAA
-		SccLocalPath2 = cgame
-		SccProvider2 = MSSCCI:Perforce\u0020SCM
-		SccProjectUniqueName3 = game\\game.vcproj
-		SccProjectName3 = \u0022$/MissionPack/code/game\u0022,\u0020CYAAAAAA
-		SccLocalPath3 = game
-		SccProvider3 = MSSCCI:Perforce\u0020SCM
-		SccProjectUniqueName4 = q3_ui\\q3_ui.vcproj
-		SccProjectName4 = \u0022$/MissionPack/code/q3_ui\u0022,\u0020VFLAAAAA
-		SccLocalPath4 = q3_ui
-		SccProvider4 = MSSCCI:Perforce\u0020SCM
-		SccProjectUniqueName5 = quake3.vcproj
-		SccProjectName5 = \u0022$/MissionPack/code\u0022,\u0020CAAAAAAA
-		SccLocalPath5 = .
-		SccProvider5 = MSSCCI:Perforce\u0020SCM
-		SccProjectUniqueName6 = renderer\\renderer.vcproj
-		SccProjectName6 = \u0022$/MissionPack/code/renderer\u0022,\u0020EJBAAAAA
-		SccLocalPath6 = renderer
-		SccProvider6 = MSSCCI:Perforce\u0020SCM
-		SccProjectUniqueName7 = ui\\ui.vcproj
-		SccProjectName7 = \u0022$/MissionPack/code/ui\u0022,\u0020AOBAAAAA
-		SccLocalPath7 = ui
-		SccProvider7 = MSSCCI:Perforce\u0020SCM
-	EndGlobalSection
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
 		Debug TA = Debug TA
@ -77,14 +37,6 @@ Global
 		Release TA = Release TA
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{DBAF2C53-3858-455D-A1AE-3FC093515314}.Debug.ActiveCfg = Debug|Win32
-		{DBAF2C53-3858-455D-A1AE-3FC093515314}.Debug.Build.0 = Debug|Win32
-		{DBAF2C53-3858-455D-A1AE-3FC093515314}.Debug TA.ActiveCfg = Debug|Win32
-		{DBAF2C53-3858-455D-A1AE-3FC093515314}.Debug TA.Build.0 = Debug|Win32
-		{DBAF2C53-3858-455D-A1AE-3FC093515314}.Release.ActiveCfg = Release|Win32
-		{DBAF2C53-3858-455D-A1AE-3FC093515314}.Release.Build.0 = Release|Win32
-		{DBAF2C53-3858-455D-A1AE-3FC093515314}.Release TA.ActiveCfg = Release|Win32
-		{DBAF2C53-3858-455D-A1AE-3FC093515314}.Release TA.Build.0 = Release|Win32
 		{A410161F-AE9F-485D-A01F-5294891430A6}.Debug.ActiveCfg = Debug|Win32
 		{A410161F-AE9F-485D-A01F-5294891430A6}.Debug.Build.0 = Debug|Win32
 		{A410161F-AE9F-485D-A01F-5294891430A6}.Debug TA.ActiveCfg = Debug TA|Win32
--- a/code/win32/msvc/quake3.vcproj
+++ b/code/win32/msvc/quake3.vcproj
@ -3,10 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="quake3"
-	SccProjectName="&quot;$/MissionPack/code&quot;, CAAAAAAA"
-	SccAuxPath=""
-	SccLocalPath="."
-	SccProvider="MSSCCI:Perforce SCM">
+	ProjectGUID="{81CB51C4-B434-4E12-B69B-BAEE102F2852}">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@ -14,8 +11,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release TA|Win32"
-			OutputDirectory=".\Release_TA"
-			IntermediateDirectory=".\Release_TA"
+			OutputDirectory=".\build\quake3_release_ta"
+			IntermediateDirectory=".\build\quake3_release_ta"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -29,10 +26,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release_TA/quake3.pch"
-				AssemblerListingLocation=".\Release_TA/"
-				ObjectFile=".\Release_TA/"
-				ProgramDataBaseFileName=".\Release_TA/"
+				PrecompiledHeaderFile="$(IntDir)\quake3.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"/>
@ -41,12 +38,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib wsock32.lib"
-				OutputFile=".\Release_TA/quake3.exe"
+				OutputFile="$(OutDir)\quake3.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile="Release_TA/quake3.pdb"
+				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName="Release_TA/quake3.map"
+				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
 				TargetMachine="1"/>
@ -56,7 +53,7 @@
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Release_TA/quake3.tlb"
+				TypeLibraryName="$(IntDir)\quake3.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"
@ -83,8 +80,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory=".\build\quake3_debug"
+			IntermediateDirectory=".\build\quake3_debug"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -95,12 +92,12 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/quake3.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile="$(IntDir)\quake3.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
-				BrowseInformationFile=".\Debug/"
+				BrowseInformationFile="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"/>
@ -109,13 +106,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib wsock32.lib"
-				OutputFile=".\Debug/quake3.exe"
+				OutputFile="$(OutDir)\quake3.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/quake3.pdb"
+				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Debug/quake3.map"
+				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
 				TargetMachine="1"/>
@ -125,7 +122,7 @@
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/quake3.tlb"
+				TypeLibraryName="$(IntDir)\quake3.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"
@ -139,7 +136,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				ResourceOutputFileName="win32\winquake.res"/>
+				ResourceOutputFileName="..\winquake.res"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@ -153,8 +150,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release TA DEMO|Win32"
-			OutputDirectory=".\quake3___Win32_Release_TA_DEMO"
-			IntermediateDirectory=".\quake3___Win32_Release_TA_DEMO"
+			OutputDirectory=".\build\quake3_release_ta_demo"
+			IntermediateDirectory=".\build\quake3_release_ta_demo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -168,10 +165,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\quake3___Win32_Release_TA_DEMO/quake3.pch"
-				AssemblerListingLocation=".\quake3___Win32_Release_TA_DEMO/"
-				ObjectFile=".\quake3___Win32_Release_TA_DEMO/"
-				ProgramDataBaseFileName=".\quake3___Win32_Release_TA_DEMO/"
+				PrecompiledHeaderFile="$(IntDir)\quake3.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="2"/>
@ -180,13 +177,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib wsock32.lib"
-				OutputFile=".\quake3___Win32_Release_TA_DEMO/quake3.exe"
+				OutputFile="$(OutDir)\quake3.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="Release_TA/quake3.pdb"
+				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName="Release_TA/quake3.map"
+				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
 				TargetMachine="1"/>
@ -221,8 +218,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\build\quake3_release"
+			IntermediateDirectory=".\build\quake3_release"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -236,10 +233,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/quake3.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile="$(IntDir)\quake3.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -247,13 +244,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib wsock32.lib"
-				OutputFile=".\Release/quake3.exe"
+				OutputFile="$(OutDir)\quake3.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Release/quake3.pdb"
+				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Release/quake3.map"
+				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
 				TargetMachine="1"/>
@ -263,7 +260,7 @@
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Release/quake3.tlb"
+				TypeLibraryName="$(IntDir)\quake3.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
@ -288,8 +285,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug TA DEMO|Win32"
-			OutputDirectory=".\quake3___Win32_Debug_TA_DEMO"
-			IntermediateDirectory=".\quake3___Win32_Debug_TA_DEMO"
+			OutputDirectory=".\build\quake3_debug_ta_demo"
+			IntermediateDirectory=".\build\quake3_debug_ta_demo"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -300,12 +297,12 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PRE_RELEASE_TADEMO;PRE_RELEASE_DEMO"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\quake3___Win32_Debug_TA_DEMO/quake3.pch"
-				AssemblerListingLocation=".\quake3___Win32_Debug_TA_DEMO/"
-				ObjectFile=".\quake3___Win32_Debug_TA_DEMO/"
-				ProgramDataBaseFileName=".\quake3___Win32_Debug_TA_DEMO/"
+				PrecompiledHeaderFile="$(IntDir)\quake3.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
-				BrowseInformationFile=".\quake3___Win32_Debug_TA_DEMO/"
+				BrowseInformationFile="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"/>
@ -314,13 +311,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib wsock32.lib"
-				OutputFile=".\quake3___Win32_Debug_TA_DEMO/quake3.exe"
+				OutputFile="$(OutDir)\quake3.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\quake3___Win32_Debug_TA_DEMO/quake3.pdb"
+				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName="Debug_TA/quake3.map"
+				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
 				TargetMachine="1"/>
@ -342,7 +339,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				ResourceOutputFileName="win32\winquake.res"/>
+				ResourceOutputFileName="..\winquake.res"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@ -356,8 +353,8 @@
 		</Configuration>
 		<Configuration
 			Name="vector|Win32"
-			OutputDirectory=".\quake3___Win32_vector0"
-			IntermediateDirectory=".\quake3___Win32_vector0"
+			OutputDirectory=".\build\quake3_vector0"
+			IntermediateDirectory=".\build\quake3_vector0"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -372,10 +369,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\quake3___Win32_vector0/quake3.pch"
-				AssemblerListingLocation=".\quake3___Win32_vector0/"
-				ObjectFile=".\quake3___Win32_vector0/"
-				ProgramDataBaseFileName=".\quake3___Win32_vector0/"
+				PrecompiledHeaderFile="$(IntDir)\quake3.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="4"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="3"/>
@ -384,13 +381,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib wsock32.lib"
-				OutputFile=".\quake3___Win32_vector0/quake3.exe"
+				OutputFile="$(OutDir)\quake3.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="Release_TA/quake3.pdb"
+				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName="Release_TA/quake3.map"
+				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
 				TargetMachine="1"/>
@ -425,8 +422,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug TA|Win32"
-			OutputDirectory=".\Debug_TA"
-			IntermediateDirectory=".\Debug_TA"
+			OutputDirectory=".\build\quake3_debug_ta"
+			IntermediateDirectory=".\build\quake3_debug_ta"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE">
@ -437,12 +434,12 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug_TA/quake3.pch"
-				AssemblerListingLocation=".\Debug_TA/"
-				ObjectFile=".\Debug_TA/"
-				ProgramDataBaseFileName=".\Debug_TA/"
+				PrecompiledHeaderFile="$(IntDir)\quake3.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
-				BrowseInformationFile=".\Debug_TA/"
+				BrowseInformationFile="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"/>
@ -451,13 +448,13 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="winmm.lib wsock32.lib"
-				OutputFile=".\Debug_TA/quake3.exe"
+				OutputFile="$(OutDir)\quake3.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug_TA/quake3.pdb"
+				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName="Debug_TA/quake3.map"
+				MapFileName="$(IntDir)\quake3.map"
 				SubSystem="2"
 				StackReserveSize="8388608"
 				TargetMachine="1"/>
@ -467,7 +464,7 @@
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Debug_TA/quake3.tlb"
+				TypeLibraryName="$(IntDir)\quake3.tlb"
 				HeaderFileName=""/>
 			<Tool
 				Name="VCPostBuildEventTool"
@ -481,7 +478,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				ResourceOutputFileName="win32\winquake.res"/>
+				ResourceOutputFileName="..\winquake.res"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool
@ -501,7 +498,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90">
 			<File
-				RelativePath="client\cl_cgame.c">
+				RelativePath="..\..\client\cl_cgame.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -557,7 +554,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\cl_cin.c">
+				RelativePath="..\..\client\cl_cin.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -613,7 +610,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\cl_console.c">
+				RelativePath="..\..\client\cl_console.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -669,7 +666,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\cl_input.c">
+				RelativePath="..\..\client\cl_input.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -725,7 +722,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\cl_keys.c">
+				RelativePath="..\..\client\cl_keys.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -781,7 +778,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\cl_main.c">
+				RelativePath="..\..\client\cl_main.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -837,7 +834,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\cl_net_chan.c">
+				RelativePath="..\..\client\cl_net_chan.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -893,7 +890,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\cl_parse.c">
+				RelativePath="..\..\client\cl_parse.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -949,7 +946,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\cl_scrn.c">
+				RelativePath="..\..\client\cl_scrn.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1005,7 +1002,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\cl_ui.c">
+				RelativePath="..\..\client\cl_ui.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1061,7 +1058,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\cm_load.c">
+				RelativePath="..\..\qcommon\cm_load.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1117,7 +1114,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\cm_patch.c">
+				RelativePath="..\..\qcommon\cm_patch.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1173,7 +1170,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\cm_polylib.c">
+				RelativePath="..\..\qcommon\cm_polylib.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1229,7 +1226,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\cm_test.c">
+				RelativePath="..\..\qcommon\cm_test.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1285,7 +1282,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\cm_trace.c">
+				RelativePath="..\..\qcommon\cm_trace.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1341,7 +1338,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\cmd.c">
+				RelativePath="..\..\qcommon\cmd.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1397,7 +1394,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\common.c">
+				RelativePath="..\..\qcommon\common.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1453,7 +1450,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\cvar.c">
+				RelativePath="..\..\qcommon\cvar.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1509,7 +1506,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\files.c">
+				RelativePath="..\..\qcommon\files.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1565,7 +1562,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\huffman.c">
+				RelativePath="..\..\qcommon\huffman.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1621,7 +1618,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\md4.c">
+				RelativePath="..\..\qcommon\md4.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1677,7 +1674,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\msg.c">
+				RelativePath="..\..\qcommon\msg.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1733,7 +1730,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\net_chan.c">
+				RelativePath="..\..\qcommon\net_chan.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1789,13 +1786,13 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\qcommon\q_math.c">
+				RelativePath="..\..\.\qcommon\q_math.c">
 			</File>
 			<File
-				RelativePath=".\qcommon\q_shared.c">
+				RelativePath="..\..\.\qcommon\q_shared.c">
 			</File>
 			<File
-				RelativePath="client\snd_adpcm.c">
+				RelativePath="..\..\client\snd_adpcm.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1851,7 +1848,13 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\snd_dma.c">
+				RelativePath="..\..\client\snd_codec.c">
+			</File>
+			<File
+				RelativePath="..\..\client\snd_codec_wav.c">
+			</File>
+			<File
+				RelativePath="..\..\client\snd_dma.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1907,7 +1910,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\snd_mem.c">
+				RelativePath="..\..\client\snd_main.c">
+			</File>
+			<File
+				RelativePath="..\..\client\snd_mem.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -1963,7 +1969,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\snd_mix.c">
+				RelativePath="..\..\client\snd_mix.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2019,7 +2025,10 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="client\snd_wavelet.c">
+				RelativePath="..\..\client\snd_openal.c">
+			</File>
+			<File
+				RelativePath="..\..\client\snd_wavelet.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2075,7 +2084,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="server\sv_bot.c">
+				RelativePath="..\..\server\sv_bot.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2131,7 +2140,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="server\sv_ccmds.c">
+				RelativePath="..\..\server\sv_ccmds.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2187,7 +2196,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="server\sv_client.c">
+				RelativePath="..\..\server\sv_client.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2243,7 +2252,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="server\sv_game.c">
+				RelativePath="..\..\server\sv_game.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2299,7 +2308,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="server\sv_init.c">
+				RelativePath="..\..\server\sv_init.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2355,7 +2364,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="server\sv_main.c">
+				RelativePath="..\..\server\sv_main.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2411,7 +2420,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="server\sv_net_chan.c">
+				RelativePath="..\..\server\sv_net_chan.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2467,7 +2476,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="server\sv_snapshot.c">
+				RelativePath="..\..\server\sv_snapshot.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2523,7 +2532,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="server\sv_world.c">
+				RelativePath="..\..\server\sv_world.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2579,7 +2588,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\unzip.c">
+				RelativePath="..\..\qcommon\unzip.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2635,7 +2644,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\vm.c">
+				RelativePath="..\..\qcommon\vm.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2691,7 +2700,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\vm_interpreted.c">
+				RelativePath="..\..\qcommon\vm_interpreted.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2747,7 +2756,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="qcommon\vm_x86.c">
+				RelativePath="..\..\qcommon\vm_x86.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2803,7 +2812,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="win32\win_input.c">
+				RelativePath="..\..\win32\win_input.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2859,7 +2868,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="win32\win_main.c">
+				RelativePath="..\..\win32\win_main.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2915,7 +2924,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="win32\win_net.c">
+				RelativePath="..\..\win32\win_net.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -2971,7 +2980,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="win32\win_shared.c">
+				RelativePath="..\..\win32\win_shared.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -3027,7 +3036,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="win32\win_snd.c">
+				RelativePath="..\..\win32\win_snd.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -3083,7 +3092,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="win32\win_syscon.c">
+				RelativePath="..\..\win32\win_syscon.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -3139,7 +3148,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="win32\win_wndproc.c">
+				RelativePath="..\..\win32\win_wndproc.c">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -3199,98 +3208,92 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;fi;fd">
 			<File
-				RelativePath="game\bg_public.h">
+				RelativePath="..\..\game\bg_public.h">
 			</File>
 			<File
-				RelativePath="cgame\cg_public.h">
+				RelativePath="..\..\cgame\cg_public.h">
 			</File>
 			<File
-				RelativePath="client\client.h">
+				RelativePath="..\..\client\client.h">
 			</File>
 			<File
-				RelativePath="qcommon\cm_local.h">
+				RelativePath="..\..\qcommon\cm_local.h">
 			</File>
 			<File
-				RelativePath="qcommon\cm_patch.h">
+				RelativePath="..\..\qcommon\cm_patch.h">
 			</File>
 			<File
-				RelativePath="qcommon\cm_polylib.h">
+				RelativePath="..\..\qcommon\cm_polylib.h">
 			</File>
 			<File
-				RelativePath="qcommon\cm_public.h">
+				RelativePath="..\..\qcommon\cm_public.h">
 			</File>
 			<File
-				RelativePath="game\g_public.h">
+				RelativePath="..\..\game\g_public.h">
 			</File>
 			<File
-				RelativePath="ui\keycodes.h">
+				RelativePath="..\..\ui\keycodes.h">
 			</File>
 			<File
-				RelativePath="client\keys.h">
+				RelativePath="..\..\client\keys.h">
 			</File>
 			<File
-				RelativePath=".\qcommon\q_shared.h">
+				RelativePath="..\..\.\qcommon\q_shared.h">
 			</File>
 			<File
-				RelativePath="qcommon\qcommon.h">
+				RelativePath="..\..\qcommon\qcommon.h">
 			</File>
 			<File
-				RelativePath="qcommon\qfiles.h">
+				RelativePath="..\..\qcommon\qfiles.h">
 			</File>
 			<File
-				RelativePath="renderer\qgl.h">
+				RelativePath="..\..\renderer\qgl.h">
 			</File>
 			<File
-				RelativePath="win32\resource.h">
+				RelativePath="..\..\win32\resource.h">
 			</File>
 			<File
-				RelativePath="server\server.h">
+				RelativePath="..\..\server\server.h">
 			</File>
 			<File
-				RelativePath="client\snd_local.h">
+				RelativePath="..\..\client\snd_local.h">
 			</File>
 			<File
-				RelativePath="client\snd_public.h">
+				RelativePath="..\..\client\snd_public.h">
 			</File>
 			<File
-				RelativePath=".\qcommon\surfaceflags.h">
+				RelativePath="..\..\.\qcommon\surfaceflags.h">
 			</File>
 			<File
-				RelativePath="renderer\tr_local.h">
+				RelativePath="..\..\renderer\tr_local.h">
 			</File>
 			<File
-				RelativePath="renderer\tr_public.h">
+				RelativePath="..\..\renderer\tr_public.h">
 			</File>
 			<File
-				RelativePath="cgame\tr_types.h">
+				RelativePath="..\..\cgame\tr_types.h">
 			</File>
 			<File
-				RelativePath="ui\ui_public.h">
+				RelativePath="..\..\ui\ui_public.h">
 			</File>
 			<File
-				RelativePath="qcommon\unzip.h">
+				RelativePath="..\..\qcommon\unzip.h">
 			</File>
 			<File
-				RelativePath="qcommon\vm_local.h">
+				RelativePath="..\..\qcommon\vm_local.h">
 			</File>
 			<File
-				RelativePath="win32\win_local.h">
+				RelativePath="..\..\win32\win_local.h">
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">
 			<File
-				RelativePath="win32\cursor2.cur">
+				RelativePath="..\..\win32\qe3.ico">
 			</File>
 			<File
-				RelativePath="win32\cursor3.cur">
-			</File>
-			<File
-				RelativePath="win32\qe3.ico">
-			</File>
-			<File
-				RelativePath="win32\winquake.rc">
+				RelativePath="..\..\win32\winquake.rc">
 				<FileConfiguration
 					Name="Release TA|Win32">
 					<Tool
@ -3342,15 +3345,6 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
-		<File
-			RelativePath="unix\ChangeLog">
-		</File>
-		<File
-			RelativePath="unix\Conscript-pk3">
-		</File>
-		<File
-			RelativePath="Construct">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
--- a/code/win32/msvc/ref_trin.def
+++ b/code/win32/msvc/ref_trin.def
--- a/code/win32/msvc/renderer.vcproj
+++ b/code/win32/msvc/renderer.vcproj
--- a/code/win32/msvc/ui.def
+++ b/code/win32/msvc/ui.def
--- a/code/win32/msvc/ui.vcproj
+++ b/code/win32/msvc/ui.vcproj
@ -3,10 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="ui"
-	SccProjectName="&quot;$/MissionPack/code/ui&quot;, AOBAAAAA"
-	SccAuxPath=""
-	SccLocalPath="."
-	SccProvider="MSSCCI:Perforce SCM">
+	ProjectGUID="{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}">
 	<Platforms>
 		<Platform
 			Name="Win32"/>
@ -14,8 +11,8 @@
 	<Configurations>
 		<Configuration
 			Name="vector|Win32"
-			OutputDirectory=".\ui___Win32_vector"
-			IntermediateDirectory=".\ui___Win32_vector"
+			OutputDirectory=".\build\ui_vector0"
+			IntermediateDirectory=".\build\ui_vector0"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -30,10 +27,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\ui___Win32_vector/ui.pch"
-				AssemblerListingLocation=".\ui___Win32_vector/"
-				ObjectFile=".\ui___Win32_vector/"
-				ProgramDataBaseFileName=".\ui___Win32_vector/"
+				PrecompiledHeaderFile="$(IntDir)\ui.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -41,15 +38,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Release_TA/uix86.dll"
+				OutputFile="$(OutDir)\uix86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\ui.def"
-				ProgramDatabaseFile=".\ui___Win32_vector/uix86.pdb"
+				ProgramDatabaseFile="$(IntDir)\uix86.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\ui___Win32_vector/uix86.map"
+				MapFileName="$(IntDir)\uix86.map"
 				BaseAddress="0x40000000"
-				ImportLibrary=".\ui___Win32_vector/uix86.lib"
+				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -82,8 +79,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release TA|Win32"
-			OutputDirectory=".\Release_TA"
-			IntermediateDirectory=".\Release_TA"
+			OutputDirectory=".\build\ui_release_ta"
+			IntermediateDirectory=".\build\ui_release_ta"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -98,10 +95,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release_TA/ui.pch"
-				AssemblerListingLocation=".\Release_TA/"
-				ObjectFile=".\Release_TA/"
-				ProgramDataBaseFileName=".\Release_TA/"
+				PrecompiledHeaderFile="$(IntDir)\ui.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -109,15 +106,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Release_TA/uix86.dll"
+				OutputFile="$(OutDir)\uix86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\ui.def"
-				ProgramDatabaseFile=".\Release_TA/uix86.pdb"
+				ProgramDatabaseFile="$(IntDir)\uix86.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Release_TA/uix86.map"
+				MapFileName="$(IntDir)\uix86.map"
 				BaseAddress="0x40000000"
-				ImportLibrary=".\Release_TA/uix86.lib"
+				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -150,8 +147,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory=".\build\ui_debug"
+			IntermediateDirectory=".\build\ui_debug"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -164,10 +161,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/ui.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile="$(IntDir)\ui.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@ -177,15 +174,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Debug/uix86_new.dll"
+				OutputFile="$(OutDir)\uix86_new.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="../Debug/ui.pdb"
+				ProgramDatabaseFile="$(IntDir)\ui.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Debug/uix86_new.map"
+				MapFileName="$(IntDir)\uix86_new.map"
 				BaseAddress="0x40000000"
-				ImportLibrary=".\Debug/uix86_new.lib"
+				ImportLibrary="$(IntDir)\uix86_new.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -218,8 +215,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\build\ui_release"
+			IntermediateDirectory=".\build\ui_release"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -234,10 +231,10 @@
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/ui.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile="$(IntDir)\ui.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -245,14 +242,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Release/uix86_new.dll"
+				OutputFile="$(OutDir)\uix86_new.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/uix86_new.pdb"
+				ProgramDatabaseFile="$(IntDir)\uix86_new.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Release/uix86_new.map"
+				MapFileName="$(IntDir)\uix86_new.map"
 				BaseAddress="0x40000000"
-				ImportLibrary=".\Release/uix86_new.lib"
+				ImportLibrary="$(IntDir)\uix86_new.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -285,8 +282,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug TA|Win32"
-			OutputDirectory=".\Debug_TA"
-			IntermediateDirectory=".\Debug_TA"
+			OutputDirectory=".\build\ui_debug_ta"
+			IntermediateDirectory=".\build\ui_debug_ta"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -299,10 +296,10 @@
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug_TA/ui.pch"
-				AssemblerListingLocation=".\Debug_TA/"
-				ObjectFile=".\Debug_TA/"
-				ProgramDataBaseFileName=".\Debug_TA/"
+				PrecompiledHeaderFile="$(IntDir)\ui.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
@ -312,16 +309,16 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="../Debug_TA/uix86.dll"
+				OutputFile="$(OutDir)\uix86.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				ModuleDefinitionFile=".\ui.def"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="../Debug/ui.pdb"
+				ProgramDatabaseFile="$(IntDir)\ui.pdb"
 				GenerateMapFile="TRUE"
-				MapFileName=".\Debug_TA/uix86.map"
+				MapFileName="$(IntDir)\uix86.map"
 				BaseAddress="0x40000000"
-				ImportLibrary=".\Debug_TA/uix86.lib"
+				ImportLibrary="$(IntDir)\uix86.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@ -360,7 +357,7 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath="..\game\bg_lib.c">
+				RelativePath="..\..\game\bg_lib.c">
 				<FileConfiguration
 					Name="vector|Win32"
 					ExcludedFromBuild="TRUE">
@ -407,7 +404,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\game\bg_misc.c">
+				RelativePath="..\..\game\bg_misc.c">
 				<FileConfiguration
 					Name="vector|Win32">
 					<Tool
@ -451,95 +448,13 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\game\q_math.c">
-				<FileConfiguration
-					Name="vector|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release TA|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug TA|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;MISSIONPACK;$(NoInherit)"
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
+				RelativePath="..\..\qcommon\q_math.c">
 			</File>
 			<File
-				RelativePath="..\game\q_shared.c">
-				<FileConfiguration
-					Name="vector|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release TA|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug TA|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;MISSIONPACK;$(NoInherit)"
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
+				RelativePath="..\..\qcommon\q_shared.c">
 			</File>
 			<File
-				RelativePath="ui.def">
+				RelativePath="..\..\ui\ui.def">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
@ -554,7 +469,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_atoms.c">
+				RelativePath="..\..\ui\ui_atoms.c">
 				<FileConfiguration
 					Name="vector|Win32">
 					<Tool
@ -598,7 +513,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_gameinfo.c">
+				RelativePath="..\..\ui\ui_gameinfo.c">
 				<FileConfiguration
 					Name="vector|Win32">
 					<Tool
@ -641,7 +556,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_main.c">
+				RelativePath="..\..\ui\ui_main.c">
 				<FileConfiguration
 					Name="vector|Win32">
 					<Tool
@ -685,7 +600,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_players.c">
+				RelativePath="..\..\ui\ui_players.c">
 				<FileConfiguration
 					Name="vector|Win32">
 					<Tool
@ -729,7 +644,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_shared.c">
+				RelativePath="..\..\ui\ui_shared.c">
 				<FileConfiguration
 					Name="vector|Win32">
 					<Tool
@ -773,7 +688,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_syscalls.c">
+				RelativePath="..\..\ui\ui_syscalls.c">
 				<FileConfiguration
 					Name="vector|Win32">
 					<Tool
@ -814,56 +729,12 @@
 						BrowseInformation="1"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="ui_util.c">
-				<FileConfiguration
-					Name="vector|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release TA|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;$(NoInherit)"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug TA|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UI_EXPORTS;MISSIONPACK;$(NoInherit)"
-						BasicRuntimeChecks="3"
-						BrowseInformation="1"/>
-				</FileConfiguration>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath="..\game\bg_public.h">
+				RelativePath="..\..\game\bg_public.h">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
@ -878,7 +749,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="keycodes.h">
+				RelativePath="..\..\ui\keycodes.h">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
@ -893,7 +764,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\ui\menudef.h">
+				RelativePath="..\..\..\ui\menudef.h">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
@ -908,7 +779,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\game\q_shared.h">
+				RelativePath="..\..\game\q_shared.h">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
@ -923,7 +794,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\game\surfaceflags.h">
+				RelativePath="..\..\game\surfaceflags.h">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
@ -938,7 +809,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\cgame\tr_types.h">
+				RelativePath="..\..\cgame\tr_types.h">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
@ -953,7 +824,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_local.h">
+				RelativePath="..\..\ui\ui_local.h">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
@ -968,7 +839,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_public.h">
+				RelativePath="..\..\ui\ui_public.h">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">
@ -983,7 +854,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="ui_shared.h">
+				RelativePath="..\..\ui\ui_shared.h">
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="TRUE">