Win32: switch to VS2015

This commit is contained in:
OV2 2016-10-07 23:00:26 +02:00
parent 357fead53b
commit f060f06d31
10 changed files with 4735 additions and 830 deletions

View File

@ -1,786 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="libretro-win32"
ProjectGUID="{4A2A7544-0547-4539-8B53-047FB9A15C75}"
RootNamespace="libsneswin32"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="libsnes Debug|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../;../apu/bapu"
PreprocessorDefinitions="__WIN32__;__WIN32_LIBSNES__"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="2"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\libretro.dll"
LinkIncremental="2"
ModuleDefinitionFile="libretro.def"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="libsnes Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../;../apu/bapu"
PreprocessorDefinitions="__WIN32__;__WIN32_LIBSNES__"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="2"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\libretro.dll"
LinkIncremental="2"
ModuleDefinitionFile="libretro.def"
GenerateDebugInformation="true"
SubSystem="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="libsnes Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../;../apu/bapu"
PreprocessorDefinitions="__WIN32__;__WIN32_LIBSNES__"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="2"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\libretro.dll"
LinkIncremental="1"
ModuleDefinitionFile="libretro.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="libsnes Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="0"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="../;../apu/bapu"
PreprocessorDefinitions="__WIN32__;__WIN32_LIBSNES__"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="2"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\libretro.dll"
LinkIncremental="1"
ModuleDefinitionFile="libretro.def"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="s9x-source"
>
<File
RelativePath="..\65c816.h"
>
</File>
<File
RelativePath="..\bsx.cpp"
>
</File>
<File
RelativePath="..\bsx.h"
>
</File>
<File
RelativePath="..\c4.cpp"
>
</File>
<File
RelativePath="..\c4.h"
>
</File>
<File
RelativePath="..\c4emu.cpp"
>
</File>
<File
RelativePath="..\cheats.cpp"
>
</File>
<File
RelativePath="..\cheats.h"
>
</File>
<File
RelativePath="..\cheats2.cpp"
>
</File>
<File
RelativePath="..\clip.cpp"
>
</File>
<File
RelativePath="..\conffile.cpp"
>
</File>
<File
RelativePath="..\conffile.h"
>
</File>
<File
RelativePath="..\controls.cpp"
>
</File>
<File
RelativePath="..\controls.h"
>
</File>
<File
RelativePath="..\cpu.cpp"
>
</File>
<File
RelativePath="..\cpuaddr.h"
>
</File>
<File
RelativePath="..\cpuexec.cpp"
>
</File>
<File
RelativePath="..\cpuexec.h"
>
</File>
<File
RelativePath="..\cpumacro.h"
>
</File>
<File
RelativePath="..\cpuops.cpp"
>
</File>
<File
RelativePath="..\cpuops.h"
>
</File>
<File
RelativePath="..\crosshairs.cpp"
>
</File>
<File
RelativePath="..\crosshairs.h"
>
</File>
<File
RelativePath="..\debug.cpp"
>
</File>
<File
RelativePath="..\debug.h"
>
</File>
<File
RelativePath="..\display.h"
>
</File>
<File
RelativePath="..\dma.cpp"
>
</File>
<File
RelativePath="..\dma.h"
>
</File>
<File
RelativePath="..\dsp.cpp"
>
</File>
<File
RelativePath="..\dsp.h"
>
</File>
<File
RelativePath="..\dsp1.cpp"
>
</File>
<File
RelativePath="..\dsp2.cpp"
>
</File>
<File
RelativePath="..\dsp3.cpp"
>
</File>
<File
RelativePath="..\dsp4.cpp"
>
</File>
<File
RelativePath="..\font.h"
>
</File>
<File
RelativePath="..\fxemu.cpp"
>
</File>
<File
RelativePath="..\fxemu.h"
>
</File>
<File
RelativePath="..\fxinst.cpp"
>
</File>
<File
RelativePath="..\fxinst.h"
>
</File>
<File
RelativePath="..\getset.h"
>
</File>
<File
RelativePath="..\gfx.cpp"
>
</File>
<File
RelativePath="..\gfx.h"
>
</File>
<File
RelativePath="..\globals.cpp"
>
</File>
<File
RelativePath="..\language.h"
>
</File>
<File
RelativePath="..\loadzip.cpp"
>
</File>
<File
RelativePath="..\logger.cpp"
>
</File>
<File
RelativePath="..\logger.h"
>
</File>
<File
RelativePath="..\memmap.cpp"
>
</File>
<File
RelativePath="..\memmap.h"
>
</File>
<File
RelativePath="..\messages.h"
>
</File>
<File
RelativePath="..\missing.h"
>
</File>
<File
RelativePath="..\movie.cpp"
>
</File>
<File
RelativePath="..\movie.h"
>
</File>
<File
RelativePath="..\netplay.cpp"
>
</File>
<File
RelativePath="..\netplay.h"
>
</File>
<File
RelativePath="..\obc1.cpp"
>
</File>
<File
RelativePath="..\obc1.h"
>
</File>
<File
RelativePath="..\pixform.h"
>
</File>
<File
RelativePath="..\port.h"
>
</File>
<File
RelativePath="..\ppu.cpp"
>
</File>
<File
RelativePath="..\ppu.h"
>
</File>
<File
RelativePath="..\sa1.cpp"
>
</File>
<File
RelativePath="..\sa1.h"
>
</File>
<File
RelativePath="..\sa1cpu.cpp"
>
</File>
<File
RelativePath="..\sar.h"
>
</File>
<File
RelativePath="..\screenshot.cpp"
>
</File>
<File
RelativePath="..\screenshot.h"
>
</File>
<File
RelativePath="..\sdd1.cpp"
>
</File>
<File
RelativePath="..\sdd1.h"
>
</File>
<File
RelativePath="..\sdd1emu.cpp"
>
</File>
<File
RelativePath="..\sdd1emu.h"
>
</File>
<File
RelativePath="..\server.cpp"
>
</File>
<File
RelativePath="..\seta.cpp"
>
</File>
<File
RelativePath="..\seta.h"
>
</File>
<File
RelativePath="..\seta010.cpp"
>
</File>
<File
RelativePath="..\seta011.cpp"
>
</File>
<File
RelativePath="..\seta018.cpp"
>
</File>
<File
RelativePath="..\snapshot.cpp"
>
</File>
<File
RelativePath="..\snapshot.h"
>
</File>
<File
RelativePath="..\snes9x.cpp"
>
</File>
<File
RelativePath="..\snes9x.h"
>
</File>
<File
RelativePath="..\spc7110.cpp"
>
</File>
<File
RelativePath="..\spc7110.h"
>
</File>
<File
RelativePath="..\srtc.cpp"
>
</File>
<File
RelativePath="..\srtc.h"
>
</File>
<File
RelativePath="..\stream.cpp"
>
</File>
<File
RelativePath="..\stream.h"
>
</File>
<File
RelativePath="..\tile.cpp"
>
</File>
<File
RelativePath="..\tile.h"
>
</File>
<Filter
Name="APU"
>
<File
RelativePath="..\apu\apu.cpp"
>
</File>
<File
RelativePath="..\apu\apu.h"
>
</File>
<File
RelativePath="..\apu\hermite_resampler.h"
>
</File>
<File
RelativePath="..\apu\resampler.h"
>
</File>
<File
RelativePath="..\apu\ring_buffer.h"
>
</File>
<Filter
Name="SMP"
>
<File
RelativePath="..\apu\bapu\smp\smp.cpp"
>
</File>
<File
RelativePath="..\apu\bapu\smp\smp_state.cpp"
>
</File>
</Filter>
<Filter
Name="DSP"
>
<File
RelativePath="..\apu\bapu\dsp\blargg_common.h"
>
</File>
<File
RelativePath="..\apu\bapu\dsp\blargg_config.h"
>
</File>
<File
RelativePath="..\apu\bapu\dsp\blargg_endian.h"
>
</File>
<File
RelativePath="..\apu\bapu\dsp\blargg_source.h"
>
</File>
<File
RelativePath="..\apu\bapu\dsp\sdsp.cpp"
>
</File>
<File
RelativePath="..\apu\bapu\dsp\sdsp.hpp"
>
</File>
<File
RelativePath="..\apu\bapu\dsp\SPC_DSP.cpp"
>
</File>
<File
RelativePath="..\apu\bapu\dsp\SPC_DSP.h"
>
</File>
</Filter>
</Filter>
</Filter>
<Filter
Name="libretro"
>
<File
RelativePath=".\libretro.cpp"
>
</File>
<File
RelativePath=".\libretro.def"
>
</File>
<File
RelativePath=".\libretro.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -0,0 +1,299 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="libsnes Debug|Win32">
<Configuration>libsnes Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="libsnes Debug|x64">
<Configuration>libsnes Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="libsnes Release|Win32">
<Configuration>libsnes Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="libsnes Release|x64">
<Configuration>libsnes Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4A2A7544-0547-4539-8B53-047FB9A15C75}</ProjectGuid>
<RootNamespace>libsneswin32</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Debug|Win32'">
<OutDir>$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Debug|x64'">
<OutDir>$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Release|Win32'">
<OutDir>$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Release|x64'">
<OutDir>$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../;../apu/bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__WIN32__;__WIN32_LIBSNES__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level2</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(OutDir)libretro.dll</OutputFile>
<ModuleDefinitionFile>libretro.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../;../apu/bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__WIN32__;__WIN32_LIBSNES__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level2</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(OutDir)libretro.dll</OutputFile>
<ModuleDefinitionFile>libretro.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Release|Win32'">
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>../;../apu/bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__WIN32__;__WIN32_LIBSNES__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader />
<WarningLevel>Level2</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(OutDir)libretro.dll</OutputFile>
<ModuleDefinitionFile>libretro.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='libsnes Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>../;../apu/bapu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>__WIN32__;__WIN32_LIBSNES__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader />
<WarningLevel>Level2</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(OutDir)libretro.dll</OutputFile>
<ModuleDefinitionFile>libretro.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\65c816.h" />
<ClInclude Include="..\apu\apu.h" />
<ClInclude Include="..\apu\bapu\dsp\blargg_common.h" />
<ClInclude Include="..\apu\bapu\dsp\blargg_config.h" />
<ClInclude Include="..\apu\bapu\dsp\blargg_endian.h" />
<ClInclude Include="..\apu\bapu\dsp\blargg_source.h" />
<ClInclude Include="..\apu\bapu\dsp\sdsp.hpp" />
<ClInclude Include="..\apu\bapu\dsp\SPC_DSP.h" />
<ClInclude Include="..\apu\hermite_resampler.h" />
<ClInclude Include="..\apu\resampler.h" />
<ClInclude Include="..\apu\ring_buffer.h" />
<ClInclude Include="..\bsx.h" />
<ClInclude Include="..\c4.h" />
<ClInclude Include="..\cheats.h" />
<ClInclude Include="..\conffile.h" />
<ClInclude Include="..\controls.h" />
<ClInclude Include="..\cpuaddr.h" />
<ClInclude Include="..\cpuexec.h" />
<ClInclude Include="..\cpumacro.h" />
<ClInclude Include="..\cpuops.h" />
<ClInclude Include="..\crosshairs.h" />
<ClInclude Include="..\debug.h" />
<ClInclude Include="..\display.h" />
<ClInclude Include="..\dma.h" />
<ClInclude Include="..\dsp.h" />
<ClInclude Include="..\font.h" />
<ClInclude Include="..\fxemu.h" />
<ClInclude Include="..\fxinst.h" />
<ClInclude Include="..\getset.h" />
<ClInclude Include="..\gfx.h" />
<ClInclude Include="..\language.h" />
<ClInclude Include="..\logger.h" />
<ClInclude Include="..\memmap.h" />
<ClInclude Include="..\messages.h" />
<ClInclude Include="..\missing.h" />
<ClInclude Include="..\movie.h" />
<ClInclude Include="..\netplay.h" />
<ClInclude Include="..\obc1.h" />
<ClInclude Include="..\pixform.h" />
<ClInclude Include="..\port.h" />
<ClInclude Include="..\ppu.h" />
<ClInclude Include="..\sa1.h" />
<ClInclude Include="..\sar.h" />
<ClInclude Include="..\screenshot.h" />
<ClInclude Include="..\sdd1.h" />
<ClInclude Include="..\sdd1emu.h" />
<ClInclude Include="..\seta.h" />
<ClInclude Include="..\snapshot.h" />
<ClInclude Include="..\snes9x.h" />
<ClInclude Include="..\spc7110.h" />
<ClInclude Include="..\srtc.h" />
<ClInclude Include="..\stream.h" />
<ClInclude Include="..\tile.h" />
<ClInclude Include="libretro.h" />
</ItemGroup>
<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\smp\smp.cpp" />
<ClCompile Include="..\apu\bapu\smp\smp_state.cpp" />
<ClCompile Include="..\bsx.cpp" />
<ClCompile Include="..\c4.cpp" />
<ClCompile Include="..\c4emu.cpp" />
<ClCompile Include="..\cheats.cpp" />
<ClCompile Include="..\cheats2.cpp" />
<ClCompile Include="..\clip.cpp" />
<ClCompile Include="..\conffile.cpp" />
<ClCompile Include="..\controls.cpp" />
<ClCompile Include="..\cpu.cpp" />
<ClCompile Include="..\cpuexec.cpp" />
<ClCompile Include="..\cpuops.cpp" />
<ClCompile Include="..\crosshairs.cpp" />
<ClCompile Include="..\debug.cpp" />
<ClCompile Include="..\dma.cpp" />
<ClCompile Include="..\dsp.cpp" />
<ClCompile Include="..\dsp1.cpp" />
<ClCompile Include="..\dsp2.cpp" />
<ClCompile Include="..\dsp3.cpp" />
<ClCompile Include="..\dsp4.cpp" />
<ClCompile Include="..\fxemu.cpp" />
<ClCompile Include="..\fxinst.cpp" />
<ClCompile Include="..\gfx.cpp" />
<ClCompile Include="..\globals.cpp" />
<ClCompile Include="..\loadzip.cpp" />
<ClCompile Include="..\logger.cpp" />
<ClCompile Include="..\memmap.cpp" />
<ClCompile Include="..\movie.cpp" />
<ClCompile Include="..\netplay.cpp" />
<ClCompile Include="..\obc1.cpp" />
<ClCompile Include="..\ppu.cpp" />
<ClCompile Include="..\sa1.cpp" />
<ClCompile Include="..\sa1cpu.cpp" />
<ClCompile Include="..\screenshot.cpp" />
<ClCompile Include="..\sdd1.cpp" />
<ClCompile Include="..\sdd1emu.cpp" />
<ClCompile Include="..\server.cpp" />
<ClCompile Include="..\seta.cpp" />
<ClCompile Include="..\seta010.cpp" />
<ClCompile Include="..\seta011.cpp" />
<ClCompile Include="..\seta018.cpp" />
<ClCompile Include="..\snapshot.cpp" />
<ClCompile Include="..\snes9x.cpp" />
<ClCompile Include="..\spc7110.cpp" />
<ClCompile Include="..\srtc.cpp" />
<ClCompile Include="..\stream.cpp" />
<ClCompile Include="..\tile.cpp" />
<ClCompile Include="libretro.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="libretro.def" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -0,0 +1,342 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="s9x-source">
<UniqueIdentifier>{11448d42-5e46-4e58-b0be-8cb4b3b52ec0}</UniqueIdentifier>
</Filter>
<Filter Include="s9x-source\APU">
<UniqueIdentifier>{dff4c5c7-1360-4c70-9a67-f5457847b1e9}</UniqueIdentifier>
</Filter>
<Filter Include="s9x-source\APU\SMP">
<UniqueIdentifier>{d36ce584-8d5f-421c-9e1c-219a937e23c3}</UniqueIdentifier>
</Filter>
<Filter Include="s9x-source\APU\DSP">
<UniqueIdentifier>{bb8b70ce-cd5a-45ab-848c-5c5379190802}</UniqueIdentifier>
</Filter>
<Filter Include="libretro">
<UniqueIdentifier>{7445db59-72e6-42a3-963c-c352087333b1}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\65c816.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\bsx.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\c4.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\cheats.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\conffile.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\controls.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\cpuaddr.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\cpuexec.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\cpumacro.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\cpuops.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\crosshairs.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\debug.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\display.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\dma.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\dsp.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\font.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\fxemu.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\fxinst.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\getset.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\gfx.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\language.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\logger.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\memmap.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\messages.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\missing.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\movie.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\netplay.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\obc1.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\pixform.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\port.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\ppu.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\sa1.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\sar.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\screenshot.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\sdd1.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\sdd1emu.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\seta.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\snapshot.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\snes9x.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\spc7110.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\srtc.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\stream.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\tile.h">
<Filter>s9x-source</Filter>
</ClInclude>
<ClInclude Include="..\apu\apu.h">
<Filter>s9x-source\APU</Filter>
</ClInclude>
<ClInclude Include="..\apu\hermite_resampler.h">
<Filter>s9x-source\APU</Filter>
</ClInclude>
<ClInclude Include="..\apu\resampler.h">
<Filter>s9x-source\APU</Filter>
</ClInclude>
<ClInclude Include="..\apu\ring_buffer.h">
<Filter>s9x-source\APU</Filter>
</ClInclude>
<ClInclude Include="..\apu\bapu\dsp\blargg_common.h">
<Filter>s9x-source\APU\DSP</Filter>
</ClInclude>
<ClInclude Include="..\apu\bapu\dsp\blargg_config.h">
<Filter>s9x-source\APU\DSP</Filter>
</ClInclude>
<ClInclude Include="..\apu\bapu\dsp\blargg_endian.h">
<Filter>s9x-source\APU\DSP</Filter>
</ClInclude>
<ClInclude Include="..\apu\bapu\dsp\blargg_source.h">
<Filter>s9x-source\APU\DSP</Filter>
</ClInclude>
<ClInclude Include="..\apu\bapu\dsp\sdsp.hpp">
<Filter>s9x-source\APU\DSP</Filter>
</ClInclude>
<ClInclude Include="..\apu\bapu\dsp\SPC_DSP.h">
<Filter>s9x-source\APU\DSP</Filter>
</ClInclude>
<ClInclude Include="libretro.h">
<Filter>libretro</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\bsx.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\c4.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\c4emu.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\cheats.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\cheats2.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\clip.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\conffile.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\controls.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\cpu.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\cpuexec.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\cpuops.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\crosshairs.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\debug.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\dma.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\dsp.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\dsp1.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\dsp2.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\dsp3.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\dsp4.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\fxemu.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\fxinst.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\gfx.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\globals.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\loadzip.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\logger.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\memmap.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\movie.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\netplay.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\obc1.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\ppu.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\sa1.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\sa1cpu.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\screenshot.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\sdd1.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\sdd1emu.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\server.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\seta.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\seta010.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\seta011.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\seta018.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\snapshot.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\snes9x.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\spc7110.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\srtc.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\stream.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\tile.cpp">
<Filter>s9x-source</Filter>
</ClCompile>
<ClCompile Include="..\apu\apu.cpp">
<Filter>s9x-source\APU</Filter>
</ClCompile>
<ClCompile Include="..\apu\bapu\smp\smp.cpp">
<Filter>s9x-source\APU\SMP</Filter>
</ClCompile>
<ClCompile Include="..\apu\bapu\smp\smp_state.cpp">
<Filter>s9x-source\APU\SMP</Filter>
</ClCompile>
<ClCompile Include="..\apu\bapu\dsp\sdsp.cpp">
<Filter>s9x-source\APU\DSP</Filter>
</ClCompile>
<ClCompile Include="..\apu\bapu\dsp\SPC_DSP.cpp">
<Filter>s9x-source\APU\DSP</Filter>
</ClCompile>
<ClCompile Include="libretro.cpp">
<Filter>libretro</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -180,7 +180,6 @@
#pragma comment( lib, "d3d9" )
#pragma comment( lib, "d3dx9" )
#pragma comment( lib, "DxErr" )
#include "cdirect3d.h"
#include "win32_display.h"
@ -192,6 +191,8 @@
#include <commctrl.h>
#include "CXML.h"
#include "../filter/hq2x.h"
#include "../filter/2xsai.h"

3965
win32/dxerr.cpp Normal file

File diff suppressed because it is too large Load Diff

80
win32/dxerr.h Normal file
View File

@ -0,0 +1,80 @@
//--------------------------------------------------------------------------------------
// File: DXErr.h
//
// DirectX Error Library
//
// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF
// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO
// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
// PARTICULAR PURPOSE.
//
// Copyright (c) Microsoft Corporation. All rights reserved.
//--------------------------------------------------------------------------------------
// This version only supports UNICODE.
#pragma once
#if !defined(NOMINMAX)
#define NOMINMAX
#endif
#include <windows.h>
#include <sal.h>
#ifdef __cplusplus
extern "C" {
#endif
//--------------------------------------------------------------------------------------
// DXGetErrorString
//--------------------------------------------------------------------------------------
const WCHAR* WINAPI DXGetErrorStringW( _In_ HRESULT hr );
#define DXGetErrorString DXGetErrorStringW
//--------------------------------------------------------------------------------------
// DXGetErrorDescription has to be modified to return a copy in a buffer rather than
// the original static string.
//--------------------------------------------------------------------------------------
void WINAPI DXGetErrorDescriptionW( _In_ HRESULT hr, _Out_cap_(count) WCHAR* desc, _In_ size_t count );
#define DXGetErrorDescription DXGetErrorDescriptionW
//--------------------------------------------------------------------------------------
// DXTrace
//
// Desc: Outputs a formatted error message to the debug stream
//
// Args: WCHAR* strFile The current file, typically passed in using the
// __FILEW__ macro.
// DWORD dwLine The current line number, typically passed in using the
// __LINE__ macro.
// HRESULT hr An HRESULT that will be traced to the debug stream.
// CHAR* strMsg A string that will be traced to the debug stream (may be NULL)
// BOOL bPopMsgBox If TRUE, then a message box will popup also containing the passed info.
//
// Return: The hr that was passed in.
//--------------------------------------------------------------------------------------
HRESULT WINAPI DXTraceW( _In_z_ const WCHAR* strFile, _In_ DWORD dwLine, _In_ HRESULT hr, _In_opt_ const WCHAR* strMsg, _In_ bool bPopMsgBox );
#define DXTrace DXTraceW
//--------------------------------------------------------------------------------------
//
// Helper macros
//
//--------------------------------------------------------------------------------------
#if defined(DEBUG) || defined(_DEBUG)
#define DXTRACE_MSG(str) DXTrace( __FILEW__, (DWORD)__LINE__, 0, str, false )
#define DXTRACE_ERR(str,hr) DXTrace( __FILEW__, (DWORD)__LINE__, hr, str, false )
#define DXTRACE_ERR_MSGBOX(str,hr) DXTrace( __FILEW__, (DWORD)__LINE__, hr, str, true )
#else
#define DXTRACE_MSG(str) (0L)
#define DXTRACE_ERR(str,hr) (hr)
#define DXTRACE_ERR_MSGBOX(str,hr) (hr)
#endif
#ifdef __cplusplus
}
#endif //__cplusplus

View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Snes9X", "snes9xw.vcxproj", "{B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}"
EndProject

View File

@ -38,57 +38,60 @@
<ProjectName>Snes9X</ProjectName>
<ProjectGuid>{B86059D8-C9A6-46BE-8FBA-3170C54F1DFD}</ProjectGuid>
<RootNamespace>Snes9X</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@ -126,16 +129,14 @@
<OutDir>$(ProjectDir)</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>snes9x</TargetName>
<IncludePath>$(DXSDK_DIR)include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CG_INC_PATH);</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(CG_LIB_PATH);</LibraryPath>
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);$(CG_BIN_PATH);</ExecutablePath>
<IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>snes9x-x64</TargetName>
<IncludePath>$(DXSDK_DIR)include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CG_INC_PATH);</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(CG_BIN64_PATH);</LibraryPath>
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);$(CG_BIN64_PATH);</ExecutablePath>
<IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(LibraryPath)</LibraryPath>
<OutDir>$(ProjectDir)</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -143,16 +144,14 @@
<OutDir>$(ProjectDir)</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>snes9x-debug</TargetName>
<IncludePath>$(DXSDK_DIR)include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CG_INC_PATH);</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(CG_LIB_PATH);</LibraryPath>
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);$(CG_BIN_PATH);</ExecutablePath>
<IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>snes9x-debug-x64</TargetName>
<IncludePath>$(DXSDK_DIR)include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CG_INC_PATH);</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(CG_BIN64_PATH);</LibraryPath>
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);$(CG_BIN64_PATH);</ExecutablePath>
<IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(LibraryPath)</LibraryPath>
<OutDir>$(ProjectDir)</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">
@ -160,16 +159,14 @@
<OutDir>$(ProjectDir)</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>snes9x-debug</TargetName>
<IncludePath>$(DXSDK_DIR)include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CG_INC_PATH);</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(CG_LIB_PATH);</LibraryPath>
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);$(CG_BIN_PATH);</ExecutablePath>
<IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>snes9x-debug-x64</TargetName>
<IncludePath>$(DXSDK_DIR)include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CG_INC_PATH);</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(CG_BIN64_PATH);</LibraryPath>
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);$(CG_BIN64_PATH);</ExecutablePath>
<IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(LibraryPath)</LibraryPath>
<OutDir>$(ProjectDir)</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">
@ -177,16 +174,14 @@
<OutDir>$(ProjectDir)</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>snes9x</TargetName>
<IncludePath>$(DXSDK_DIR)include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CG_INC_PATH);</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(CG_LIB_PATH);</LibraryPath>
<ExecutablePath>$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);$(CG_BIN_PATH);</ExecutablePath>
<IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
<LinkIncremental>false</LinkIncremental>
<TargetName>snes9x-x64</TargetName>
<IncludePath>$(DXSDK_DIR)include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(CG_INC_PATH);</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(CG_BIN64_PATH);</LibraryPath>
<ExecutablePath>$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);$(CG_BIN64_PATH);</ExecutablePath>
<IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(CG_LIB64_PATH);$(LibraryPath)</LibraryPath>
<OutDir>$(ProjectDir)</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -704,6 +699,7 @@
<ClInclude Include="COpenGL.h" />
<ClInclude Include="CXAudio2.h" />
<ClInclude Include="CXML.h" />
<ClInclude Include="dxerr.h" />
<ClInclude Include="globals.h" />
<ClInclude Include="InputCustom.h" />
<ClInclude Include="IS9xDisplayOutput.h" />
@ -849,6 +845,7 @@
<ClCompile Include="COpenGL.cpp" />
<ClCompile Include="CXAudio2.cpp" />
<ClCompile Include="CXML.cpp" />
<ClCompile Include="dxerr.cpp" />
<ClCompile Include="InputCustom.cpp" />
<ClCompile Include="render.cpp" />
<ClCompile Include="snes_ntsc.c" />

View File

@ -240,6 +240,9 @@
<ClInclude Include="..\filter\xbrz.h">
<Filter>Filter</Filter>
</ClInclude>
<ClInclude Include="dxerr.h">
<Filter>GUI</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\bsx.cpp">
@ -533,6 +536,9 @@
<ClCompile Include="..\filter\xbrz.cpp">
<Filter>Filter</Filter>
</ClCompile>
<ClCompile Include="dxerr.cpp">
<Filter>GUI</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="rsrc\nodrop.cur">

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="LIB Debug S9xUnicode|Win32">
<Configuration>LIB Debug S9xUnicode</Configuration>
@ -38,50 +38,51 @@
<ProjectGuid>{99E9817A-4605-44AF-8433-7048F0EC1859}</ProjectGuid>
<RootNamespace>zlib</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Release S9xUnicode|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Debug S9xUnicode|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Release S9xUnicode|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Debug S9xUnicode|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />