From 7946cd0224b5934f884fe3aa91386001918768f5 Mon Sep 17 00:00:00 2001
From: Unknown <ricardo.e.p.rodrigues@gmail.com>
Date: Thu, 20 Sep 2018 23:22:19 +0100
Subject: [PATCH] Updated windows version to take into account SDL-image

---
 3Engine/3Engine.vcxproj                     |  26 +++--
 3Engine/3Engine.vcxproj.filters             | 120 ++++++++------------
 3EngineExecutable/3EngineExecutable.vcxproj |  24 +++-
 3EngineTests/3EngineTests.vcxproj           |  24 +++-
 3EngineTests/3EngineTests.vcxproj.filters   |  48 --------
 README.md                                   |   2 +
 appveyor.yml                                |   2 +
 7 files changed, 99 insertions(+), 147 deletions(-)

diff --git a/3Engine/3Engine.vcxproj b/3Engine/3Engine.vcxproj
index 4715451..6337961 100644
--- a/3Engine/3Engine.vcxproj
+++ b/3Engine/3Engine.vcxproj
@@ -51,10 +51,6 @@
     <ClCompile Include="src\Shapes\BasicShapes.cpp" />
     <ClCompile Include="src\Shapes\Mesh.cpp" />
     <ClCompile Include="src\Shapes\MeshLoader.cpp" />
-    <ClCompile Include="src\SOIL\image_DXT.c" />
-    <ClCompile Include="src\SOIL\image_helper.c" />
-    <ClCompile Include="src\SOIL\SOIL.c" />
-    <ClCompile Include="src\SOIL\stb_image_aug.c" />
     <ClCompile Include="src\Time\SDLTimeCalculator.cpp" />
     <ClCompile Include="src\Time\Time.cpp" />
     <ClCompile Include="src\Utilities\Simulation.cpp" />
@@ -92,12 +88,6 @@
     <ClInclude Include="src\Shapes\BasicShapes.h" />
     <ClInclude Include="src\Shapes\Mesh.h" />
     <ClInclude Include="src\Shapes\MeshLoader.h" />
-    <ClInclude Include="src\SOIL\image_DXT.h" />
-    <ClInclude Include="src\SOIL\image_helper.h" />
-    <ClInclude Include="src\SOIL\SOIL.h" />
-    <ClInclude Include="src\SOIL\stbi_DDS_aug.h" />
-    <ClInclude Include="src\SOIL\stbi_DDS_aug_c.h" />
-    <ClInclude Include="src\SOIL\stb_image_aug.h" />
     <ClInclude Include="src\Time\SDLTimeCalculator.h" />
     <ClInclude Include="src\Time\Time.h" />
     <ClInclude Include="src\Utilities\json.hpp" />
@@ -163,7 +153,7 @@
     <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\SDL2-image-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)</TargetName>
     <IntDir>$(SolutionDir)intermediate\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
@@ -171,7 +161,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\SDL2-image-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
     <TargetName>$(ProjectName)</TargetName>
     <IntDir>$(SolutionDir)intermediate\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <TargetExt>.dll</TargetExt>
@@ -215,6 +205,12 @@
       <Message>Copy dependencies libraries</Message>
       <Command>echo Copying SDL2
 copy /Y "$(SolutionDir)dependencies\SDL2-msvc\lib\x64\SDL2.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\SDL2_image.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\zlib1.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libjpeg-9.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libpng16-16.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libtiff-5.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libwebp-7.dll" "$(OutDir)"
 echo Copying GLEW
 copy /Y "$(SolutionDir)dependencies\glew-msvc\bin\Release\x64\glew32.dll" "$(OutDir)"
 echo Copying Config Files
@@ -274,6 +270,12 @@ xcopy "$(ProjectDir)assets" "$(OutDir)assets\" /E /Y</Command>
       <Message>Copy dependencies libraries</Message>
       <Command>echo Copying SDL2
 copy /Y "$(SolutionDir)dependencies\SDL2-msvc\lib\x64\SDL2.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\SDL2_image.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\zlib1.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libjpeg-9.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libpng16-16.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libtiff-5.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libwebp-7.dll" "$(OutDir)"
 echo Copying GLEW
 copy /Y "$(SolutionDir)dependencies\glew-msvc\bin\Release\x64\glew32.dll" "$(OutDir)"
 echo Copying Config Files
diff --git a/3Engine/3Engine.vcxproj.filters b/3Engine/3Engine.vcxproj.filters
index 71d9633..09823dc 100644
--- a/3Engine/3Engine.vcxproj.filters
+++ b/3Engine/3Engine.vcxproj.filters
@@ -24,36 +24,12 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Actor.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Actors\SkySphere.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Camera\Camera.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Camera\LookAt.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Camera\Ortho.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Camera\Perspective.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
     <ClCompile Include="src\Controllers\FreeCameraController.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
     <ClCompile Include="src\Controllers\SphereCameraController.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="src\Engine.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Input.cpp">
-      <Filter>Engine</Filter>
-    </ClCompile>
     <ClCompile Include="src\Math\Maths.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
@@ -105,65 +81,47 @@
     <ClCompile Include="src\Shapes\MeshLoader.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="src\SOIL\image_DXT.c">
+    <ClCompile Include="src\Time\SDLTimeCalculator.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="src\SOIL\image_helper.c">
+    <ClCompile Include="src\Time\Time.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="src\SOIL\SOIL.c">
+    <ClCompile Include="src\Utilities\Simulation.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="src\SOIL\stb_image_aug.c">
+    <ClCompile Include="src\Actor.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="src\Time\SDLTimeCalculator.cpp">
+    <ClCompile Include="src\Engine.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="src\Time\Time.cpp">
+    <ClCompile Include="src\Input.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-    <ClCompile Include="src\Utilities\Simulation.cpp">
+    <ClCompile Include="src\Actors\SkySphere.cpp">
       <Filter>Engine</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\Actor.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Actors\SkySphere.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Camera\Camera.h">
+    <ClCompile Include="src\Camera\Camera.cpp">
       <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Camera\LookAt.h">
+    </ClCompile>
+    <ClCompile Include="src\Camera\LookAt.cpp">
       <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Camera\Ortho.h">
+    </ClCompile>
+    <ClCompile Include="src\Camera\Ortho.cpp">
       <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Camera\Perspective.h">
+    </ClCompile>
+    <ClCompile Include="src\Camera\Perspective.cpp">
       <Filter>Engine</Filter>
-    </ClInclude>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
     <ClInclude Include="src\Controllers\FreeCameraController.h">
       <Filter>Engine</Filter>
     </ClInclude>
     <ClInclude Include="src\Controllers\SphereCameraController.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\Debug.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Engine.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="src\IDrawable.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Input.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
     <ClInclude Include="src\Math\Maths.h">
       <Filter>Engine</Filter>
     </ClInclude>
@@ -191,9 +149,6 @@
     <ClInclude Include="src\Math\Vector4.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\OpenGLUtils.h">
-      <Filter>Engine</Filter>
-    </ClInclude>
     <ClInclude Include="src\SceneManagement\SceneGraph.h">
       <Filter>Engine</Filter>
     </ClInclude>
@@ -224,43 +179,58 @@
     <ClInclude Include="src\Shapes\MeshLoader.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\SOIL\image_DXT.h">
+    <ClInclude Include="src\Time\SDLTimeCalculator.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\SOIL\image_helper.h">
+    <ClInclude Include="src\Time\Time.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\SOIL\SOIL.h">
+    <ClInclude Include="src\Utilities\json.hpp">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\SOIL\stbi_DDS_aug.h">
+    <ClInclude Include="src\Utilities\Manager.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\SOIL\stbi_DDS_aug_c.h">
+    <ClInclude Include="src\Utilities\Managers.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\SOIL\stb_image_aug.h">
+    <ClInclude Include="src\Utilities\Simulation.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\Time\SDLTimeCalculator.h">
+    <ClInclude Include="src\Utilities\singleton.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\Time\Time.h">
+    <ClInclude Include="src\Actor.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\Utilities\json.hpp">
+    <ClInclude Include="src\Debug.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\Utilities\Manager.h">
+    <ClInclude Include="src\Engine.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\Utilities\Managers.h">
+    <ClInclude Include="src\IDrawable.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\Utilities\Simulation.h">
+    <ClInclude Include="src\Input.h">
       <Filter>Engine</Filter>
     </ClInclude>
-    <ClInclude Include="src\Utilities\singleton.h">
+    <ClInclude Include="src\OpenGLUtils.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Actors\SkySphere.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Camera\Camera.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Camera\LookAt.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Camera\Ortho.h">
+      <Filter>Engine</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Camera\Perspective.h">
       <Filter>Engine</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/3EngineExecutable/3EngineExecutable.vcxproj b/3EngineExecutable/3EngineExecutable.vcxproj
index e1d8571..1a974b2 100644
--- a/3EngineExecutable/3EngineExecutable.vcxproj
+++ b/3EngineExecutable/3EngineExecutable.vcxproj
@@ -86,7 +86,7 @@
     <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\SDL2-image-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)</TargetName>
     <IntDir>$(SolutionDir)intermediate\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
@@ -94,7 +94,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\SDL2-image-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
     <TargetName>$(ProjectName)</TargetName>
     <IntDir>$(SolutionDir)intermediate\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <TargetExt>.exe</TargetExt>
@@ -130,14 +130,20 @@
       <LanguageStandard>stdcpp14</LanguageStandard>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)dependencies\SDL2-msvc\lib\x64\;$(SolutionDir)dependencies\glew-msvc\lib\Release\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)dependencies\SDL2-msvc\lib\x64\;$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\;$(SolutionDir)dependencies\glew-msvc\lib\Release\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;glew32.lib;SDL2_image.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
     </Link>
     <PostBuildEvent>
       <Message>Copy dependencies libraries</Message>
       <Command>echo Copying SDL2
 copy /Y "$(SolutionDir)dependencies\SDL2-msvc\lib\x64\SDL2.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\SDL2_image.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\zlib1.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libjpeg-9.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libpng16-16.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libtiff-5.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libwebp-7.dll" "$(OutDir)"
 echo Copying GLEW
 copy /Y "$(SolutionDir)dependencies\glew-msvc\bin\Release\x64\glew32.dll" "$(OutDir)"
 echo Copying Config Files
@@ -189,14 +195,20 @@ xcopy "$(ProjectDir)assets" "$(OutDir)assets\" /E</Command>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(SolutionDir)dependencies\SDL2-msvc\lib\x64\;$(SolutionDir)dependencies\glew-msvc\lib\Release\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)dependencies\SDL2-msvc\lib\x64\;$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\;$(SolutionDir)dependencies\glew-msvc\lib\Release\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;glew32.lib;SDL2_image.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
     </Link>
     <PostBuildEvent>
       <Message>Copy dependencies libraries</Message>
       <Command>echo Copying SDL2
 copy /Y "$(SolutionDir)dependencies\SDL2-msvc\lib\x64\SDL2.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\SDL2_image.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\zlib1.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libjpeg-9.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libpng16-16.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libtiff-5.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libwebp-7.dll" "$(OutDir)"
 echo Copying GLEW
 copy /Y "$(SolutionDir)dependencies\glew-msvc\bin\Release\x64\glew32.dll" "$(OutDir)"
 echo Copying Config Files
diff --git a/3EngineTests/3EngineTests.vcxproj b/3EngineTests/3EngineTests.vcxproj
index c72a218..7c75a6c 100644
--- a/3EngineTests/3EngineTests.vcxproj
+++ b/3EngineTests/3EngineTests.vcxproj
@@ -88,14 +88,14 @@
     <IntDir>$(SolutionDir)\intermediate\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\SDL2-image-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
     <TargetName>$(ProjectName)_dbg</TargetName>
     <IntDir>$(SolutionDir)intermediate\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
-    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)dependencies\SDL2-msvc\include;$(SolutionDir)dependencies\SDL2-image-msvc\include;$(SolutionDir)dependencies\glew-msvc\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
     <TargetName>$(ProjectName)_rls</TargetName>
     <IntDir>$(SolutionDir)intermediate\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
@@ -130,14 +130,20 @@
       <LanguageStandard>stdcpp14</LanguageStandard>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)dependencies\SDL2-msvc\lib\x64\;$(SolutionDir)\dependencies\glew-msvc\lib\Release\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)dependencies\SDL2-msvc\lib\x64\;$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\;$(SolutionDir)\dependencies\glew-msvc\lib\Release\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;glew32.lib;SDL2_image.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
     </Link>
     <PostBuildEvent>
       <Message>Copy dependencies libraries</Message>
       <Command>echo Copying SDL2
 copy /Y "$(SolutionDir)dependencies\SDL2-msvc\lib\x64\SDL2.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\SDL2_image.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\zlib1.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libjpeg-9.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libpng16-16.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libtiff-5.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libwebp-7.dll" "$(OutDir)"
 echo Copying GLEW
 copy /Y "$(SolutionDir)dependencies\glew-msvc\bin\Release\x64\glew32.dll" "$(OutDir)"
 echo Copying Config Files
@@ -189,14 +195,20 @@ xcopy "$(SolutionDir)3Engine\assets" "$(OutDir)assets\" /E
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(SolutionDir)dependencies\SDL2-msvc\lib\x64\;$(SolutionDir)\dependencies\glew-msvc\lib\Release\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)dependencies\SDL2-msvc\lib\x64\;$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\;$(SolutionDir)\dependencies\glew-msvc\lib\Release\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>opengl32.lib;SDL2.lib;SDL2main.lib;glew32.lib;SDL2_image.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
     </Link>
     <PostBuildEvent>
       <Message>Copy dependencies libraries</Message>
       <Command>echo Copying SDL2
 copy /Y "$(SolutionDir)dependencies\SDL2-msvc\lib\x64\SDL2.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\SDL2_image.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\zlib1.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libjpeg-9.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libpng16-16.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libtiff-5.dll" "$(OutDir)"
+copy /Y "$(SolutionDir)dependencies\SDL2-image-msvc\lib\x64\libwebp-7.dll" "$(OutDir)"
 echo Copying GLEW
 copy /Y "$(SolutionDir)dependencies\glew-msvc\bin\Release\x64\glew32.dll" "$(OutDir)"
 echo Copying Config Files
diff --git a/3EngineTests/3EngineTests.vcxproj.filters b/3EngineTests/3EngineTests.vcxproj.filters
index 31024d8..42a55e3 100644
--- a/3EngineTests/3EngineTests.vcxproj.filters
+++ b/3EngineTests/3EngineTests.vcxproj.filters
@@ -30,33 +30,12 @@
     <ClCompile Include="..\src\Tests\tests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Tests\tests.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Math\Vector.cpp">
-      <Filter>3Engine Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Math\Vector2.cpp">
-      <Filter>3Engine Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Math\Matrix.cpp">
-      <Filter>3Engine Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Math\Matrix2.cpp">
-      <Filter>3Engine Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Math\Matrix3.cpp">
-      <Filter>3Engine Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\Math\Vector.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
     <ClCompile Include="..\src\Math\Vector2.cpp">
       <Filter>3Engine Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Math\Vector4.cpp">
-      <Filter>3Engine Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\tests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -98,45 +77,18 @@
     <ClInclude Include="..\src\Tests\VectorTests.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Vector.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\Math\Vector2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\Tests\MatrixTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\Tests\VectorTests.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\Tests\MatrixTests.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\Tests\VectorTests.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Matrix.h">
-      <Filter>3Engine Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\Math\Matrix2.h">
-      <Filter>3Engine Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\Math\Matrix3.h">
-      <Filter>3Engine Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\Math\TMatrix.h">
-      <Filter>3Engine Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\Math\Vector.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\Math\Vector2.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\Math\Vector4.h">
-      <Filter>3Engine Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\Math\Matrix.h">
       <Filter>3Engine Files</Filter>
     </ClInclude>
diff --git a/README.md b/README.md
index 2aa0b4f..853f56f 100644
--- a/README.md
+++ b/README.md
@@ -76,11 +76,13 @@ The inclusion of the said libraries are needed, yet dependencies are ignored to
 1. Download precompiled builds for MSVC (or compile it yourself) 
         
     * [SDL2](https://github.com/RicardoEPRodrigues/Dependencies/raw/master/SDL2-msvc.zip)
+    * [SDL2-image](https://github.com/RicardoEPRodrigues/Dependencies/raw/master/SDL2-image-msvc.zip)
     * [GLEW](https://github.com/RicardoEPRodrigues/Dependencies/raw/master/glew-msvc.zip)
 
 1. Create a folder named `dependencies` and place inside the libraries. Rename them as shown:
 
     * SDL2-msvc
+    * SDL2-image-msvc
     * glew-msvc
 
 ### Compiling
diff --git a/appveyor.yml b/appveyor.yml
index 0f4d9f2..1cfb35e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,8 @@ image:
 install:
   - ps: New-Item -ItemType Directory -Force -Path dependencies
   - ps: Start-FileDownload 'https://github.com/RicardoEPRodrigues/Dependencies/raw/master/SDL2-msvc.zip' -FileName 'SDL2-msvc.zip'
+  - ps: Start-FileDownload 'https://github.com/RicardoEPRodrigues/Dependencies/raw/master/SDL2-image-msvc.zip' -FileName 'SDL2-image-msvc.zip'
   - ps: Start-FileDownload 'https://github.com/RicardoEPRodrigues/Dependencies/raw/master/glew-msvc.zip' -FileName 'glew-msvc.zip'
   - ps: Expand-Archive -Path SDL2-msvc.zip –DestinationPath dependencies
+  - ps: Expand-Archive -Path SDL2-image-msvc.zip –DestinationPath dependencies
   - ps: Expand-Archive -Path glew-msvc.zip –DestinationPath dependencies