ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

winport: tidy some things required to make AVX2 support compile, apparently (see github #8)

This commit is contained in:
zeromus 2016-12-11 19:05:30 -06:00
parent 1787081fca
commit 5cfb407f35
3 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
desmume/src/frontend/windows/DeSmuME.vcxproj
View File

@ -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" />

18
desmume/src/frontend/windows/DeSmuME.vcxproj.filters
View File

@ -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">

1
desmume/src/utils/colorspacehandler/colorspacehandler.cpp
View File

@ -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)