#5818 - Modular renderer and Rend2 support for MSVC.

2013-01-07 20:30:49 -08:00 · 2013-01-07 20:30:49 -08:00 · af77b93597
parent 16952ee08e
commit af77b93597
9 changed files with 2160 additions and 388 deletions
--- a/code/asm/ftola.asm
+++ b/code/asm/ftola.asm
@ -21,6 +21,9 @@
 ; MASM ftol conversion functions using SSE or FPU
 ; assume __cdecl calling convention is being used for x86, __fastcall for x64

+.686p
+.xmm
+
 IFNDEF idx64
 .model flat, c
 ENDIF
--- a/code/asm/snapvector.asm
+++ b/code/asm/snapvector.asm
@ -24,6 +24,9 @@
 ; function prototype:
 ; void qsnapvector(vec3_t vec)

+.686p
+.xmm
+
 IFNDEF idx64
 .model flat, c
 ENDIF
--- a/code/rend2/tr_init.c
+++ b/code/rend2/tr_init.c
@ -1504,7 +1504,7 @@ GetRefAPI
@@@@@@@@@@@@@@@@@@@@@
 */
 #ifdef USE_RENDERER_DLOPEN
-Q_EXPORT refexport_t QDECL *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
+Q_EXPORT refexport_t* QDECL GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 #else
 refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 #endif
--- a/code/renderer/tr_init.c
+++ b/code/renderer/tr_init.c
@ -1324,7 +1324,7 @@ GetRefAPI
@@@@@@@@@@@@@@@@@@@@@
 */
 #ifdef USE_RENDERER_DLOPEN
-Q_EXPORT refexport_t QDECL *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
+Q_EXPORT refexport_t* QDECL GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 #else
 refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 #endif
--- a/misc/msvc/glsl_stringify.vbs
+++ b/misc/msvc/glsl_stringify.vbs
@ -0,0 +1,18 @@
+Dim fso, infile, outfile, line
+Set fso = CreateObject("Scripting.FileSystemObject")
+Set infile = fso.OpenTextFile(WScript.Arguments(0))
+Set outfile = fso.CreateTextFile(WScript.Arguments(1), True)
+
+outfile.WriteLine("const char *fallbackShader_" & fso.GetBaseName(WScript.Arguments(0)) & " =")
+While Not infile.AtEndOfStream
+	line = infile.ReadLine
+	line = Replace(line, "\", "\\")
+	line = Replace(line, Chr(9), "\t")
+	line = Replace(line, Chr(34), "\" & chr(34))
+	line = Chr(34) & line & "\n" & Chr(34)
+	outfile.WriteLine(line)
+Wend
+outfile.WriteLine(";")
+
+infile.Close
+outfile.Close
--- a/misc/msvc/ioq3.sln
+++ b/misc/msvc/ioq3.sln
@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame.vcproj", "{C878E295-CB82-4B40-8ECF-5CE5525466FA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}"
@ -10,6 +10,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcproj", "
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "ui.vcproj", "{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rend2", "rend2.vcproj", "{F7B397A4-8111-421B-A23B-B9A2CE509183}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl1", "opengl1.vcproj", "{CD289B03-887C-4602-BDCE-AB6785A7489E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug TA|Win32 = Debug TA|Win32
@ -54,6 +58,22 @@ Global
 		{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA|Win32.ActiveCfg = Release TA|Win32
 		{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA|Win32.Build.0 = Release TA|Win32
 		{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release|Win32.ActiveCfg = Release|Win32
+		{F7B397A4-8111-421B-A23B-B9A2CE509183}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
+		{F7B397A4-8111-421B-A23B-B9A2CE509183}.Debug TA|Win32.Build.0 = Debug TA|Win32
+		{F7B397A4-8111-421B-A23B-B9A2CE509183}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F7B397A4-8111-421B-A23B-B9A2CE509183}.Debug|Win32.Build.0 = Debug|Win32
+		{F7B397A4-8111-421B-A23B-B9A2CE509183}.Release TA|Win32.ActiveCfg = Release TA|Win32
+		{F7B397A4-8111-421B-A23B-B9A2CE509183}.Release TA|Win32.Build.0 = Release TA|Win32
+		{F7B397A4-8111-421B-A23B-B9A2CE509183}.Release|Win32.ActiveCfg = Release|Win32
+		{F7B397A4-8111-421B-A23B-B9A2CE509183}.Release|Win32.Build.0 = Release|Win32
+		{CD289B03-887C-4602-BDCE-AB6785A7489E}.Debug TA|Win32.ActiveCfg = Debug TA|Win32
+		{CD289B03-887C-4602-BDCE-AB6785A7489E}.Debug TA|Win32.Build.0 = Debug TA|Win32
+		{CD289B03-887C-4602-BDCE-AB6785A7489E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CD289B03-887C-4602-BDCE-AB6785A7489E}.Debug|Win32.Build.0 = Debug|Win32
+		{CD289B03-887C-4602-BDCE-AB6785A7489E}.Release TA|Win32.ActiveCfg = Release TA|Win32
+		{CD289B03-887C-4602-BDCE-AB6785A7489E}.Release TA|Win32.Build.0 = Release TA|Win32
+		{CD289B03-887C-4602-BDCE-AB6785A7489E}.Release|Win32.ActiveCfg = Release|Win32
+		{CD289B03-887C-4602-BDCE-AB6785A7489E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/misc/msvc/opengl1.vcproj
+++ b/misc/msvc/opengl1.vcproj
@ -0,0 +1,932 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="opengl1"
+	ProjectGUID="{CD289B03-887C-4602-BDCE-AB6785A7489E}"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release TA|Win32"
+			OutputDirectory="..\..\build\opengl1_release_ta"
+			IntermediateDirectory="..\..\build\opengl1_release_ta"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName="$(IntDir)\opengl1.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
+				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;HAVE_CONFIG_H;MISSIONPACK;USE_RENDERER_DLOPEN"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(IntDir)\opengl1.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
+				OutputFile="$(OutDir)\renderer_opengl1_x86.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\code\libs\win32"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(IntDir)\opengl1.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(IntDir)\opengl1.map"
+				SubSystem="2"
+				StackReserveSize="8388608"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Post build processing.."
+				CommandLine="rem bash -c &quot;perl ./unix/cons -- release-TA&quot;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\build\opengl1_debug"
+			IntermediateDirectory="..\..\build\opengl1_debug"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName="$(IntDir)\opengl1.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
+				PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;HAVE_CONFIG_H;USE_INTERNAL_JPEG;USE_RENDERER_DLOPEN"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(IntDir)\opengl1.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				BrowseInformation="1"
+				BrowseInformationFile="$(IntDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				ResourceOutputFileName="..\winquake.res"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
+				OutputFile="$(OutDir)\renderer_opengl1_x86.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\code\libs\win32"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\opengl1.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(IntDir)\opengl1.map"
+				SubSystem="2"
+				StackReserveSize="8388608"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Post build processing.."
+				CommandLine="rem bash -c &quot;perl ./unix/cons -- debug&quot;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\build\opengl1_release"
+			IntermediateDirectory="..\..\build\opengl1_release"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName="$(IntDir)\opengl1.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="2"
+				AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
+				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;HAVE_CONFIG_H;USE_INTERNAL_JPEG;USE_RENDERER_DLOPEN"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(IntDir)\opengl1.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
+				OutputFile="$(OutDir)\renderer_opengl1_x86.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\code\libs\win32"
+				GenerateDebugInformation="false"
+				ProgramDatabaseFile="$(IntDir)\opengl1.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(IntDir)\opengl1.map"
+				SubSystem="2"
+				StackReserveSize="8388608"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug TA|Win32"
+			OutputDirectory="..\..\build\opengl1_debug_ta"
+			IntermediateDirectory="..\..\build\opengl1_debug_ta"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName="$(IntDir)\opengl1.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
+				PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;HAVE_CONFIG_H;MISSIONPACK;USE_RENDERER_DLOPEN"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile="$(IntDir)\opengl1.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
+				BrowseInformation="1"
+				BrowseInformationFile="$(IntDir)\"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="1"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				ResourceOutputFileName="..\winquake.res"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
+				OutputFile="$(OutDir)\renderer_opengl1_x86.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\code\libs\win32"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\opengl1.pdb"
+				GenerateMapFile="true"
+				MapFileName="$(IntDir)\opengl1.map"
+				SubSystem="2"
+				StackReserveSize="8388608"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Post build processing.."
+				CommandLine="rem bash -c &quot;perl ./unix/cons -- debug-TA&quot;"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+			>
+			<File
+				RelativePath="..\..\code\qcommon\puff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\.\qcommon\q_math.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\.\qcommon\q_shared.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\sdl\sdl_gamma.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\sdl\sdl_glimp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_animation.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_backend.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_bsp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_cmds.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_curve.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_flares.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_font.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_image.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_image_bmp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_image_jpg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_image_pcx.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_image_png.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_image_tga.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_init.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_light.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_main.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_marks.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_mesh.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_model.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_model_iqm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_noise.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_scene.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_shade.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_shade_calc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_shader.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_shadows.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_sky.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_subs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_surface.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_world.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;fi;fd"
+			>
+			<File
+				RelativePath="..\..\code\qcommon\puff.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\.\qcommon\q_shared.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\qcommon\qcommon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\qcommon\qfiles.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\qgl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\win32\resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\server\server.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\client\snd_local.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\client\snd_public.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\.\qcommon\surfaceflags.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\opengl1\tr_extramath.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\opengl1\tr_extratypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\opengl1\tr_fbo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\opengl1\tr_local.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\opengl1\tr_postprocess.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\renderer\tr_public.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\cgame\tr_types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\ui\ui_public.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\qcommon\unzip.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\qcommon\vm_local.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\win32\win_local.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+		<Filter
+			Name="jpeg"
+			>
+			<Filter
+				Name="Source Files"
+				>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jaricom.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcapimin.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcapistd.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcarith.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jccoefct.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jccolor.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcdctmgr.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jchuff.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcinit.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcmainct.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcmarker.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcmaster.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcomapi.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcparam.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcprepct.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jcsample.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jctrans.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdapimin.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdapistd.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdarith.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdatadst.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdatasrc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdcoefct.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdcolor.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jddctmgr.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdhuff.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdinput.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdmainct.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdmarker.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdmaster.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdmerge.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdpostct.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdsample.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jdtrans.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jerror.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jfdctflt.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jfdctfst.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jfdctint.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jidctflt.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jidctfst.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jidctint.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jmemmgr.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jmemnobs.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jquant1.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jquant2.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-8c\jutils.c"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Header Files"
+				>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jchuff.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jconfig.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jdct.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jdhuff.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jerror.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jinclude.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jmemsys.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jmorecfg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jpegint.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jpeglib.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\jpeg-6b\jversion.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="zlib"
+			>
+			<File
+				RelativePath="..\..\code\zlib\adler32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\zlib\crc32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\zlib\inffast.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\zlib\inflate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\zlib\inftrees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\zlib\zutil.c"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/misc/msvc/quake3.vcproj
+++ b/misc/msvc/quake3.vcproj
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="quake3"
 	ProjectGUID="{81CB51C4-B434-4E12-B69B-BAEE102F2852}"
 	TargetFrameworkVersion="131072"
@ -48,7 +48,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
-				PreprocessorDefinitions="_WIN32; WIN32; NDEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H; MISSIONPACK"
+				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;HAVE_CONFIG_H;MISSIONPACK;USE_RENDERER_DLOPEN"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@ -74,10 +74,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
-				OutputFile="$(OutDir)\ioquake3.exe"
+				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib gdi32.lib"
+				OutputFile="$(OutDir)\ioquake3.x86.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\code\libs\win32"
 				GenerateDebugInformation="false"
 				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
 				GenerateMapFile="true"
@ -145,7 +146,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
-				PreprocessorDefinitions="_WIN32; WIN32; _DEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H;USE_INTERNAL_JPEG"
+				PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;HAVE_CONFIG_H;USE_INTERNAL_JPEG;USE_RENDERER_DLOPEN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="$(IntDir)\quake3.pch"
@ -173,10 +174,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
-				OutputFile="$(OutDir)\ioquake3.exe"
+				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib gdi32.lib"
+				OutputFile="$(OutDir)\ioquake3.x86.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\code\libs\win32"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
@ -246,7 +248,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
-				PreprocessorDefinitions="_WIN32; WIN32; NDEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H;USE_INTERNAL_JPEG"
+				PreprocessorDefinitions="_WIN32;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;HAVE_CONFIG_H;USE_INTERNAL_JPEG;USE_RENDERER_DLOPEN"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@ -272,10 +274,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
-				OutputFile="$(OutDir)\ioquake3.exe"
+				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib gdi32.lib"
+				OutputFile="$(OutDir)\ioquake3.x86.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\code\libs\win32"
 				GenerateDebugInformation="false"
 				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
 				GenerateMapFile="true"
@ -341,7 +344,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\code\SDL12\include;..\..\code\libcurl;..\..\code\AL;..\..\code\libspeex\include;..\..\code\zlib;&quot;..\..\code\jpeg-8c&quot;"
-				PreprocessorDefinitions="_WIN32; WIN32; _DEBUG; _WINDOWS; _CRT_SECURE_NO_DEPRECATE; BOTLIB; USE_ICON; USE_CURL; USE_CURL_DLOPEN; USE_OPENAL; USE_OPENAL_DLOPEN; USE_VOIP; HAVE_CONFIG_H; MISSIONPACK"
+				PreprocessorDefinitions="_WIN32;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;HAVE_CONFIG_H;MISSIONPACK;USE_RENDERER_DLOPEN"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile="$(IntDir)\quake3.pch"
@ -369,10 +372,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib"
-				OutputFile="$(OutDir)\ioquake3.exe"
+				AdditionalDependencies="user32.lib advapi32.lib winmm.lib wsock32.lib ws2_32.lib SDLmain.lib SDL.lib OpenGL32.lib msvcrt.lib psapi.lib gdi32.lib"
+				OutputFile="$(OutDir)\ioquake3.x86.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\code\libs\win32"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\quake3.pdb"
 				GenerateMapFile="true"
@ -1248,6 +1252,50 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\code\asm\ftola.asm"
+				>
+				<FileConfiguration
+					Name="Release TA|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling..."
+						CommandLine="ml /c /Zi /Fo&quot;$(OutDir)\$(InputName).asm.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\$(InputName).asm.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling..."
+						CommandLine="ml /c /Zi /Fo&quot;$(OutDir)\$(InputName).asm.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\$(InputName).asm.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling..."
+						CommandLine="ml /c /Zi /Fo&quot;$(OutDir)\$(InputName).asm.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\$(InputName).asm.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug TA|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling..."
+						CommandLine="ml /c /Zi /Fo&quot;$(OutDir)\$(InputName).asm.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\$(InputName).asm.obj"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\code\qcommon\huffman.c"
 				>
@ -1526,14 +1574,6 @@
 				RelativePath="..\..\code\client\qal.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\code\sdl\sdl_gamma.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\code\sdl\sdl_glimp.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\code\sdl\sdl_input.c"
 				>
@ -1542,6 +1582,50 @@
 				RelativePath="..\..\code\sdl\sdl_snd.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\asm\snapvector.asm"
+				>
+				<FileConfiguration
+					Name="Release TA|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling..."
+						CommandLine="ml /c /Zi /Fo&quot;$(OutDir)\$(InputName).asm.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\$(InputName).asm.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling..."
+						CommandLine="ml /c /Zi /Fo&quot;$(OutDir)\$(InputName).asm.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\$(InputName).asm.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling..."
+						CommandLine="ml /c /Zi /Fo&quot;$(OutDir)\$(InputName).asm.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\$(InputName).asm.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug TA|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Assembling..."
+						CommandLine="ml /c /Zi /Fo&quot;$(OutDir)\$(InputName).asm.obj&quot; &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+						Outputs="$(OutDir)\$(InputName).asm.obj"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\code\client\snd_adpcm.c"
 				>
@ -2479,246 +2563,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="jpeg"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jaricom.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcapimin.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcapistd.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcarith.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jccoefct.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jccolor.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcdctmgr.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jchuff.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcinit.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcmainct.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcmarker.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcmaster.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcomapi.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcparam.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcprepct.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jcsample.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jctrans.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdapimin.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdapistd.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdarith.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdatadst.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdatasrc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdcoefct.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdcolor.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jddctmgr.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdhuff.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdinput.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdmainct.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdmarker.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdmaster.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdmerge.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdpostct.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdsample.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jdtrans.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jerror.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jfdctflt.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jfdctfst.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jfdctint.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jidctflt.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jidctfst.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jidctint.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jmemmgr.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jmemnobs.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jquant1.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jquant2.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-8c\jutils.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jchuff.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jconfig.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jdct.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jdhuff.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jerror.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jinclude.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jmemsys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jmorecfg.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jpegint.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jpeglib.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\jpeg-6b\jversion.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
 		<Filter
 			Name="botlib"
 			>
@ -2943,130 +2787,6 @@
 				</File>
 			</Filter>
 		</Filter>
-		<Filter
-			Name="renderer"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath="..\..\code\renderer\tr_animation.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_backend.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_bsp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_cmds.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_curve.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_flares.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_font.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_image.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_image_bmp.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_image_jpg.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_image_pcx.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_image_png.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_image_tga.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_init.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_light.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_main.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_marks.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_mesh.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_model.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_model_iqm.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_noise.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_scene.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_shade.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_shade_calc.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_shader.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_shadows.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_sky.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_surface.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\code\renderer\tr_world.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
 		<Filter
 			Name="speex"
 			>
--- a/misc/msvc/rend2.vcproj
+++ b/misc/msvc/rend2.vcproj