From 6ca6df857f29b74704cef4921509c2fc24955b78 Mon Sep 17 00:00:00 2001
From: Xottab-DUTY <xottab-duty@yandex.ru>
Date: Sat, 5 Aug 2017 18:54:12 +0500
Subject: [PATCH] Fix project files

---
 Externals/BugTrap.vcxproj                    |   8 +-
 Externals/cryptlib.vcxproj                   |   2 +-
 Externals/cximage/cximage.vcxproj            |   6 +-
 Externals/libogg_static.vcxproj              |   8 +-
 Externals/libtheora_static.vcxproj           |   8 +-
 Externals/libvorbis_static.vcxproj           |   8 +-
 Externals/libvorbisfile_static.vcxproj       |   8 +-
 Externals/zlib.vcxproj                       |   8 +-
 src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj |   3 -
 src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj |   3 -
 src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj |   3 -
 src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj |   3 -
 src/dummy/dummy.vcxproj                      |   4 +-
 src/engine.sln                               | 116 +++++--------------
 src/utils/ETools/ETools.vcxproj              |   3 -
 src/utils/xrAI/xrAI.vcxproj                  |   3 -
 src/utils/xrDXT/DXT.vcxproj                  |   3 -
 src/utils/xrLC/xrLC.vcxproj                  |   5 -
 src/utils/xrLCUtil/xrLCUtil.vcxproj          |   3 +-
 src/utils/xrLC_Light/xrLC_Light.vcxproj      |   2 -
 src/utils/xrMiscMath/xrMiscMath.vcxproj      |   6 +-
 src/xrAICore/xrAICore.vcxproj                |   3 -
 src/xrCDB/xrCDB.vcxproj                      |   3 -
 src/xrCore/xrCore.vcxproj                    |  43 +------
 src/xrEngine/xrEngine.vcxproj                |   3 -
 src/xrGame/xrGame.vcxproj                    |   3 -
 src/xrGameSpy/xrGameSpy.vcxproj              |   3 -
 src/xrMisc/xrMisc.vcxproj                    |   4 +-
 src/xrParticles/xrParticles.vcxproj          |   3 -
 src/xrPhysics/xrPhysics.vcxproj              |   3 -
 src/xrScriptEngine/xrScriptEngine.vcxproj    |   3 +-
 src/xrSound/xrSound.vcxproj                  |   5 +-
 32 files changed, 71 insertions(+), 218 deletions(-)

diff --git a/Externals/BugTrap.vcxproj b/Externals/BugTrap.vcxproj
index 8aa6354e9a2..3dde8ef67ad 100644
--- a/Externals/BugTrap.vcxproj
+++ b/Externals/BugTrap.vcxproj
@@ -51,19 +51,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/Externals/cryptlib.vcxproj b/Externals/cryptlib.vcxproj
index c061ed88e64..99b3f364e22 100644
--- a/Externals/cryptlib.vcxproj
+++ b/Externals/cryptlib.vcxproj
@@ -26,7 +26,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\Common.props" />
+  <Import Project="..\src\Common.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
diff --git a/Externals/cximage/cximage.vcxproj b/Externals/cximage/cximage.vcxproj
index bd9086d62e4..406855d93e3 100644
--- a/Externals/cximage/cximage.vcxproj
+++ b/Externals/cximage/cximage.vcxproj
@@ -22,19 +22,19 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
diff --git a/Externals/libogg_static.vcxproj b/Externals/libogg_static.vcxproj
index 37238d382af..582231ca299 100644
--- a/Externals/libogg_static.vcxproj
+++ b/Externals/libogg_static.vcxproj
@@ -51,19 +51,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/Externals/libtheora_static.vcxproj b/Externals/libtheora_static.vcxproj
index 7d076a0cc88..51f94366877 100644
--- a/Externals/libtheora_static.vcxproj
+++ b/Externals/libtheora_static.vcxproj
@@ -51,19 +51,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/Externals/libvorbis_static.vcxproj b/Externals/libvorbis_static.vcxproj
index 173a351efa0..d1aff653099 100644
--- a/Externals/libvorbis_static.vcxproj
+++ b/Externals/libvorbis_static.vcxproj
@@ -51,19 +51,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/Externals/libvorbisfile_static.vcxproj b/Externals/libvorbisfile_static.vcxproj
index 2369779da10..a906dbd1514 100644
--- a/Externals/libvorbisfile_static.vcxproj
+++ b/Externals/libvorbisfile_static.vcxproj
@@ -50,19 +50,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/Externals/zlib.vcxproj b/Externals/zlib.vcxproj
index bb345592cab..e4c444e8cd7 100644
--- a/Externals/zlib.vcxproj
+++ b/Externals/zlib.vcxproj
@@ -48,19 +48,19 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\Common.props" />
+    <Import Project="..\src\Common.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
diff --git a/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj b/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj
index 2976bb8a45c..98e61198b15 100644
--- a/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj
+++ b/src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj
@@ -467,9 +467,6 @@
       <Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\xrScriptEngine\xrScriptEngine.vcxproj">
       <Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
       <Private>true</Private>
diff --git a/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj b/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj
index 60ebac6f302..21859b3fc90 100644
--- a/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj
+++ b/src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj
@@ -511,9 +511,6 @@
       <Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\xrScriptEngine\xrScriptEngine.vcxproj">
       <Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
     </ProjectReference>
diff --git a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj
index 16fa97657ea..35b7649f3bb 100644
--- a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj
+++ b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj
@@ -559,9 +559,6 @@
       <Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\xrScriptEngine\xrScriptEngine.vcxproj">
       <Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
     </ProjectReference>
diff --git a/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj b/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj
index 147700d5987..7868ee425d5 100644
--- a/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj
+++ b/src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj
@@ -562,9 +562,6 @@
       <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\xrEngine\xrEngine.vcxproj">
       <Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
     </ProjectReference>
diff --git a/src/dummy/dummy.vcxproj b/src/dummy/dummy.vcxproj
index 6774403d55c..eda98362175 100644
--- a/src/dummy/dummy.vcxproj
+++ b/src/dummy/dummy.vcxproj
@@ -30,7 +30,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
@@ -40,7 +40,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/src/engine.sln b/src/engine.sln
index 5d7b13d6c86..ab43512e67c 100644
--- a/src/engine.sln
+++ b/src/engine.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
+VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 14.0.25420.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}"
 EndProject
@@ -161,33 +161,33 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameSpy", "..\Externals\Gam
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzo", "..\Externals\lzo.vcxproj", "{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit", "Externals\luajit\src\luajit.vcxproj", "{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luajit", "..\Externals\luajit\src\luajit.vcxproj", "{632AEEB6-DC06-4E15-9551-B2B09A4B73C5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "Externals\zlib.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_static", "Externals\libogg_static.vcxproj", "{15CBFEFF-7965-41F5-B4E2-21E8795C9159}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_static", "..\Externals\libogg_static.vcxproj", "{15CBFEFF-7965-41F5-B4E2-21E8795C9159}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora_static", "Externals\libtheora_static.vcxproj", "{653F3841-3F26-49B9-AFCF-091DB4B67031}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora_static", "..\Externals\libtheora_static.vcxproj", "{653F3841-3F26-49B9-AFCF-091DB4B67031}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_static", "Externals\libvorbis_static.vcxproj", "{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_static", "..\Externals\libvorbis_static.vcxproj", "{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile", "Externals\libvorbisfile_static.vcxproj", "{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile", "..\Externals\libvorbisfile_static.vcxproj", "{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "Externals\jpeg\libjpeg.vcxproj", "{938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\Externals\jpeg\libjpeg.vcxproj", "{938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BugTrap", "Externals\BugTrap.vcxproj", "{E8CF1ADA-264A-4127-86C2-FD7057D3792C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BugTrap", "..\Externals\BugTrap.vcxproj", "{E8CF1ADA-264A-4127-86C2-FD7057D3792C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MagicFM", "Externals\FreeMagic\Source\MagicFM.vcxproj", "{848E8AB3-9962-4C04-B813-5690399C8A3E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MagicFM", "..\Externals\FreeMagic\Source\MagicFM.vcxproj", "{848E8AB3-9962-4C04-B813-5690399C8A3E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oalib", "Externals\OpenAutomate\oalib\oalib.vcxproj", "{61D4856F-FA82-4F02-BB88-909DDFB1FE74}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oalib", "..\Externals\OpenAutomate\oalib\oalib.vcxproj", "{61D4856F-FA82-4F02-BB88-909DDFB1FE74}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\Externals\cryptlib.vcxproj", "{C39F4B46-6E89-4074-902E-CA57073044D2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "Externals\cryptlib.vcxproj", "{C39F4B46-6E89-4074-902E-CA57073044D2}"
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMiscMath_lib", "utils\xrMiscMath_lib\xrMiscMath_lib.vcxproj", "{CC912A26-E688-49F5-99F4-7A0F9AF4E438}"
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy", "dummy\dummy.vcxproj", "{B5A3098C-C768-45FF-8B6C-1F707C0344F0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMisc", "xrMisc\xrMisc.vcxproj", "{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMiscMath", "utils\xrMiscMath\xrMiscMath.vcxproj", "{CC912A26-E688-49F5-99F4-7A0F9AF4E438}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMiscMath", "utils\xrMiscMath\xrMiscMath.vcxproj", "{7885CF3C-EE04-4C67-9467-1FBF9A36B037}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -706,31 +706,6 @@ Global
 		{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Release_Dedicated|Win32.Build.0 = Release|Win32
 		{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Release|Win32.ActiveCfg = Release|Win32
 		{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Release|Win32.Build.0 = Release|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Debug|Win32.Build.0 = Debug|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Mixed|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Mixed_Dedicated|Mixed Platforms.Build.0 = Mixed|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Mixed_Dedicated|Win32.ActiveCfg = Mixed|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Mixed_Dedicated|Win32.Build.0 = Mixed|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Mixed|Mixed Platforms.ActiveCfg = Mixed|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Mixed|Mixed Platforms.Build.0 = Mixed|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Mixed|Win32.ActiveCfg = Mixed|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Mixed|Win32.Build.0 = Mixed|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Release_Dedicated|Win32.Build.0 = Release|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Release|Win32.ActiveCfg = Release|Win32
-		{7618699F-71AD-4866-B7FB-E17FA07C5D5A}.Release|Win32.Build.0 = Release|Win32
-		{136857E3-D61B-4A03-A4E9-7F73ED946C41}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
 		{136857E3-D61B-4A03-A4E9-7F73ED946C41}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
 		{136857E3-D61B-4A03-A4E9-7F73ED946C41}.Debug|Win32.ActiveCfg = Debug|Win32
 		{136857E3-D61B-4A03-A4E9-7F73ED946C41}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
@@ -941,80 +916,42 @@ Global
 		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release_Dedicated|Win32.Build.0 = Release|Win32
 		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|Win32.ActiveCfg = Release|Win32
 		{C39F4B46-6E89-4074-902E-CA57073044D2}.Release|Win32.Build.0 = Release|Win32
-		{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|x64.ActiveCfg = Release|x64
-		{614AA57F-58D7-45A8-A5FF-93F04B05FAC6}.Release|x64.Build.0 = Release|x64
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Debug|Win32.Build.0 = Debug|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|Mixed Platforms.Build.0 = Release|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|Win32.ActiveCfg = Mixed|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|Win32.Build.0 = Mixed|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release_Dedicated|Win32.Build.0 = Release|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|Win32.ActiveCfg = Release|Win32
 		{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|Win32.Build.0 = Release|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|Win32.Build.0 = Debug|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|Mixed Platforms.Build.0 = Release|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|Win32.ActiveCfg = Mixed|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|Win32.Build.0 = Mixed|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release_Dedicated|Win32.Build.0 = Release|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|Win32.ActiveCfg = Release|Win32
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|Win32.Build.0 = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Debug|Win32.Build.0 = Debug|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Mixed|Mixed Platforms.Build.0 = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Mixed|Win32.ActiveCfg = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Mixed|Win32.Build.0 = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Release_Dedicated|Win32.Build.0 = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Release|Win32.ActiveCfg = Release|Win32
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438}.Release|Win32.Build.0 = Release|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Debug_Dedicated|Win32.Build.0 = Debug|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Debug|Win32.Build.0 = Debug|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Mixed|Win32.ActiveCfg = Release|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Mixed|Win32.Build.0 = Release|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Release_Dedicated|Win32.Build.0 = Release|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Release|Win32.ActiveCfg = Release|Win32
+		{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1079,7 +1016,6 @@ Global
 		{61D4856F-FA82-4F02-BB88-909DDFB1FE74} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{C39F4B46-6E89-4074-902E-CA57073044D2} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
 		{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
-		{CC912A26-E688-49F5-99F4-7A0F9AF4E438} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}
 	EndGlobalSection
 	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
 		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
diff --git a/src/utils/ETools/ETools.vcxproj b/src/utils/ETools/ETools.vcxproj
index 6d72b87083d..40c32844a99 100644
--- a/src/utils/ETools/ETools.vcxproj
+++ b/src/utils/ETools/ETools.vcxproj
@@ -270,9 +270,6 @@
       <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\xrQSlim\xrQSlim.vcxproj">
       <Project>{f1836ce2-59ef-4189-8b9c-d103a511cb27}</Project>
     </ProjectReference>
diff --git a/src/utils/xrAI/xrAI.vcxproj b/src/utils/xrAI/xrAI.vcxproj
index e01d7dcc809..efdcd919c79 100644
--- a/src/utils/xrAI/xrAI.vcxproj
+++ b/src/utils/xrAI/xrAI.vcxproj
@@ -323,9 +323,6 @@
     <ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
       <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/utils/xrDXT/DXT.vcxproj b/src/utils/xrDXT/DXT.vcxproj
index 968a3e5f318..c54a60c9ad0 100644
--- a/src/utils/xrDXT/DXT.vcxproj
+++ b/src/utils/xrDXT/DXT.vcxproj
@@ -241,9 +241,6 @@
     <ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
       <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/utils/xrLC/xrLC.vcxproj b/src/utils/xrLC/xrLC.vcxproj
index 5e2ab123ef0..6207b404cf5 100644
--- a/src/utils/xrLC/xrLC.vcxproj
+++ b/src/utils/xrLC/xrLC.vcxproj
@@ -315,11 +315,6 @@
     <ClCompile Include="xrSectors.cpp" />
     <ClCompile Include="xrT_Junction.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/utils/xrLCUtil/xrLCUtil.vcxproj b/src/utils/xrLCUtil/xrLCUtil.vcxproj
index 96782a15b39..5de4ff90ce5 100644
--- a/src/utils/xrLCUtil/xrLCUtil.vcxproj
+++ b/src/utils/xrLCUtil/xrLCUtil.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -115,7 +115,6 @@
     </ResourceCompile>
     <Link>
       <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);$(xrExternals)FreeImage\Dist\x32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
->>>>>>> 1ca44c6e... Move src/Externals to Externals.
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/src/utils/xrLC_Light/xrLC_Light.vcxproj b/src/utils/xrLC_Light/xrLC_Light.vcxproj
index 26d82d3dcd7..4851ac48032 100644
--- a/src/utils/xrLC_Light/xrLC_Light.vcxproj
+++ b/src/utils/xrLC_Light/xrLC_Light.vcxproj
@@ -352,8 +352,6 @@
     </ProjectReference>
     <ProjectReference Include="..\..\Externals\zlib.vcxproj">
       <Project>{745dec58-ebb3-47a9-a9b8-4c6627c01bf8}</Project>
-    <ProjectReference Include="..\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/utils/xrMiscMath/xrMiscMath.vcxproj b/src/utils/xrMiscMath/xrMiscMath.vcxproj
index 434ec773d8d..e1be9228829 100644
--- a/src/utils/xrMiscMath/xrMiscMath.vcxproj
+++ b/src/utils/xrMiscMath/xrMiscMath.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{CC912A26-E688-49F5-99F4-7A0F9AF4E438}</ProjectGuid>
+    <ProjectGuid>{7885CF3C-EE04-4C67-9467-1FBF9A36B037}</ProjectGuid>
     <RootNamespace>xrMiscMath</RootNamespace>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
     <ProjectName>xrMiscMath</ProjectName>
@@ -20,13 +20,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/src/xrAICore/xrAICore.vcxproj b/src/xrAICore/xrAICore.vcxproj
index 2c307bce2bd..fb28023c8cf 100644
--- a/src/xrAICore/xrAICore.vcxproj
+++ b/src/xrAICore/xrAICore.vcxproj
@@ -234,9 +234,6 @@
     <ProjectReference Include="$(xrExternals)luabind\src\luabind.vcxproj">
       <Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\xrScriptEngine\xrScriptEngine.vcxproj">
       <Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
     </ProjectReference>
diff --git a/src/xrCDB/xrCDB.vcxproj b/src/xrCDB/xrCDB.vcxproj
index 5e9027d0ea2..a4f440af0df 100644
--- a/src/xrCDB/xrCDB.vcxproj
+++ b/src/xrCDB/xrCDB.vcxproj
@@ -351,9 +351,6 @@
       <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj
index b025746b966..49f618fcc93 100644
--- a/src/xrCore/xrCore.vcxproj
+++ b/src/xrCore/xrCore.vcxproj
@@ -70,11 +70,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-<<<<<<< HEAD
-      <AdditionalIncludeDirectories>$(SolutionDir)Externals;$(SolutionDir)Externals\lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-=======
-      <AdditionalIncludeDirectories>$(xrExternals);$(xrExternals)openssl\include;$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
->>>>>>> 1ca44c6e... Move src/Externals to Externals.
+      <AdditionalIncludeDirectories>$(xrExternals);$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;XRCORE_EXPORTS;CRYPTO_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <MinimalRebuild>true</MinimalRebuild>
@@ -90,11 +86,7 @@
     </ClCompile>
     <Link>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-<<<<<<< HEAD
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\lzo;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-=======
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)BugTrap\Bin;$(xrExternals)openssl\lib;$(xrExternals)lzo;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
->>>>>>> 1ca44c6e... Move src/Externals to Externals.
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)lzo;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <MapExports>false</MapExports>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -112,11 +104,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
       <WholeProgramOptimization>true</WholeProgramOptimization>
-<<<<<<< HEAD
-      <AdditionalIncludeDirectories>$(SolutionDir)Externals;$(SolutionDir)Externals\lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-=======
-      <AdditionalIncludeDirectories>$(xrExternals);$(xrExternals)openssl\include;$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
->>>>>>> 1ca44c6e... Move src/Externals to Externals.
+      <AdditionalIncludeDirectories>$(xrExternals);$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;XRCORE_EXPORTS;CRYPTO_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -130,11 +118,7 @@
       <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <Link>
-<<<<<<< HEAD
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\lzo-2.02;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-=======
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)BugTrap\Bin;$(xrExternals)openssl\lib;$(xrExternals)lzo-2.02;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
->>>>>>> 1ca44c6e... Move src/Externals to Externals.
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)lzo;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -153,11 +137,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>false</OmitFramePointers>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-<<<<<<< HEAD
-      <AdditionalIncludeDirectories>$(SolutionDir)Externals;$(SolutionDir)Externals\lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-=======
-      <AdditionalIncludeDirectories>$(xrExternals);$(xrExternals)openssl\include;$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
->>>>>>> 1ca44c6e... Move src/Externals to Externals.
+      <AdditionalIncludeDirectories>$(xrExternals);$(xrExternals)lzo\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;XRCORE_EXPORTS;CRYPTO_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -171,11 +151,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-<<<<<<< HEAD
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\lzo-2.02;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-=======
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)BugTrap\Bin;$(xrExternals)openssl\lib;$(xrExternals)lzo-2.02;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
->>>>>>> 1ca44c6e... Move src/Externals to Externals.
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)lzo;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <LargeAddressAware>true</LargeAddressAware>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -443,19 +419,12 @@
     <None Include="Debug\DXTrace.inl" />
   </ItemGroup>
   <ItemGroup>
-<<<<<<< HEAD
     <ProjectReference Include="..\Externals\cryptlib.vcxproj">
       <Project>{c39f4b46-6e89-4074-902e-ca57073044d2}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\Externals\lzo.vcxproj">
-=======
     <ProjectReference Include="$(xrExternals)lzo.vcxproj">
->>>>>>> 1ca44c6e... Move src/Externals to Externals.
       <Project>{614aa57f-58d7-45a8-a5ff-93f04b05fac6}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\xrMisc\xrMisc.vcxproj">
       <Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
     </ProjectReference>
diff --git a/src/xrEngine/xrEngine.vcxproj b/src/xrEngine/xrEngine.vcxproj
index 35ccbbbc267..c806cc1ecfc 100644
--- a/src/xrEngine/xrEngine.vcxproj
+++ b/src/xrEngine/xrEngine.vcxproj
@@ -651,9 +651,6 @@
     <ProjectReference Include="$(xrExternals)luabind\src\luabind.vcxproj">
       <Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)xrPhysics\xrPhysics.vcxproj">
       <Project>{98d24a3d-7666-4c11-9d6e-b10393ce8cba}</Project>
     </ProjectReference>
diff --git a/src/xrGame/xrGame.vcxproj b/src/xrGame/xrGame.vcxproj
index 2a4db07eb57..a08ed3ab648 100644
--- a/src/xrGame/xrGame.vcxproj
+++ b/src/xrGame/xrGame.vcxproj
@@ -3855,9 +3855,6 @@
     <ProjectReference Include="$(xrExternals)luabind\src\luabind.vcxproj">
       <Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)xrAICore\xrAICore.vcxproj">
       <Project>{5cb057d8-4464-40a6-af10-c26b826d1d90}</Project>
     </ProjectReference>
diff --git a/src/xrGameSpy/xrGameSpy.vcxproj b/src/xrGameSpy/xrGameSpy.vcxproj
index fd737b1a3ec..d026638f0ed 100644
--- a/src/xrGameSpy/xrGameSpy.vcxproj
+++ b/src/xrGameSpy/xrGameSpy.vcxproj
@@ -188,9 +188,6 @@
     <ProjectReference Include="$(xrExternals)GameSpy.vcxproj">
       <Project>{67ff193e-2c20-402a-9026-9f5f6327503c}</Project>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)xrCore\xrCore.vcxproj">
       <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
     </ProjectReference>
diff --git a/src/xrMisc/xrMisc.vcxproj b/src/xrMisc/xrMisc.vcxproj
index ba65a07b327..f43a5a8e368 100644
--- a/src/xrMisc/xrMisc.vcxproj
+++ b/src/xrMisc/xrMisc.vcxproj
@@ -23,13 +23,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/src/xrParticles/xrParticles.vcxproj b/src/xrParticles/xrParticles.vcxproj
index add9714ad7b..1fe8287b05d 100644
--- a/src/xrParticles/xrParticles.vcxproj
+++ b/src/xrParticles/xrParticles.vcxproj
@@ -209,9 +209,6 @@
       <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/xrPhysics/xrPhysics.vcxproj b/src/xrPhysics/xrPhysics.vcxproj
index 1601efa84e0..22ed705d859 100644
--- a/src/xrPhysics/xrPhysics.vcxproj
+++ b/src/xrPhysics/xrPhysics.vcxproj
@@ -335,9 +335,6 @@
       <Project>{ccca7859-eb86-493e-9b53-c4235f45b3c5}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\xrCore\xrCore.vcxproj">
       <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
     </ProjectReference>
diff --git a/src/xrScriptEngine/xrScriptEngine.vcxproj b/src/xrScriptEngine/xrScriptEngine.vcxproj
index c77c93bb891..2e4e0497fd7 100644
--- a/src/xrScriptEngine/xrScriptEngine.vcxproj
+++ b/src/xrScriptEngine/xrScriptEngine.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -211,6 +211,7 @@
     </ProjectReference>
     <ProjectReference Include="..\..\Externals\luajit\src\luajit.vcxproj">
       <Project>{632aeeb6-dc06-4e15-9551-b2b09a4b73c5}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\Externals\luabind\src\luabind.vcxproj">
       <Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
     </ProjectReference>
diff --git a/src/xrSound/xrSound.vcxproj b/src/xrSound/xrSound.vcxproj
index 7c2ca4e66bf..e3942643a20 100644
--- a/src/xrSound/xrSound.vcxproj
+++ b/src/xrSound/xrSound.vcxproj
@@ -227,9 +227,6 @@
     <ProjectReference Include="$(xrExternals)openal\OpenAL-Windows\Router\Router.vcxproj">
       <Project>{566551f4-4ef1-4cb4-a131-f982e7606907}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\utils\xrMiscMath\xrMiscMath.vcxproj">
-      <Project>{cc912a26-e688-49f5-99f4-7a0f9af4e438}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\xrMisc\xrMisc.vcxproj">
       <Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
     </ProjectReference>
@@ -242,4 +239,4 @@
       <UserProperties DevPartner_IsInstrumented="1" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file