From acce0e5452752f5346d3f6eacf10658bf4b21f0d Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Tue, 30 Jan 2018 05:04:01 -0600
Subject: [PATCH] Fix building msvc12 project

* Don't try to embed manifest (it causes build to fail because it's
  specified in win_resource.rc).
* Fix curl include path.
* Compile sys_autoupdater.c.
* Make quake3 debug link to msvcrtd.lib instead of msvcrt.lib to fix
  unresolved external symbol __imp___CrtDbgReportW.
* Fix q3_ui dll output directory.
* Fix opus path filter.
* Use UseOfMfc false and CharacterSet NotSet.
* Fix header paths and remove non-existent files.
---
 misc/msvc12/cgame.vcxproj          |   4 +
 misc/msvc12/game.vcxproj           |   4 +
 misc/msvc12/opengl1.vcxproj        |   4 +
 misc/msvc12/opengl2.vcxproj        |   4 +
 misc/msvc12/q3_ui.vcxproj          |  28 +--
 misc/msvc12/quake3.vcxproj         |  35 ++--
 misc/msvc12/quake3.vcxproj.filters | 283 ++++++++++++++---------------
 misc/msvc12/ui.vcxproj             |   8 +-
 8 files changed, 196 insertions(+), 174 deletions(-)

diff --git a/misc/msvc12/cgame.vcxproj b/misc/msvc12/cgame.vcxproj
index 6aa1afce..f740c5fa 100644
--- a/misc/msvc12/cgame.vcxproj
+++ b/misc/msvc12/cgame.vcxproj
@@ -27,21 +27,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/misc/msvc12/game.vcxproj b/misc/msvc12/game.vcxproj
index abd03969..8aa2a512 100644
--- a/misc/msvc12/game.vcxproj
+++ b/misc/msvc12/game.vcxproj
@@ -26,21 +26,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/misc/msvc12/opengl1.vcxproj b/misc/msvc12/opengl1.vcxproj
index 5427d376..2bc878e9 100644
--- a/misc/msvc12/opengl1.vcxproj
+++ b/misc/msvc12/opengl1.vcxproj
@@ -26,21 +26,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/misc/msvc12/opengl2.vcxproj b/misc/msvc12/opengl2.vcxproj
index 2f91590e..5a837890 100644
--- a/misc/msvc12/opengl2.vcxproj
+++ b/misc/msvc12/opengl2.vcxproj
@@ -27,21 +27,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/misc/msvc12/q3_ui.vcxproj b/misc/msvc12/q3_ui.vcxproj
index 9a345618..e59a237b 100644
--- a/misc/msvc12/q3_ui.vcxproj
+++ b/misc/msvc12/q3_ui.vcxproj
@@ -26,25 +26,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -66,24 +66,28 @@
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">
-    <OutDir>..\..\build\q3_ui_debug_ta\</OutDir>
-    <IntDir>..\..\build\q3_ui_debug_ta\</IntDir>
+    <OutDir>..\..\build\debug_ta-msvc12-x86\missionpack\</OutDir>
+    <IntDir>..\..\build\debug_ta-msvc12-x86\missionpack\q3_ui\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>uix86_old</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">
-    <OutDir>..\..\build\q3_ui_release_ta\</OutDir>
-    <IntDir>..\..\build\q3_ui_release_ta\</IntDir>
+    <OutDir>..\..\build\release_ta-msvc12-x86\missionpack\</OutDir>
+    <IntDir>..\..\build\release_ta-msvc12-x86\missionpack\q3_ui\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>uix86_old</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>..\..\build\q3_ui_release\</OutDir>
-    <IntDir>..\..\build\q3_ui_release\</IntDir>
+    <OutDir>..\..\build\release-msvc12-x86\baseq3\</OutDir>
+    <IntDir>..\..\build\release-msvc12-x86\baseq3\q3_ui\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>uix86</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>..\..\build\q3_ui_debug\</OutDir>
-    <IntDir>..\..\build\q3_ui_debug\</IntDir>
+    <OutDir>..\..\build\debug-msvc12-x86\baseq3\</OutDir>
+    <IntDir>..\..\build\debug-msvc12-x86\baseq3\q3_ui\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <TargetName>uix86</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">
     <Midl>
diff --git a/misc/msvc12/quake3.vcxproj b/misc/msvc12/quake3.vcxproj
index 7a35e8e8..992fc5ea 100644
--- a/misc/msvc12/quake3.vcxproj
+++ b/misc/msvc12/quake3.vcxproj
@@ -26,21 +26,25 @@
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -66,24 +70,28 @@
     <IntDir>..\..\build\release_ta-msvc12-x86\client\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <TargetName>ioquake3.x86</TargetName>
+    <EmbedManifest>false</EmbedManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>..\..\build\debug-msvc12-x86\</OutDir>
     <IntDir>..\..\build\debug-msvc12-x86\client\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <TargetName>ioquake3.x86</TargetName>
+    <EmbedManifest>false</EmbedManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>..\..\build\release-msvc12-x86\</OutDir>
     <IntDir>..\..\build\release-msvc12-x86\client\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <TargetName>ioquake3.x86</TargetName>
+    <EmbedManifest>false</EmbedManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">
     <OutDir>..\..\build\debug_ta-msvc12-x86\</OutDir>
     <IntDir>..\..\build\debug_ta-msvc12-x86\client\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <TargetName>ioquake3.x86</TargetName>
+    <EmbedManifest>false</EmbedManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">
     <Midl>
@@ -97,7 +105,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\code\SDL2\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\opus-1.1.4\include;..\..\code\opus-1.1.4\celt;..\..\code\opus-1.1.4\silk;..\..\code\opus-1.1.4\silk\float;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\code\SDL2\include;..\..\code\curl-7.54.0\include;..\..\code\AL;..\..\code\opus-1.1.4\include;..\..\code\opus-1.1.4\celt;..\..\code\opus-1.1.4\silk;..\..\code\opus-1.1.4\silk\float;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN32;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;OPUS_BUILD;HAVE_LRINTF;FLOATING_POINT;FLOAT_APPROX;USE_ALLOCA;MISSIONPACK;USE_RENDERER_DLOPEN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -149,7 +157,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\code\SDL2\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\opus-1.1.4\include;..\..\code\opus-1.1.4\celt;..\..\code\opus-1.1.4\silk;..\..\code\opus-1.1.4\silk\float;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\code\SDL2\include;..\..\code\curl-7.54.0\include;..\..\code\AL;..\..\code\opus-1.1.4\include;..\..\code\opus-1.1.4\celt;..\..\code\opus-1.1.4\silk;..\..\code\opus-1.1.4\silk\float;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN32;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;OPUS_BUILD;HAVE_LRINTF;FLOATING_POINT;FLOAT_APPROX;USE_ALLOCA;USE_INTERNAL_JPEG;USE_RENDERER_DLOPEN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
@@ -171,7 +179,7 @@
       <ResourceOutputFileName>..\winquake.res</ResourceOutputFileName>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>user32.lib;advapi32.lib;winmm.lib;wsock32.lib;ws2_32.lib;SDL2main.lib;SDL2.lib;OpenGL32.lib;msvcrt.lib;psapi.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>user32.lib;advapi32.lib;winmm.lib;wsock32.lib;ws2_32.lib;SDL2main.lib;SDL2.lib;OpenGL32.lib;msvcrtd.lib;psapi.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)ioquake3.x86.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\code\libs\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -202,7 +210,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\code\SDL2\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\opus-1.1.4\include;..\..\code\opus-1.1.4\celt;..\..\code\opus-1.1.4\silk;..\..\code\opus-1.1.4\silk\float;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\code\SDL2\include;..\..\code\curl-7.54.0\include;..\..\code\AL;..\..\code\opus-1.1.4\include;..\..\code\opus-1.1.4\celt;..\..\code\opus-1.1.4\silk;..\..\code\opus-1.1.4\silk\float;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN32;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;OPUS_BUILD;HAVE_LRINTF;FLOATING_POINT;FLOAT_APPROX;USE_ALLOCA;USE_INTERNAL_JPEG;USE_RENDERER_DLOPEN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -248,7 +256,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\code\SDL2\include;..\..\code\libcurl-7.35.0;..\..\code\AL;..\..\code\opus-1.1.4\include;..\..\code\opus-1.1.4\celt;..\..\code\opus-1.1.4\silk;..\..\code\opus-1.1.4\silk\float;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\code\SDL2\include;..\..\code\curl-7.54.0\include;..\..\code\AL;..\..\code\opus-1.1.4\include;..\..\code\opus-1.1.4\celt;..\..\code\opus-1.1.4\silk;..\..\code\opus-1.1.4\silk\float;..\..\code\zlib;..\..\code\jpeg-8c;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WIN32;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOTLIB;USE_ICON;USE_CURL;USE_CURL_DLOPEN;USE_OPENAL;USE_OPENAL_DLOPEN;USE_VOIP;OPUS_BUILD;HAVE_LRINTF;FLOATING_POINT;FLOAT_APPROX;USE_ALLOCA;MISSIONPACK;USE_RENDERER_DLOPEN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
@@ -270,7 +278,7 @@
       <ResourceOutputFileName>..\winquake.res</ResourceOutputFileName>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>user32.lib;advapi32.lib;winmm.lib;wsock32.lib;ws2_32.lib;SDL2main.lib;SDL2.lib;OpenGL32.lib;msvcrt.lib;psapi.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>user32.lib;advapi32.lib;winmm.lib;wsock32.lib;ws2_32.lib;SDL2main.lib;SDL2.lib;OpenGL32.lib;msvcrtd.lib;psapi.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)ioquake3.x86.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\code\libs\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -856,6 +864,7 @@
     </ClCompile>
     <ClCompile Include="..\..\code\sys\con_log.c" />
     <ClCompile Include="..\..\code\sys\con_passive.c" />
+    <ClCompile Include="..\..\code\sys\sys_autoupdater.c" />
     <ClCompile Include="..\..\code\sys\sys_main.c" />
     <ClCompile Include="..\..\code\sys\sys_win32.c" />
     <ClCompile Include="..\..\code\zlib\adler32.c" />
@@ -930,16 +939,15 @@
     <ClInclude Include="..\..\code\botlib\l_struct.h" />
     <ClInclude Include="..\..\code\botlib\l_utils.h" />
     <ClInclude Include="..\..\code\cgame\cg_public.h" />
-    <ClInclude Include="..\..\code\cgame\tr_types.h" />
     <ClInclude Include="..\..\code\client\client.h" />
     <ClInclude Include="..\..\code\client\cl_curl.h" />
+    <ClInclude Include="..\..\code\client\keycodes.h" />
     <ClInclude Include="..\..\code\client\keys.h" />
     <ClInclude Include="..\..\code\client\qal.h" />
     <ClInclude Include="..\..\code\client\snd_local.h" />
     <ClInclude Include="..\..\code\client\snd_public.h" />
     <ClInclude Include="..\..\code\game\bg_public.h" />
     <ClInclude Include="..\..\code\game\g_public.h" />
-    <ClInclude Include="..\..\code\libspeex\config.h" />
     <ClInclude Include="..\..\code\qcommon\cm_local.h" />
     <ClInclude Include="..\..\code\qcommon\cm_patch.h" />
     <ClInclude Include="..\..\code\qcommon\cm_polylib.h" />
@@ -951,15 +959,12 @@
     <ClInclude Include="..\..\code\qcommon\surfaceflags.h" />
     <ClInclude Include="..\..\code\qcommon\unzip.h" />
     <ClInclude Include="..\..\code\qcommon\vm_local.h" />
-    <ClInclude Include="..\..\code\renderer\qgl.h" />
-    <ClInclude Include="..\..\code\renderer\tr_local.h" />
-    <ClInclude Include="..\..\code\renderer\tr_public.h" />
+    <ClInclude Include="..\..\code\renderercommon\qgl.h" />
+    <ClInclude Include="..\..\code\renderercommon\tr_types.h" />
+    <ClInclude Include="..\..\code\renderercommon\tr_public.h" />
     <ClInclude Include="..\..\code\server\server.h" />
     <ClInclude Include="..\..\code\sys\win_resource.h" />
-    <ClInclude Include="..\..\code\ui\keycodes.h" />
     <ClInclude Include="..\..\code\ui\ui_public.h" />
-    <ClInclude Include="..\..\code\win32\resource.h" />
-    <ClInclude Include="..\..\code\win32\win_local.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\code\sys\win_resource.rc" />
diff --git a/misc/msvc12/quake3.vcxproj.filters b/misc/msvc12/quake3.vcxproj.filters
index 0cb1d4b5..73295561 100644
--- a/misc/msvc12/quake3.vcxproj.filters
+++ b/misc/msvc12/quake3.vcxproj.filters
@@ -60,411 +60,412 @@
     <ClCompile Include="..\..\code\server\sv_world.c" />
     <ClCompile Include="..\..\code\sys\con_log.c" />
     <ClCompile Include="..\..\code\sys\con_passive.c" />
+    <ClCompile Include="..\..\code\sys\sys_autoupdater.c" />
     <ClCompile Include="..\..\code\sys\sys_main.c" />
     <ClCompile Include="..\..\code\sys\sys_win32.c" />
-    <ClCompile Include="..\..\code\opus-1.1\src\analysis.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\src\analysis.c">
       <Filter>opus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\src\mlp.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\src\mlp.c">
       <Filter>opus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\src\mlp_data.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\src\mlp_data.c">
       <Filter>opus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\src\opus.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\src\opus.c">
       <Filter>opus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\src\opus_decoder.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\src\opus_decoder.c">
       <Filter>opus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\src\opus_encoder.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\src\opus_encoder.c">
       <Filter>opus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\src\opus_multistream.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\src\opus_multistream.c">
       <Filter>opus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\src\opus_multistream_decoder.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\src\opus_multistream_decoder.c">
       <Filter>opus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\src\opus_multistream_encoder.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\src\opus_multistream_encoder.c">
       <Filter>opus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\src\repacketizer.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\src\repacketizer.c">
       <Filter>opus</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\bands.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\bands.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\celt.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\celt.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\celt_decoder.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\celt_decoder.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\celt_encoder.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\celt_encoder.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\celt_lpc.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\celt_lpc.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\cwrs.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\cwrs.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\entcode.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\entcode.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\entdec.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\entdec.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\entenc.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\entenc.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\kiss_fft.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\kiss_fft.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\laplace.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\laplace.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\mathops.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\mathops.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\mdct.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\mdct.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\modes.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\modes.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\pitch.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\pitch.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\quant_bands.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\quant_bands.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\rate.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\rate.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\celt\vq.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\celt\vq.c">
       <Filter>opus\celt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\resampler_rom.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\resampler_rom.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\shell_coder.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\shell_coder.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\sigm_Q15.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\sigm_Q15.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\sort.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\sort.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\stereo_decode_pred.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\stereo_decode_pred.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\stereo_encode_pred.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\stereo_encode_pred.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\stereo_find_predictor.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\stereo_find_predictor.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\stereo_LR_to_MS.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\stereo_LR_to_MS.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\stereo_MS_to_LR.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\stereo_MS_to_LR.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\stereo_quant_pred.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\stereo_quant_pred.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\sum_sqr_shift.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\sum_sqr_shift.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\table_LSF_cos.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\table_LSF_cos.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\tables_gain.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\tables_gain.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\tables_LTP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\tables_LTP.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\tables_NLSF_CB_NB_MB.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\tables_NLSF_CB_NB_MB.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\tables_NLSF_CB_WB.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\tables_NLSF_CB_WB.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\tables_other.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\tables_other.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\tables_pitch_lag.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\tables_pitch_lag.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\tables_pulses_per_block.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\tables_pulses_per_block.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\VAD.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\VAD.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\VQ_WMat_EC.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\VQ_WMat_EC.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\A2NLSF.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\A2NLSF.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\ana_filt_bank_1.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\ana_filt_bank_1.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\biquad_alt.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\biquad_alt.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\bwexpander.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\bwexpander.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\bwexpander_32.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\bwexpander_32.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\check_control_input.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\check_control_input.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\CNG.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\CNG.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\code_signs.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\code_signs.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\control_audio_bandwidth.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\control_audio_bandwidth.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\control_codec.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\control_codec.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\control_SNR.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\control_SNR.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\debug.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\debug.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\dec_API.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\dec_API.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\decode_core.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\decode_core.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\decode_frame.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\decode_frame.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\decode_indices.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\decode_indices.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\decode_parameters.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\decode_parameters.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\decode_pitch.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\decode_pitch.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\decode_pulses.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\decode_pulses.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\decoder_set_fs.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\decoder_set_fs.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\enc_API.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\enc_API.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\encode_indices.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\encode_indices.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\encode_pulses.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\encode_pulses.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\gain_quant.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\gain_quant.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\HP_variable_cutoff.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\HP_variable_cutoff.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\init_decoder.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\init_decoder.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\init_encoder.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\init_encoder.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\inner_prod_aligned.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\inner_prod_aligned.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\interpolate.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\interpolate.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\lin2log.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\lin2log.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\log2lin.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\log2lin.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\LP_variable_cutoff.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\LP_variable_cutoff.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\LPC_analysis_filter.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\LPC_analysis_filter.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\LPC_inv_pred_gain.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\LPC_inv_pred_gain.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\NLSF_decode.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\NLSF_decode.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\NLSF_del_dec_quant.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\NLSF_del_dec_quant.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\NLSF_encode.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\NLSF_encode.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\NLSF_stabilize.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\NLSF_stabilize.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\NLSF_unpack.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\NLSF_unpack.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\NLSF_VQ.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\NLSF_VQ.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\NLSF_VQ_weights_laroia.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\NLSF_VQ_weights_laroia.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\NLSF2A.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\NLSF2A.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\NSQ.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\NSQ.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\NSQ_del_dec.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\NSQ_del_dec.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\pitch_est_tables.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\pitch_est_tables.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\PLC.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\PLC.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\process_NLSFs.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\process_NLSFs.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\quant_LTP_gains.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\quant_LTP_gains.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\resampler.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\resampler.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\resampler_down2.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\resampler_down2.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\resampler_down2_3.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\resampler_down2_3.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\resampler_private_AR2.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\resampler_private_AR2.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\resampler_private_down_FIR.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\resampler_private_down_FIR.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\resampler_private_IIR_FIR.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\resampler_private_IIR_FIR.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\resampler_private_up2_HQ.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\resampler_private_up2_HQ.c">
       <Filter>opus\silk</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\apply_sine_window_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\apply_sine_window_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\autocorrelation_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\autocorrelation_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\burg_modified_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\burg_modified_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\bwexpander_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\bwexpander_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\corrMatrix_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\corrMatrix_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\encode_frame_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\encode_frame_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\energy_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\energy_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\find_LPC_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\find_LPC_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\find_LTP_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\find_LTP_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\find_pitch_lags_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\find_pitch_lags_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\find_pred_coefs_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\find_pred_coefs_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\inner_product_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\inner_product_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\k2a_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\k2a_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\levinsondurbin_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\levinsondurbin_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\LPC_analysis_filter_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\LPC_analysis_filter_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\LPC_inv_pred_gain_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\LPC_inv_pred_gain_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\LTP_analysis_filter_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\LTP_analysis_filter_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\LTP_scale_ctrl_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\LTP_scale_ctrl_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\noise_shape_analysis_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\noise_shape_analysis_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\pitch_analysis_core_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\pitch_analysis_core_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\prefilter_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\prefilter_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\process_gains_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\process_gains_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\regularize_correlations_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\regularize_correlations_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\residual_energy_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\residual_energy_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\scale_copy_vector_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\scale_copy_vector_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\scale_vector_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\scale_vector_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\schur_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\schur_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\solve_LS_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\solve_LS_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\sort_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\sort_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\warped_autocorrelation_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\warped_autocorrelation_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\code\opus-1.1\silk\float\wrappers_FLP.c">
+    <ClCompile Include="..\..\code\opus-1.1.4\silk\float\wrappers_FLP.c">
       <Filter>opus\silk\float</Filter>
     </ClCompile>
     <ClCompile Include="..\..\code\botlib\be_aas_bspq3.c">
@@ -572,16 +573,15 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\code\cgame\cg_public.h" />
-    <ClInclude Include="..\..\code\cgame\tr_types.h" />
     <ClInclude Include="..\..\code\client\client.h" />
     <ClInclude Include="..\..\code\client\cl_curl.h" />
+    <ClInclude Include="..\..\code\client\keycodes.h" />
     <ClInclude Include="..\..\code\client\keys.h" />
     <ClInclude Include="..\..\code\client\qal.h" />
     <ClInclude Include="..\..\code\client\snd_local.h" />
     <ClInclude Include="..\..\code\client\snd_public.h" />
     <ClInclude Include="..\..\code\game\bg_public.h" />
     <ClInclude Include="..\..\code\game\g_public.h" />
-    <ClInclude Include="..\..\code\libspeex\config.h" />
     <ClInclude Include="..\..\code\qcommon\cm_local.h" />
     <ClInclude Include="..\..\code\qcommon\cm_patch.h" />
     <ClInclude Include="..\..\code\qcommon\cm_polylib.h" />
@@ -593,15 +593,12 @@
     <ClInclude Include="..\..\code\qcommon\surfaceflags.h" />
     <ClInclude Include="..\..\code\qcommon\unzip.h" />
     <ClInclude Include="..\..\code\qcommon\vm_local.h" />
-    <ClInclude Include="..\..\code\renderer\qgl.h" />
-    <ClInclude Include="..\..\code\renderer\tr_local.h" />
-    <ClInclude Include="..\..\code\renderer\tr_public.h" />
+    <ClInclude Include="..\..\code\renderercommon\qgl.h" />
+    <ClInclude Include="..\..\code\renderercommon\tr_types.h" />
+    <ClInclude Include="..\..\code\renderercommon\tr_public.h" />
     <ClInclude Include="..\..\code\server\server.h" />
     <ClInclude Include="..\..\code\sys\win_resource.h" />
-    <ClInclude Include="..\..\code\ui\keycodes.h" />
     <ClInclude Include="..\..\code\ui\ui_public.h" />
-    <ClInclude Include="..\..\code\win32\resource.h" />
-    <ClInclude Include="..\..\code\win32\win_local.h" />
     <ClInclude Include="..\..\code\botlib\aasfile.h">
       <Filter>botlib</Filter>
     </ClInclude>
diff --git a/misc/msvc12/ui.vcxproj b/misc/msvc12/ui.vcxproj
index a5584ba4..78205ec6 100644
--- a/misc/msvc12/ui.vcxproj
+++ b/misc/msvc12/ui.vcxproj
@@ -26,25 +26,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">