From 9f91a14b7fde4513100d0cd2824292d136c4ed88 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Wed, 17 Aug 2016 03:40:19 -0500
Subject: [PATCH] fixes related to building new colorspace handler

---
 desmume/src/frontend/posix/Makefile.am               |  1 +
 desmume/src/frontend/windows/DeSmuME.vcxproj.filters | 12 ++++++++++++
 desmume/src/frontend/windows/desmume.props           |  1 +
 .../utils/colorspacehandler/colorspacehandler.cpp    |  3 +++
 4 files changed, 17 insertions(+)

diff --git a/desmume/src/frontend/posix/Makefile.am b/desmume/src/frontend/posix/Makefile.am
index 76e9ad5a2..8f9832641 100644
--- a/desmume/src/frontend/posix/Makefile.am
+++ b/desmume/src/frontend/posix/Makefile.am
@@ -98,6 +98,7 @@ libdesmume_a_SOURCES = \
 	../../utils/tinyxml/tinyxmlerror.cpp \
 	../../utils/tinyxml/tinyxmlparser.cpp \
 	../../utils/glcorearb.h \
+	../../utils/colorspacehandler/colorspacehandler.cpp ../../utils/colorspacehandler/colorspacehandler.h \
 	../../addons/slot2_auto.cpp ../../addons/slot2_mpcf.cpp ../../addons/slot2_paddle.cpp ../../addons/slot2_gbagame.cpp ../../addons/slot2_none.cpp ../../addons/slot2_rumblepak.cpp ../../addons/slot2_guitarGrip.cpp ../../addons/slot2_expMemory.cpp ../../addons/slot2_piano.cpp ../../addons/slot2_passme.cpp ../../addons/slot1_none.cpp ../../addons/slot1_r4.cpp ../../addons/slot1_retail_nand.cpp ../../addons/slot1_retail_auto.cpp ../../addons/slot1_retail_mcrom.cpp ../../addons/slot1_retail_mcrom_debug.cpp ../../addons/slot1comp_mc.cpp ../../addons/slot1comp_mc.h ../../addons/slot1comp_rom.h ../../addons/slot1comp_rom.cpp ../../addons/slot1comp_protocol.h ../../addons/slot1comp_protocol.cpp \
 	../../cheatSystem.cpp ../../cheatSystem.h \
 	../../texcache.cpp ../../texcache.h ../../rasterize.cpp ../../rasterize.h \
diff --git a/desmume/src/frontend/windows/DeSmuME.vcxproj.filters b/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
index 0a0742ced..b0f12c417 100644
--- a/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
+++ b/desmume/src/frontend/windows/DeSmuME.vcxproj.filters
@@ -975,6 +975,12 @@
     <ClCompile Include="..\utils\colorspacehandler\colorspacehandler_SSE2.cpp">
       <Filter>Core\utils\colorspacehandler</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\utils\colorspacehandler\colorspacehandler_AVX2.cpp">
+      <Filter>Core\utils\colorspacehandler</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\utils\colorspacehandler\colorspacehandler_AltiVec.cpp">
+      <Filter>Core\utils\colorspacehandler</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\armcpu.h">
@@ -1754,6 +1760,12 @@
     <ClInclude Include="..\utils\colorspacehandler\colorspacehandler_SSE2.h">
       <Filter>Core\utils\colorspacehandler</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\utils\colorspacehandler\colorspacehandler_AltiVec.h">
+      <Filter>Core\utils\colorspacehandler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\utils\colorspacehandler\colorspacehandler_AVX2.h">
+      <Filter>Core\utils\colorspacehandler</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\instruction_tabdef.inc">
diff --git a/desmume/src/frontend/windows/desmume.props b/desmume/src/frontend/windows/desmume.props
index d5862129e..badc6a0fe 100644
--- a/desmume/src/frontend/windows/desmume.props
+++ b/desmume/src/frontend/windows/desmume.props
@@ -57,6 +57,7 @@
 	<Import Project="$(UserProps_Path)" />
 
 	<!-- some defaults and validation of user prefs -->
+	<!-- TODO: throw errors here instead -->
 	<PropertyGroup>
 		<SSE_Level Condition="'$(SSE_Level)' == ''">20</SSE_Level>
 		<AVX_Level Condition="'$(AVX_Level)' == ''">0</AVX_Level>
diff --git a/desmume/src/utils/colorspacehandler/colorspacehandler.cpp b/desmume/src/utils/colorspacehandler/colorspacehandler.cpp
index d0757d7cc..88d3bcf5f 100644
--- a/desmume/src/utils/colorspacehandler/colorspacehandler.cpp
+++ b/desmume/src/utils/colorspacehandler/colorspacehandler.cpp
@@ -19,10 +19,13 @@
 
 #if defined(ENABLE_AVX2)
 	#include "colorspacehandler_AVX2.h"
+	#include "colorspacehandler_AVX2.cpp"
 #elif defined(ENABLE_SSE2)
 	#include "colorspacehandler_SSE2.h"
+	#include "colorspacehandler_SSE2.cpp"
 #elif defined(ENABLE_ALTIVEC)
 	#include "colorspacehandler_AltiVec.h"
+	#include "colorspacehandler_AltiVec.cpp"
 #endif
 
 #if defined(ENABLE_SSE2) || defined(ENABLE_ALTIVEC)