Merge pull request #417 from retrotalker/appveyor-merge

appveyor libretro

appveyor.yml

@@ -18,6 +18,20 @@ environment:
     output: win32\snes9x-x64.exe
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 
+  - generator: "Visual Studio 15"
+    config: libretro Release
+    platform: Win32
+    arch: libretro
+    output: libretro\Win32\libretro Release\snes9x_libretro.dll
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+
+  - generator: "Visual Studio 15"
+    config: libretro Release
+    platform: x64
+    arch: libretro-x64
+    output: libretro\x64\libretro Release\snes9x_libretro.dll
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+
 init:
   - git config --global core.autocrlf input
 
@@ -25,7 +39,8 @@ before_build:
   - git submodule update --init --recursive
 
 build_script:
-  - msbuild win32\snes9xw.sln /t:build /p:Configuration="%config%";Platform="%platform%" /m /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - if "%config%"=="Release Unicode" msbuild win32\snes9xw.sln /t:build /p:Configuration="%config%";Platform="%platform%" /m /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - if "%config%"=="libretro Release" msbuild libretro\libretro-win32.vcxproj /t:build /p:Configuration="%config%";Platform="%platform%" /m /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 after_build:
   - ps: $env:gitrev = git describe --tags
@@ -34,10 +49,11 @@ after_build:
   - if exist artifacts rmdir /s /q artifacts
   - mkdir artifacts
   - copy "%output%" artifacts
-  - copy docs\changes.txt artifacts
+  - if "%config%"=="Release Unicode"
-  - copy docs\snes9x-license.txt artifacts
+    copy docs\changes.txt artifacts |
-  - copy win32\docs\faqs-windows.txt artifacts
+    copy docs\snes9x-license.txt artifacts |
-  - copy win32\docs\readme-windows.txt artifacts
+    copy win32\docs\faqs-windows.txt artifacts |
+    copy win32\docs\readme-windows.txt artifacts
   - 7z a %package_name%.zip .\artifacts\*
 
 artifacts:

libretro/libretro-win32.vcxproj

@@ -70,25 +70,25 @@
     <OutDir>$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>libretro_debug</TargetName>
+    <TargetName>snes9x_libretro_debug</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libretro Debug|x64'">
     <OutDir>$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>libretro_debug</TargetName>
+    <TargetName>snes9x_libretro_debug</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libretro Release|Win32'">
     <OutDir>$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>libretro</TargetName>
+    <TargetName>snes9x_libretro</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libretro Release|x64'">
     <OutDir>$(Platform)\$(Configuration)\</OutDir>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>libretro</TargetName>
+    <TargetName>snes9x_libretro</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='libretro Debug|Win32'">
     <ClCompile>
@@ -243,7 +243,12 @@
   <ItemGroup>
     <ClCompile Include="..\apu\apu.cpp" />
     <ClCompile Include="..\apu\bapu\dsp\sdsp.cpp" />
-    <ClCompile Include="..\apu\bapu\dsp\SPC_DSP.cpp" />
+    <ClCompile Include="..\apu\bapu\dsp\SPC_DSP.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='libretro Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='libretro Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='libretro Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='libretro Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\apu\bapu\smp\smp.cpp" />
     <ClCompile Include="..\apu\bapu\smp\smp_state.cpp" />
     <ClCompile Include="..\bml.cpp" />
@@ -300,4 +305,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

win32/snes9xw.vcxproj

@@ -451,7 +451,12 @@
   <ItemGroup>
     <ClCompile Include="..\apu\apu.cpp" />
     <ClCompile Include="..\apu\bapu\dsp\sdsp.cpp" />
-    <ClCompile Include="..\apu\bapu\dsp\SPC_DSP.cpp" />
+    <ClCompile Include="..\apu\bapu\dsp\SPC_DSP.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\apu\bapu\smp\smp.cpp" />
     <ClCompile Include="..\apu\bapu\smp\smp_state.cpp" />
     <ClCompile Include="..\bsx.cpp" />
@@ -717,4 +722,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>