From 5cfb407f354b97354bafc20f6c8631d3d3b9ebee Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Sun, 11 Dec 2016 19:05:30 -0600
Subject: [PATCH] winport: tidy some things required to make AVX2 support
 compile, apparently (see github #8)

---
 desmume/src/frontend/windows/DeSmuME.vcxproj  | 60 +++++++++++++++++++
 .../frontend/windows/DeSmuME.vcxproj.filters  | 18 ++++++
 .../colorspacehandler/colorspacehandler.cpp   |  1 +
 3 files changed, 79 insertions(+)

diff --git a/desmume/src/frontend/windows/DeSmuME.vcxproj b/desmume/src/frontend/windows/DeSmuME.vcxproj
index dba678b60..cc3bdcbe3 100644
--- a/desmume/src/frontend/windows/DeSmuME.vcxproj
+++ b/desmume/src/frontend/windows/DeSmuME.vcxproj
@@ -173,6 +173,36 @@
     <ClCompile Include="..\..\utils\AsmJit\x86\x86operand.cpp" />
     <ClCompile Include="..\..\utils\AsmJit\x86\x86util.cpp" />
     <ClCompile Include="..\..\utils\colorspacehandler\colorspacehandler.cpp" />
+    <ClCompile Include="..\..\utils\colorspacehandler\colorspacehandler_AltiVec.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\utils\colorspacehandler\colorspacehandler_AVX2.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\utils\colorspacehandler\colorspacehandler_SSE2.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\utils\datetime.cpp" />
     <ClCompile Include="..\..\utils\dlditool.cpp" />
     <ClCompile Include="..\..\utils\emufat.cpp" />
@@ -361,6 +391,36 @@
     <ClInclude Include="..\..\metaspu\SoundTouch\FIRFilter.h" />
     <ClInclude Include="..\..\types.h" />
     <ClInclude Include="..\..\utils\bits.h" />
+    <ClInclude Include="..\..\utils\colorspacehandler\colorspacehandler_AltiVec.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\utils\colorspacehandler\colorspacehandler_AVX2.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\utils\colorspacehandler\colorspacehandler_SSE2.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Dev+|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Fastbuild|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="..\..\version.h" />
     <ClInclude Include="..\..\armcpu.h" />
     <ClInclude Include="..\..\arm_jit.h" />
diff --git a/desmume/src/frontend/windows/DeSmuME.vcxproj.filters b/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
index 3a28bef52..4047bb282 100644
--- a/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
+++ b/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
@@ -912,6 +912,15 @@
     <ClCompile Include="..\..\libretro-common\encodings\encoding_utf.c">
       <Filter>libretro-common\encodings</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\utils\colorspacehandler\colorspacehandler_AVX2.cpp">
+      <Filter>utils\colorspacehandler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\utils\colorspacehandler\colorspacehandler_SSE2.cpp">
+      <Filter>utils\colorspacehandler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\utils\colorspacehandler\colorspacehandler_AltiVec.cpp">
+      <Filter>utils\colorspacehandler</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\utils\guid.h">
@@ -1592,6 +1601,15 @@
     <ClInclude Include="..\..\libretro-common\include\compat\getopt.h">
       <Filter>libretro-common\include\compat</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\utils\colorspacehandler\colorspacehandler_AltiVec.h">
+      <Filter>utils\colorspacehandler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\utils\colorspacehandler\colorspacehandler_AVX2.h">
+      <Filter>utils\colorspacehandler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\utils\colorspacehandler\colorspacehandler_SSE2.h">
+      <Filter>utils\colorspacehandler</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="bitmap1.bmp">
diff --git a/desmume/src/utils/colorspacehandler/colorspacehandler.cpp b/desmume/src/utils/colorspacehandler/colorspacehandler.cpp
index e10fc08f4..f8e41636e 100644
--- a/desmume/src/utils/colorspacehandler/colorspacehandler.cpp
+++ b/desmume/src/utils/colorspacehandler/colorspacehandler.cpp
@@ -19,6 +19,7 @@
 
 #if defined(ENABLE_AVX2)
 	#include "colorspacehandler_AVX2.cpp"
+	#include "colorspacehandler_SSE2.cpp"
 #elif defined(ENABLE_SSE2)
 	#include "colorspacehandler_SSE2.cpp"
 #elif defined(ENABLE_ALTIVEC)