From e24e0a629154a8ed352a9ee0f5300f6c645795db Mon Sep 17 00:00:00 2001
From: Alberto Fustinoni <claudiuslollarius@gmail.com>
Date: Tue, 21 Mar 2017 10:04:14 +0900
Subject: [PATCH 1/2] Added vs2017 solution

---
 .gitignore                                    |   4 +
 libretro/msvc/msvc-2017.sln                   |  22 ++
 libretro/msvc/msvc-2017/libretro.def          |  27 ++
 libretro/msvc/msvc-2017/msvc-2017.vcxproj     | 153 +++++++++++
 .../msvc/msvc-2017/msvc-2017.vcxproj.filters  | 241 ++++++++++++++++++
 5 files changed, 447 insertions(+)
 create mode 100644 libretro/msvc/msvc-2017.sln
 create mode 100644 libretro/msvc/msvc-2017/libretro.def
 create mode 100644 libretro/msvc/msvc-2017/msvc-2017.vcxproj
 create mode 100644 libretro/msvc/msvc-2017/msvc-2017.vcxproj.filters

diff --git a/.gitignore b/.gitignore
index 550058c..0fe81b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+.vs/
+Debug/
+Release/
+
 psp2/*.o
 psp2/*.elf
 psp2/*.velf
diff --git a/libretro/msvc/msvc-2017.sln b/libretro/msvc/msvc-2017.sln
new file mode 100644
index 0000000..19899a6
--- /dev/null
+++ b/libretro/msvc/msvc-2017.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc-2010", "msvc-2017\msvc-2017.vcxproj", "{29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}.Debug|x86.ActiveCfg = Debug|Win32
+		{29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}.Debug|x86.Build.0 = Debug|Win32
+		{29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}.Release|x86.ActiveCfg = Release|Win32
+		{29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/libretro/msvc/msvc-2017/libretro.def b/libretro/msvc/msvc-2017/libretro.def
new file mode 100644
index 0000000..70f6699
--- /dev/null
+++ b/libretro/msvc/msvc-2017/libretro.def
@@ -0,0 +1,27 @@
+LIBRARY "msvc-2010"
+EXPORTS
+retro_set_environment
+retro_set_video_refresh
+retro_set_audio_sample
+retro_set_audio_sample_batch
+retro_set_input_poll
+retro_set_input_state
+retro_init
+retro_deinit
+retro_api_version
+retro_get_system_info
+retro_get_system_av_info
+retro_set_controller_port_device
+retro_reset
+retro_run
+retro_serialize_size
+retro_serialize
+retro_unserialize
+retro_cheat_reset
+retro_cheat_set
+retro_load_game
+retro_load_game_special
+retro_unload_game
+retro_get_region
+retro_get_memory_data
+retro_get_memory_size
diff --git a/libretro/msvc/msvc-2017/msvc-2017.vcxproj b/libretro/msvc/msvc-2017/msvc-2017.vcxproj
new file mode 100644
index 0000000..9d34b88
--- /dev/null
+++ b/libretro/msvc/msvc-2017/msvc-2017.vcxproj
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\core\cart_hw\areplay.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_93c.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_i2c.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_spi.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\ggenie.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\md_cart.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\sms_cart.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\sram.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\svp\ssp16.c" />
+    <ClCompile Include="..\..\..\core\cart_hw\svp\svp.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\cdc.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\cdd.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\cd_cart.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\gfx.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\pcm.c" />
+    <ClCompile Include="..\..\..\core\cd_hw\scd.c" />
+    <ClCompile Include="..\..\..\core\genesis.c" />
+    <ClCompile Include="..\..\..\core\input_hw\activator.c" />
+    <ClCompile Include="..\..\..\core\input_hw\gamepad.c" />
+    <ClCompile Include="..\..\..\core\input_hw\input.c" />
+    <ClCompile Include="..\..\..\core\input_hw\lightgun.c" />
+    <ClCompile Include="..\..\..\core\input_hw\mouse.c" />
+    <ClCompile Include="..\..\..\core\input_hw\paddle.c" />
+    <ClCompile Include="..\..\..\core\input_hw\sportspad.c" />
+    <ClCompile Include="..\..\..\core\input_hw\teamplayer.c" />
+    <ClCompile Include="..\..\..\core\input_hw\terebi_oekaki.c" />
+    <ClCompile Include="..\..\..\core\input_hw\xe_a1p.c" />
+    <ClCompile Include="..\..\..\core\io_ctrl.c" />
+    <ClCompile Include="..\..\..\core\loadrom.c" />
+    <ClCompile Include="..\..\..\core\m68k\m68kcpu.c" />
+    <ClCompile Include="..\..\..\core\m68k\s68kcpu.c" />
+    <ClCompile Include="..\..\..\core\mem68k.c" />
+    <ClCompile Include="..\..\..\core\membnk.c" />
+    <ClCompile Include="..\..\..\core\memz80.c" />
+    <ClCompile Include="..\..\..\core\ntsc\md_ntsc.c" />
+    <ClCompile Include="..\..\..\core\ntsc\sms_ntsc.c" />
+    <ClCompile Include="..\..\..\core\sound\blip_buf.c" />
+    <ClCompile Include="..\..\..\core\sound\eq.c" />
+    <ClCompile Include="..\..\..\core\sound\psg.c" />
+    <ClCompile Include="..\..\..\core\sound\sound.c" />
+    <ClCompile Include="..\..\..\core\sound\ym2413.c" />
+    <ClCompile Include="..\..\..\core\sound\ym2612.c" />
+    <ClCompile Include="..\..\..\core\state.c" />
+    <ClCompile Include="..\..\..\core\system.c" />
+    <ClCompile Include="..\..\..\core\tremor\bitwise.c" />
+    <ClCompile Include="..\..\..\core\tremor\block.c" />
+    <ClCompile Include="..\..\..\core\tremor\codebook.c" />
+    <ClCompile Include="..\..\..\core\tremor\floor0.c" />
+    <ClCompile Include="..\..\..\core\tremor\floor1.c" />
+    <ClCompile Include="..\..\..\core\tremor\framing.c" />
+    <ClCompile Include="..\..\..\core\tremor\info.c" />
+    <ClCompile Include="..\..\..\core\tremor\mapping0.c" />
+    <ClCompile Include="..\..\..\core\tremor\mdct.c" />
+    <ClCompile Include="..\..\..\core\tremor\registry.c" />
+    <ClCompile Include="..\..\..\core\tremor\res012.c" />
+    <ClCompile Include="..\..\..\core\tremor\sharedbook.c" />
+    <ClCompile Include="..\..\..\core\tremor\synthesis.c" />
+    <ClCompile Include="..\..\..\core\tremor\vorbisfile.c" />
+    <ClCompile Include="..\..\..\core\tremor\window.c" />
+    <ClCompile Include="..\..\..\core\vdp_ctrl.c" />
+    <ClCompile Include="..\..\..\core\vdp_render.c" />
+    <ClCompile Include="..\..\..\core\z80\z80.c" />
+    <ClCompile Include="..\..\libretro.c" />
+    <ClCompile Include="..\..\scrc32.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{29DF2EE7-2930-4BD3-8AC5-81A2534ACC99}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>msvc2017</RootNamespace>
+    <ProjectName>msvc-2017</ProjectName>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)msvc-2017\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)msvc-2017\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MSVC2017_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_16BPP_RENDERING;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)/../../core;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../core/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../core/m68k;$(SolutionDir)/../../core/z80;$(SolutionDir)/../../core/input_hw;$(SolutionDir)/../../core/cart_hw;$(SolutionDir)/../../core/sound;$(SolutionDir)/../../core/ntsc;$(SolutionDir)/../../core/cd_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ModuleDefinitionFile>libretro.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MSVC2017_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_16BPP_RENDERING;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)/../../core;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../core/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../core/m68k;$(SolutionDir)/../../core/z80;$(SolutionDir)/../../core/input_hw;$(SolutionDir)/../../core/cart_hw;$(SolutionDir)/../../core/sound;$(SolutionDir)/../../core/ntsc;$(SolutionDir)/../../core/cd_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>libretro.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/libretro/msvc/msvc-2017/msvc-2017.vcxproj.filters b/libretro/msvc/msvc-2017/msvc-2017.vcxproj.filters
new file mode 100644
index 0000000..32ee69b
--- /dev/null
+++ b/libretro/msvc/msvc-2017/msvc-2017.vcxproj.filters
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source Files\z80">
+      <UniqueIdentifier>{e0f9ca3b-df0f-4cf9-bde1-9fa3c945b0df}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\m68k">
+      <UniqueIdentifier>{0605ef1a-d898-494c-a898-8f06000646ae}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\cart_hw">
+      <UniqueIdentifier>{8b373848-96f7-4410-a466-5d7cb6866b0f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\cart_hw\svp">
+      <UniqueIdentifier>{ea37a461-94f4-40e3-91a8-2b254b94f547}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\input_hw">
+      <UniqueIdentifier>{becebb08-7987-4fe3-8ee0-dd47889d4996}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\ntsc">
+      <UniqueIdentifier>{e66cf784-cb76-4a70-a2e0-327a3b4c96eb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\sound">
+      <UniqueIdentifier>{39a1110f-2062-4e3c-9f43-aca63cc20cda}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\libretro">
+      <UniqueIdentifier>{95e90e29-1915-4f70-b6e0-50b9dace48cf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\cd_hw">
+      <UniqueIdentifier>{eba4b43d-dbd8-4170-9853-e3234db6dfc0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\tremor">
+      <UniqueIdentifier>{c4a5e1da-1ff3-4c81-893c-97364ed7ed4b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\core\cart_hw\svp\svp.c">
+      <Filter>Source Files\cart_hw\svp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cart_hw\svp\ssp16.c">
+      <Filter>Source Files\cart_hw\svp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cart_hw\sram.c">
+      <Filter>Source Files\cart_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cart_hw\areplay.c">
+      <Filter>Source Files\cart_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cart_hw\ggenie.c">
+      <Filter>Source Files\cart_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cart_hw\md_cart.c">
+      <Filter>Source Files\cart_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cart_hw\sms_cart.c">
+      <Filter>Source Files\cart_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\input_hw\xe_a1p.c">
+      <Filter>Source Files\input_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\input_hw\activator.c">
+      <Filter>Source Files\input_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\input_hw\gamepad.c">
+      <Filter>Source Files\input_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\input_hw\input.c">
+      <Filter>Source Files\input_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\input_hw\lightgun.c">
+      <Filter>Source Files\input_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\input_hw\mouse.c">
+      <Filter>Source Files\input_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\input_hw\paddle.c">
+      <Filter>Source Files\input_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\input_hw\sportspad.c">
+      <Filter>Source Files\input_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\input_hw\teamplayer.c">
+      <Filter>Source Files\input_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\input_hw\terebi_oekaki.c">
+      <Filter>Source Files\input_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libretro.c">
+      <Filter>Source Files\libretro</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\m68k\s68kcpu.c">
+      <Filter>Source Files\m68k</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\m68k\m68kcpu.c">
+      <Filter>Source Files\m68k</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\ntsc\sms_ntsc.c">
+      <Filter>Source Files\ntsc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\ntsc\md_ntsc.c">
+      <Filter>Source Files\ntsc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\sound\ym2612.c">
+      <Filter>Source Files\sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\sound\eq.c">
+      <Filter>Source Files\sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\sound\psg.c">
+      <Filter>Source Files\sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\sound\sound.c">
+      <Filter>Source Files\sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\sound\ym2413.c">
+      <Filter>Source Files\sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\z80\z80.c">
+      <Filter>Source Files\z80</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\vdp_render.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\genesis.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\io_ctrl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\loadrom.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\mem68k.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\membnk.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\memz80.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\state.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\system.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\vdp_ctrl.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cd_hw\scd.c">
+      <Filter>Source Files\cd_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cd_hw\cd_cart.c">
+      <Filter>Source Files\cd_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cd_hw\cdc.c">
+      <Filter>Source Files\cd_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cd_hw\cdd.c">
+      <Filter>Source Files\cd_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cd_hw\gfx.c">
+      <Filter>Source Files\cd_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cd_hw\pcm.c">
+      <Filter>Source Files\cd_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scrc32.c">
+      <Filter>Source Files\libretro</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_spi.c">
+      <Filter>Source Files\cart_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_93c.c">
+      <Filter>Source Files\cart_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\cart_hw\eeprom_i2c.c">
+      <Filter>Source Files\cart_hw</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\sound\blip_buf.c">
+      <Filter>Source Files\sound</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\window.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\bitwise.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\block.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\codebook.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\floor0.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\floor1.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\framing.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\info.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\mapping0.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\mdct.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\registry.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\res012.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\sharedbook.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\synthesis.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\vorbisfile.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

From fb7a0859948c03f78c697ccfe0ed44fecad50f5f Mon Sep 17 00:00:00 2001
From: Alberto Fustinoni <claudiuslollarius@gmail.com>
Date: Tue, 21 Mar 2017 10:52:23 +0900
Subject: [PATCH 2/2] VS compatibility edits

---
 core/macros.h                                  | 7 +++++++
 core/vdp_ctrl.c                                | 8 ++++----
 core/vdp_render.c                              | 2 +-
 libretro/msvc/msvc-2017/libretro.def           | 2 +-
 libretro/msvc/msvc-2017/msvc-2017.vcxproj      | 3 ++-
 libretro/msvc/msvc-2017/msvc-2017.vcxproj.user | 6 ++++++
 6 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 libretro/msvc/msvc-2017/msvc-2017.vcxproj.user

diff --git a/core/macros.h b/core/macros.h
index 6e5f4f7..6f8969f 100644
--- a/core/macros.h
+++ b/core/macros.h
@@ -46,4 +46,11 @@
 #define INLINE static __inline__
 #endif /* INLINE */
 
+/* Alignment macros for cross compiler compatibility */
+#if defined(_MSC_VER)
+#define ALIGNED_(x) __declspec(align(x))
+#elif defined(__GNUC__)
+#define ALIGNED_(x) __attribute__ ((aligned(x)))
+#endif
+
 #endif /* _MACROS_H_ */
diff --git a/core/vdp_ctrl.c b/core/vdp_ctrl.c
index ce8b1a1..9b12347 100644
--- a/core/vdp_ctrl.c
+++ b/core/vdp_ctrl.c
@@ -54,10 +54,10 @@
 }
 
 /* VDP context */
-uint8 sat[0x400] __attribute__((aligned(4)));    /* Internal copy of sprite attribute table */
-uint8 vram[0x10000] __attribute__((aligned(4))); /* Video RAM (64K x 8-bit) */
-uint8 cram[0x80] __attribute__((aligned(4)));    /* On-chip color RAM (64 x 9-bit) */
-uint8 vsram[0x80] __attribute__((aligned(4)));   /* On-chip vertical scroll RAM (40 x 11-bit) */
+uint8 ALIGNED_(4) sat[0x400];    /* Internal copy of sprite attribute table */
+uint8 ALIGNED_(4) vram[0x10000]; /* Video RAM (64K x 8-bit) */
+uint8 ALIGNED_(4) cram[0x80];    /* On-chip color RAM (64 x 9-bit) */
+uint8 ALIGNED_(4) vsram[0x80];   /* On-chip vertical scroll RAM (40 x 11-bit) */
 uint8 reg[0x20];                                 /* Internal VDP registers (23 x 8-bit) */
 uint8 hint_pending;                              /* 0= Line interrupt is pending */
 uint8 vint_pending;                              /* 1= Frame interrupt is pending */
diff --git a/core/vdp_render.c b/core/vdp_render.c
index c9493b3..c4a1876 100644
--- a/core/vdp_render.c
+++ b/core/vdp_render.c
@@ -553,7 +553,7 @@ static const uint32 tms_palette[16] =
 #endif
 
 /* Cached and flipped patterns */
-static uint8 bg_pattern_cache[0x80000] __attribute__((aligned(4)));
+static uint8 ALIGNED_(4) bg_pattern_cache[0x80000];
 
 /* Sprite pattern name offset look-up table (Mode 5) */
 static uint8 name_lut[0x400];
diff --git a/libretro/msvc/msvc-2017/libretro.def b/libretro/msvc/msvc-2017/libretro.def
index 70f6699..5bd0bf5 100644
--- a/libretro/msvc/msvc-2017/libretro.def
+++ b/libretro/msvc/msvc-2017/libretro.def
@@ -1,4 +1,4 @@
-LIBRARY "msvc-2010"
+LIBRARY "msvc-2017"
 EXPORTS
 retro_set_environment
 retro_set_video_refresh
diff --git a/libretro/msvc/msvc-2017/msvc-2017.vcxproj b/libretro/msvc/msvc-2017/msvc-2017.vcxproj
index 9d34b88..4adcd75 100644
--- a/libretro/msvc/msvc-2017/msvc-2017.vcxproj
+++ b/libretro/msvc/msvc-2017/msvc-2017.vcxproj
@@ -30,6 +30,7 @@
     <ClCompile Include="..\..\..\core\genesis.c" />
     <ClCompile Include="..\..\..\core\input_hw\activator.c" />
     <ClCompile Include="..\..\..\core\input_hw\gamepad.c" />
+    <ClCompile Include="..\..\..\core\input_hw\graphic_board.c" />
     <ClCompile Include="..\..\..\core\input_hw\input.c" />
     <ClCompile Include="..\..\..\core\input_hw\lightgun.c" />
     <ClCompile Include="..\..\..\core\input_hw\mouse.c" />
@@ -37,7 +38,7 @@
     <ClCompile Include="..\..\..\core\input_hw\sportspad.c" />
     <ClCompile Include="..\..\..\core\input_hw\teamplayer.c" />
     <ClCompile Include="..\..\..\core\input_hw\terebi_oekaki.c" />
-    <ClCompile Include="..\..\..\core\input_hw\xe_a1p.c" />
+    <ClCompile Include="..\..\..\core\input_hw\xe_1ap.c" />
     <ClCompile Include="..\..\..\core\io_ctrl.c" />
     <ClCompile Include="..\..\..\core\loadrom.c" />
     <ClCompile Include="..\..\..\core\m68k\m68kcpu.c" />
diff --git a/libretro/msvc/msvc-2017/msvc-2017.vcxproj.user b/libretro/msvc/msvc-2017/msvc-2017.vcxproj.user
new file mode 100644
index 0000000..0b0f24d
--- /dev/null
+++ b/libretro/msvc/msvc-2017/msvc-2017.vcxproj.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ShowAllFiles>true</ShowAllFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file