Update to VS2013 and a slew of build-related updates. Notes:

* Currently there is no DEBUGFAST configuration. Defining DEBUGFAST as a preprocessor definition in Base.props (or a global header) enables it for now, pending a better method. This was done to make managing the build harder to screw up. However it may not even be an issue anymore with the new .props usage.
* D3DX11SaveTextureToFile usage is dropped and not replaced.
* If you have $(DXSDK_DIR) in your global property sheets (Microsoft.Cpp.$(PlatformName).user), you need to remove it. The build will error out with a message if it's configured incorrectly.
* If you are on Windows 8 or above, you no longer need the June 2010 DirectX SDK installed to build dolphin. If you are in this situation, it is still required if you want your built binaries to be able to use XAudio2 and XInput on previous Windows versions.
* GLew updated to 1.10.0
* compiler switches added: /volatile:iso, /d2Zi+
* LTCG available via msbuild property: DolphinRelease
* SDL updated to 2.0.0
* All Externals (excl. OpenAL and SDL) are built from source.
* Now uses STL version of std::{mutex,condition_variable,thread}
* Now uses Build as root directory for *all* intermediate files
* Binary directory is populated as post-build msbuild action
* .gitignore is simplified
* UnitTests project is no longer compiled
This commit is contained in:
Shawn Hoffman
2013-10-19 02:27:57 -07:00
parent 1eba4da21a
commit ccd30024b3
390 changed files with 104570 additions and 35686 deletions

View File

@ -1,408 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugFast|Win32">
<Configuration>DebugFast</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DebugFast|x64">
<Configuration>DebugFast</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{1B099EF8-6F87-47A2-A3E7-898A24584F49}</ProjectGuid>
<RootNamespace>Dolphin</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</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" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\VSProps\CodeGen_Debug.props" />
<Import Project="..\..\VSProps\Dolphin.Win32.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\VSProps\Dolphin.x64.props" />
<Import Project="..\..\VSProps\CodeGen_Debug.props" />
</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" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\CodeGen_Release.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\VSProps\Dolphin.Win32.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\VSProps\Dolphin.Win32.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\CodeGen_Release.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\VSProps\Dolphin.x64.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
<Import Project="..\..\VSProps\Dolphin.x64.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>$(ProjectName)D</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>$(ProjectName)D</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
<TargetName>$(ProjectName)DF</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
<TargetName>$(ProjectName)DF</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link />
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
echo Copying External .dlls
xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
</Command>
<Message>Copying Data\* to $(TargetDir)</Message>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link />
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
echo Copying External .dlls
xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
</Command>
<Message>Copying Data\* to $(TargetDir)</Message>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OpenMPSupport>
</OpenMPSupport>
</ClCompile>
<Link />
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
echo Copying External .dlls
xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
</Command>
<Message>Copying Data\* to $(TargetDir)</Message>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link />
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
echo Copying External .dlls
xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
</Command>
<Message>Copying Data\* to $(TargetDir)</Message>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OpenMPSupport>
</OpenMPSupport>
</ClCompile>
<Link />
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
echo Copying External .dlls
xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
</Command>
<Message>Copying Data\* to $(TargetDir)</Message>
</PostBuildEvent>
<ResourceCompile>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;..\..\..\Externals\polarssl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link />
<PostBuildEvent>
<Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
echo Copying External .dlls
xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
xcopy "$(SolutionDir)..\Externals\msvcrt\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
</Command>
<Message>Copying Data\* to $(TargetDir)</Message>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Src\AboutDolphin.cpp" />
<ClCompile Include="Src\ARCodeAddEdit.cpp" />
<ClCompile Include="Src\Debugger\BreakpointDlg.cpp" />
<ClCompile Include="Src\Debugger\BreakpointView.cpp" />
<ClCompile Include="Src\Debugger\BreakpointWindow.cpp" />
<ClCompile Include="Src\CheatsWindow.cpp" />
<ClCompile Include="Src\Debugger\CodeView.cpp" />
<ClCompile Include="Src\Debugger\CodeWindow.cpp" />
<ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp" />
<ClCompile Include="Src\ConfigMain.cpp" />
<ClCompile Include="Src\Debugger\DebuggerPanel.cpp" />
<ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp" />
<ClCompile Include="Src\Debugger\DSPDebugWindow.cpp" />
<ClCompile Include="Src\Debugger\DSPRegisterView.cpp" />
<ClCompile Include="Src\FifoPlayerDlg.cpp" />
<ClCompile Include="Src\Frame.cpp" />
<ClCompile Include="Src\FrameAui.cpp" />
<ClCompile Include="Src\FrameTools.cpp" />
<ClCompile Include="Src\GameListCtrl.cpp" />
<ClCompile Include="Src\GeckoCodeDiag.cpp" />
<ClCompile Include="Src\HotkeyDlg.cpp" />
<ClCompile Include="Src\InputConfigDiag.cpp" />
<ClCompile Include="Src\InputConfigDiagBitmaps.cpp" />
<ClCompile Include="Src\ISOFile.cpp" />
<ClCompile Include="Src\ISOProperties.cpp" />
<ClCompile Include="Src\Debugger\JitWindow.cpp" />
<ClCompile Include="Src\LogConfigWindow.cpp" />
<ClCompile Include="Src\LogWindow.cpp" />
<ClCompile Include="Src\Main.cpp" />
<ClCompile Include="Src\MainNoGUI.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Src\MemcardManager.cpp" />
<ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp" />
<ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp" />
<ClCompile Include="Src\Debugger\MemoryView.cpp" />
<ClCompile Include="Src\Debugger\MemoryWindow.cpp" />
<ClCompile Include="Src\NetWindow.cpp" />
<ClCompile Include="Src\PatchAddEdit.cpp" />
<ClCompile Include="Src\PHackSettings.cpp" />
<ClCompile Include="Src\Debugger\RegisterView.cpp" />
<ClCompile Include="Src\Debugger\RegisterWindow.cpp" />
<ClCompile Include="Src\GLInterface\WGL.cpp" />
<ClCompile Include="Src\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Src\TASInputDlg.cpp" />
<ClCompile Include="Src\UDPConfigDiag.cpp" />
<ClCompile Include="Src\VideoConfigDiag.cpp" />
<ClCompile Include="Src\WiimoteConfigDiag.cpp" />
<ClCompile Include="Src\WXInputBase.cpp" />
<ClCompile Include="Src\WxUtils.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h" />
<ClInclude Include="Src\AboutDolphin.h" />
<ClInclude Include="Src\ARCodeAddEdit.h" />
<ClInclude Include="Src\Debugger\BreakpointDlg.h" />
<ClInclude Include="Src\Debugger\BreakpointView.h" />
<ClInclude Include="Src\Debugger\BreakpointWindow.h" />
<ClInclude Include="Src\CheatsWindow.h" />
<ClInclude Include="Src\Debugger\CodeView.h" />
<ClInclude Include="Src\Debugger\CodeWindow.h" />
<ClInclude Include="Src\ConfigMain.h" />
<ClInclude Include="Src\Debugger\DebuggerPanel.h" />
<ClInclude Include="Src\Debugger\DebuggerUIUtil.h" />
<ClInclude Include="Src\Debugger\DSPDebugWindow.h" />
<ClInclude Include="Src\Debugger\DSPRegisterView.h" />
<ClInclude Include="Src\FifoPlayerDlg.h" />
<ClInclude Include="Src\Frame.h" />
<ClInclude Include="Src\GameListCtrl.h" />
<ClInclude Include="Src\GeckoCodeDiag.h" />
<ClInclude Include="Src\Globals.h" />
<ClInclude Include="Src\HotkeyDlg.h" />
<ClInclude Include="Src\InputConfigDiag.h" />
<ClInclude Include="Src\ISOFile.h" />
<ClInclude Include="Src\ISOProperties.h" />
<ClInclude Include="Src\Debugger\JitWindow.h" />
<ClInclude Include="Src\LogConfigWindow.h" />
<ClInclude Include="Src\LogWindow.h" />
<ClInclude Include="Src\Main.h" />
<ClInclude Include="Src\MemcardManager.h" />
<ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h" />
<ClInclude Include="Src\Debugger\MemoryCheckDlg.h" />
<ClInclude Include="Src\Debugger\MemoryView.h" />
<ClInclude Include="Src\Debugger\MemoryWindow.h" />
<ClInclude Include="Src\NetWindow.h" />
<ClInclude Include="Src\PatchAddEdit.h" />
<ClInclude Include="Src\PHackSettings.h" />
<ClInclude Include="Src\Debugger\RegisterView.h" />
<ClInclude Include="Src\Debugger\RegisterWindow.h" />
<ClInclude Include="Src\stdafx.h" />
<ClInclude Include="Src\TASInputDlg.h" />
<ClInclude Include="Src\UDPConfigDiag.h" />
<ClInclude Include="Src\VideoConfigDiag.h" />
<ClInclude Include="Src\WiimoteConfigDiag.h" />
<ClInclude Include="Src\WXInputBase.h" />
<ClInclude Include="Src\WxUtils.h" />
<ClInclude Include="Src\GLInterface.h" />
<ClInclude Include="Src\GLInterface\InterfaceBase.h" />
<ClInclude Include="Src\GLInterface\WGL.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\Installer\Dolphin.ico" />
<None Include="CMakeLists.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
<Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\libpng\png\png.vcxproj">
<Project>{01573c36-ac6e-49f6-94ba-572517eb9740}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\libusbx\msvc\libusb_static_2010.vcxproj">
<Project>{349ee8f9-7d25-4909-aaf5-ff3fade72187}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\LZO\LZO.vcxproj">
<Project>{d8890b98-26f7-4cff-bbfb-b95f371b5f20}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\miniupnpc\miniupnpc.vcxproj">
<Project>{a680190d-0764-485b-9cf3-a82c5edd5715}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\SFML\build\vc2010\SFML_Network.vcxproj">
<Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
<Private>true</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\wxWidgets3\build\msw\wx_base.vcxproj">
<Project>{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\zlib\zlib.vcxproj">
<Project>{3e1339f5-9311-4122-9442-369702e8fcad}</Project>
</ProjectReference>
<ProjectReference Include="..\AudioCommon\AudioCommon.vcxproj">
<Project>{37d007bd-d66c-4eaf-b56c-bd1aac340a05}</Project>
</ProjectReference>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
</ProjectReference>
<ProjectReference Include="..\Core\Core.vcxproj">
<Project>{8c60e805-0da5-4e25-8f84-038db504bb0d}</Project>
</ProjectReference>
<ProjectReference Include="..\DiscIO\DiscIO.vcxproj">
<Project>{b6398059-ebb6-4c34-b547-95f365b71ff4}</Project>
</ProjectReference>
<ProjectReference Include="..\InputCommon\InputCommon.vcxproj">
<Project>{b39ac394-5db5-4da9-9d98-09d46ca3701f}</Project>
</ProjectReference>
<ProjectReference Include="..\VideoBackends\D3D\D3D.vcxproj">
<Project>{9a4c733c-bade-4ac6-b58a-6e274395e90e}</Project>
</ProjectReference>
<ProjectReference Include="..\VideoBackends\OGL\OGL.vcxproj">
<Project>{1909cd2d-1707-456f-86ca-0df42a727c99}</Project>
</ProjectReference>
<ProjectReference Include="..\VideoBackends\Software\Software.vcxproj">
<Project>{9e9da440-e9ad-413c-b648-91030e792211}</Project>
</ProjectReference>
<ProjectReference Include="..\VideoCommon\VideoCommon.vcxproj">
<Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="DolphinWX.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
<LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommandArguments>-d</LocalDebuggerCommandArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
<LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommandArguments>-d</LocalDebuggerCommandArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerWorkingDirectory>$(TargetDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>

View File

@ -0,0 +1,243 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.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="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{47411FDB-1BF2-48D0-AB4E-C7C41160F898}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\VSProps\Base.props" />
<Import Project="..\..\VSProps\PrecompiledHeader.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
<Link>
<BaseAddress>0x00400000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<FixedBaseAddress>true</FixedBaseAddress>
<AdditionalLibraryDirectories>..\..\..\Externals\SDL2-2.0.0\lib\$(PlatformName);..\..\..\Externals\OpenAL\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>dsound.lib;iphlpapi.lib;winmm.lib;setupapi.lib;vfw32.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Src\AboutDolphin.cpp" />
<ClCompile Include="Src\ARCodeAddEdit.cpp" />
<ClCompile Include="Src\CheatsWindow.cpp" />
<ClCompile Include="Src\ConfigMain.cpp" />
<ClCompile Include="Src\Debugger\BreakpointDlg.cpp" />
<ClCompile Include="Src\Debugger\BreakpointView.cpp" />
<ClCompile Include="Src\Debugger\BreakpointWindow.cpp" />
<ClCompile Include="Src\Debugger\CodeView.cpp" />
<ClCompile Include="Src\Debugger\CodeWindow.cpp" />
<ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp" />
<ClCompile Include="Src\Debugger\DebuggerPanel.cpp" />
<ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp" />
<ClCompile Include="Src\Debugger\DSPDebugWindow.cpp" />
<ClCompile Include="Src\Debugger\DSPRegisterView.cpp" />
<ClCompile Include="Src\Debugger\JitWindow.cpp" />
<ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp" />
<ClCompile Include="Src\Debugger\MemoryView.cpp" />
<ClCompile Include="Src\Debugger\MemoryWindow.cpp" />
<ClCompile Include="Src\Debugger\RegisterView.cpp" />
<ClCompile Include="Src\Debugger\RegisterWindow.cpp" />
<ClCompile Include="Src\FifoPlayerDlg.cpp" />
<ClCompile Include="Src\Frame.cpp" />
<ClCompile Include="Src\FrameAui.cpp" />
<ClCompile Include="Src\FrameTools.cpp" />
<ClCompile Include="Src\GameListCtrl.cpp" />
<ClCompile Include="Src\GeckoCodeDiag.cpp" />
<ClCompile Include="Src\GLInterface\WGL.cpp" />
<ClCompile Include="Src\HotkeyDlg.cpp" />
<ClCompile Include="Src\InputConfigDiag.cpp" />
<ClCompile Include="Src\InputConfigDiagBitmaps.cpp" />
<ClCompile Include="Src\ISOFile.cpp" />
<ClCompile Include="Src\ISOProperties.cpp" />
<ClCompile Include="Src\LogConfigWindow.cpp" />
<ClCompile Include="Src\LogWindow.cpp" />
<ClCompile Include="Src\Main.cpp" />
<ClCompile Include="Src\MainNoGUI.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Src\MemcardManager.cpp" />
<ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp" />
<ClCompile Include="Src\NetWindow.cpp" />
<ClCompile Include="Src\PatchAddEdit.cpp" />
<ClCompile Include="Src\PHackSettings.cpp" />
<ClCompile Include="Src\stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Src\TASInputDlg.cpp" />
<ClCompile Include="Src\UDPConfigDiag.cpp" />
<ClCompile Include="Src\VideoConfigDiag.cpp" />
<ClCompile Include="Src\WiimoteConfigDiag.cpp" />
<ClCompile Include="Src\WXInputBase.cpp" />
<ClCompile Include="Src\WxUtils.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h" />
<ClInclude Include="Src\AboutDolphin.h" />
<ClInclude Include="Src\ARCodeAddEdit.h" />
<ClInclude Include="Src\CheatsWindow.h" />
<ClInclude Include="Src\ConfigMain.h" />
<ClInclude Include="Src\Debugger\BreakpointDlg.h" />
<ClInclude Include="Src\Debugger\BreakpointView.h" />
<ClInclude Include="Src\Debugger\BreakpointWindow.h" />
<ClInclude Include="Src\Debugger\CodeView.h" />
<ClInclude Include="Src\Debugger\CodeWindow.h" />
<ClInclude Include="Src\Debugger\DebuggerPanel.h" />
<ClInclude Include="Src\Debugger\DebuggerUIUtil.h" />
<ClInclude Include="Src\Debugger\DSPDebugWindow.h" />
<ClInclude Include="Src\Debugger\DSPRegisterView.h" />
<ClInclude Include="Src\Debugger\JitWindow.h" />
<ClInclude Include="Src\Debugger\MemoryCheckDlg.h" />
<ClInclude Include="Src\Debugger\MemoryView.h" />
<ClInclude Include="Src\Debugger\MemoryWindow.h" />
<ClInclude Include="Src\Debugger\RegisterView.h" />
<ClInclude Include="Src\Debugger\RegisterWindow.h" />
<ClInclude Include="Src\FifoPlayerDlg.h" />
<ClInclude Include="Src\Frame.h" />
<ClInclude Include="Src\GameListCtrl.h" />
<ClInclude Include="Src\GeckoCodeDiag.h" />
<ClInclude Include="Src\GLInterface.h" />
<ClInclude Include="Src\GLInterface\InterfaceBase.h" />
<ClInclude Include="Src\GLInterface\WGL.h" />
<ClInclude Include="Src\Globals.h" />
<ClInclude Include="Src\HotkeyDlg.h" />
<ClInclude Include="Src\InputConfigDiag.h" />
<ClInclude Include="Src\ISOFile.h" />
<ClInclude Include="Src\ISOProperties.h" />
<ClInclude Include="Src\LogConfigWindow.h" />
<ClInclude Include="Src\LogWindow.h" />
<ClInclude Include="Src\Main.h" />
<ClInclude Include="Src\MemcardManager.h" />
<ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h" />
<ClInclude Include="Src\NetWindow.h" />
<ClInclude Include="Src\PatchAddEdit.h" />
<ClInclude Include="Src\PHackSettings.h" />
<ClInclude Include="Src\stdafx.h" />
<ClInclude Include="Src\TASInputDlg.h" />
<ClInclude Include="Src\UDPConfigDiag.h" />
<ClInclude Include="Src\VideoConfigDiag.h" />
<ClInclude Include="Src\WiimoteConfigDiag.h" />
<ClInclude Include="Src\WXInputBase.h" />
<ClInclude Include="Src\WxUtils.h" />
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="DolphinWX.rc" />
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\Installer\Dolphin.ico" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
<Project>{8ada04d7-6db1-4da4-ab55-64fb12a0997b}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\CLRun\clrun\CLRun.vcxproj">
<Project>{aa862e5e-a993-497a-b6a0-0e8e94b10050}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\libpng\png\png.vcxproj">
<Project>{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\LZO\LZO.vcxproj">
<Project>{ab993f38-c31d-4897-b139-a620c42bc565}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\miniupnpc\miniupnpc.vcxproj">
<Project>{31643fdb-1bb8-4965-9de7-000fc88d35ae}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\SFML\build\vc2010\SFML_Network.vcxproj">
<Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\wxWidgets3\build\msw\wx_base.vcxproj">
<Project>{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\Externals\zlib\zlib.vcxproj">
<Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
</ProjectReference>
<ProjectReference Include="..\AudioCommon\AudioCommon.vcxproj">
<Project>{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}</Project>
</ProjectReference>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
</ProjectReference>
<ProjectReference Include="..\Common\SCMRevGen.vcxproj">
<Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
</ProjectReference>
<ProjectReference Include="..\Core\Core.vcxproj">
<Project>{e54cf649-140e-4255-81a5-30a673c1fb36}</Project>
</ProjectReference>
<ProjectReference Include="..\DiscIO\DiscIO.vcxproj">
<Project>{160bdc25-5626-4b0d-bdd8-2953d9777fb5}</Project>
</ProjectReference>
<ProjectReference Include="..\InputCommon\InputCommon.vcxproj">
<Project>{6bbd47cf-91fd-4077-b676-8b76980178a9}</Project>
</ProjectReference>
<ProjectReference Include="..\VideoBackends\D3D\D3D.vcxproj">
<Project>{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}</Project>
</ProjectReference>
<ProjectReference Include="..\VideoBackends\OGL\OGL.vcxproj">
<Project>{ec1a314c-5588-4506-9c1e-2e58e5817f75}</Project>
</ProjectReference>
<ProjectReference Include="..\VideoBackends\Software\Software.vcxproj">
<Project>{a4c423aa-f57c-46c7-a172-d1a777017d29}</Project>
</ProjectReference>
<ProjectReference Include="..\VideoCommon\VideoCommon.vcxproj">
<Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<!--Copy Exe, Pdb, Data directory and DLLs which should be located in the executable directory-->
<ItemGroup>
<DataDirFiles Include="$(SolutionDir)..\Data\**\*.*" />
<ExternalDlls Include="$(SolutionDir)..\Externals\OpenAL\$(PlatformName)\*.dll;$(SolutionDir)..\Externals\SDL2-2.0.0\lib\$(PlatformName)\*.dll" />
<BinaryFiles Include="$(TargetPath);$(TargetDir)$(TargetName).pdb" />
<AllInputFiles Include="@(DataDirFiles);@(ExternalDlls);@(BinaryFiles)" />
</ItemGroup>
<Target Name="AfterBuild" Inputs="@(AllInputFiles)" Outputs="@(AllInputFiles -> '$(BinaryOutputDir)%(Filename)%(Extension)')">
<Message Text="Copying Data directory..." Importance="High" />
<Copy SourceFiles="@(DataDirFiles)" DestinationFolder="$(BinaryOutputDir)%(RecursiveDir)" />
<Message Text="Copying External .dlls" Importance="High" />
<Copy SourceFiles="@(ExternalDlls)" DestinationFolder="$(BinaryOutputDir)" />
<Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
<Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
</Target>
</Project>

View File

@ -1,16 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="GUI">
<UniqueIdentifier>{0c0288ac-1168-4534-b3d3-051b9981f842}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\Debugger">
<UniqueIdentifier>{ef70fd67-8f30-467a-8af0-ea0d48837f04}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\InputConfig">
<UniqueIdentifier>{d0d9afb4-2b02-45c4-b6fc-91b9ae53a18c}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\NetPlay">
<UniqueIdentifier>{fb02111e-3fe2-4ded-a594-7a56048f97b5}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\Video">
<UniqueIdentifier>{80626e3b-e13b-41c3-bd63-4ef1faf92924}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\Saves">
<UniqueIdentifier>{7dc222d2-f1f0-44af-b4eb-76f6ca6cc29f}</UniqueIdentifier>
</Filter>
<Filter Include="Misc">
<UniqueIdentifier>{4352dc64-398e-4a96-ba4a-824dffa2004c}</UniqueIdentifier>
</Filter>
<Filter Include="Resources">
<UniqueIdentifier>{d6bc4dd6-06ed-46ad-b327-04afb26e10ec}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Src\GLInterface\WGL.cpp" />
<ClCompile Include="Src\Main.cpp" />
<ClCompile Include="Src\MainNoGUI.cpp" />
<ClCompile Include="Src\stdafx.cpp" />
<ClCompile Include="Src\WXInputBase.cpp" />
<ClCompile Include="Src\WxUtils.cpp" />
<ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp">
<Filter>GUI\Saves</Filter>
<ClCompile Include="Src\Debugger\BreakpointDlg.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\NetWindow.cpp">
<Filter>GUI\NetPlay</Filter>
<ClCompile Include="Src\Debugger\BreakpointView.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\BreakpointWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\CodeView.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\CodeWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\MemoryView.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\DSPDebugWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\DSPRegisterView.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\JitWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\MemoryWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\RegisterView.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\RegisterWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\InputConfigDiag.cpp">
<Filter>GUI\InputConfig</Filter>
@ -18,6 +83,21 @@
<ClCompile Include="Src\InputConfigDiagBitmaps.cpp">
<Filter>GUI\InputConfig</Filter>
</ClCompile>
<ClCompile Include="Src\NetWindow.cpp">
<Filter>GUI\NetPlay</Filter>
</ClCompile>
<ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp">
<Filter>GUI\Saves</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\DebuggerPanel.cpp">
<Filter>GUI\Video</Filter>
</ClCompile>
<ClCompile Include="Src\VideoConfigDiag.cpp">
<Filter>GUI\Video</Filter>
</ClCompile>
<ClCompile Include="Src\ISOFile.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="Src\AboutDolphin.cpp">
<Filter>GUI</Filter>
</ClCompile>
@ -30,6 +110,9 @@
<ClCompile Include="Src\ConfigMain.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\FifoPlayerDlg.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\Frame.cpp">
<Filter>GUI</Filter>
</ClCompile>
@ -51,6 +134,9 @@
<ClCompile Include="Src\ISOProperties.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\LogConfigWindow.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\LogWindow.cpp">
<Filter>GUI</Filter>
</ClCompile>
@ -60,107 +146,103 @@
<ClCompile Include="Src\PatchAddEdit.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\PHackSettings.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\TASInputDlg.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\UDPConfigDiag.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\WiimoteConfigDiag.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\ISOFile.cpp">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="Src\PHackSettings.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\VideoConfigDiag.cpp">
<Filter>GUI\Video</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\CodeView.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\MemoryView.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\DebuggerPanel.cpp">
<Filter>GUI\Video</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\BreakpointDlg.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\BreakpointWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\CodeWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\DSPDebugWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\JitWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\MemoryWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\RegisterWindow.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\RegisterView.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\DSPRegisterView.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\Debugger\BreakpointView.cpp">
<Filter>GUI\Debugger</Filter>
</ClCompile>
<ClCompile Include="Src\LogConfigWindow.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\FifoPlayerDlg.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\TASInputDlg.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="Src\GLInterface\WGL.cpp" />
<ClCompile Include="Src\stdafx.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Src\GLInterface\InterfaceBase.h" />
<ClInclude Include="Src\GLInterface\WGL.h" />
<ClInclude Include="Src\GLInterface.h" />
<ClInclude Include="Src\Main.h" />
<ClInclude Include="Src\stdafx.h" />
<ClInclude Include="Src\WXInputBase.h" />
<ClInclude Include="Src\WxUtils.h" />
<ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h">
<Filter>GUI\Saves</Filter>
<ClInclude Include="Src\Debugger\BreakpointDlg.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\NetWindow.h">
<Filter>GUI\NetPlay</Filter>
<ClInclude Include="Src\Debugger\BreakpointView.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\BreakpointWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\CodeView.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\CodeWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\DebuggerUIUtil.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\MemoryView.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\MemoryCheckDlg.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\DSPDebugWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\DSPRegisterView.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\JitWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\MemoryWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\RegisterView.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\RegisterWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\InputConfigDiag.h">
<Filter>GUI\InputConfig</Filter>
</ClInclude>
<ClInclude Include="Src\ARCodeAddEdit.h">
<Filter>GUI</Filter>
<ClInclude Include="Src\NetWindow.h">
<Filter>GUI\NetPlay</Filter>
</ClInclude>
<ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h">
<Filter>GUI\Saves</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\DebuggerPanel.h">
<Filter>GUI\Video</Filter>
</ClInclude>
<ClInclude Include="Src\VideoConfigDiag.h">
<Filter>GUI\Video</Filter>
</ClInclude>
<ClInclude Include="Src\ISOFile.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Resources</Filter>
</ClInclude>
<ClInclude Include="Src\AboutDolphin.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\ConfigMain.h">
<ClInclude Include="Src\ARCodeAddEdit.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\CheatsWindow.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\GeckoCodeDiag.h">
<ClInclude Include="Src\ConfigMain.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\FifoPlayerDlg.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\Frame.h">
@ -169,6 +251,9 @@
<ClInclude Include="Src\GameListCtrl.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\GeckoCodeDiag.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\Globals.h">
<Filter>GUI</Filter>
</ClInclude>
@ -178,6 +263,9 @@
<ClInclude Include="Src\ISOProperties.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\LogConfigWindow.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\LogWindow.h">
<Filter>GUI</Filter>
</ClInclude>
@ -187,117 +275,31 @@
<ClInclude Include="Src\PatchAddEdit.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\PHackSettings.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\TASInputDlg.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\UDPConfigDiag.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\WiimoteConfigDiag.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\ISOFile.h">
<Filter>Misc</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Resources</Filter>
</ClInclude>
<ClInclude Include="Src\PHackSettings.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\DebuggerUIUtil.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\VideoConfigDiag.h">
<Filter>GUI\Video</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\CodeView.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\MemoryView.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\DebuggerPanel.h">
<Filter>GUI\Video</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\BreakpointDlg.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\BreakpointWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\CodeWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\DSPDebugWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\JitWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\MemoryCheckDlg.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\MemoryWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\RegisterWindow.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\RegisterView.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\DSPRegisterView.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\Debugger\BreakpointView.h">
<Filter>GUI\Debugger</Filter>
</ClInclude>
<ClInclude Include="Src\LogConfigWindow.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\FifoPlayerDlg.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\TASInputDlg.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="Src\GLInterface.h" />
<ClInclude Include="Src\GLInterface\InterfaceBase.h" />
<ClInclude Include="Src\GLInterface\WGL.h" />
<ClInclude Include="Src\stdafx.h" />
</ItemGroup>
<ItemGroup>
<None Include="CMakeLists.txt" />
<None Include="..\..\..\Installer\Dolphin.ico">
<Filter>Resources</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Filter Include="GUI">
<UniqueIdentifier>{2f20d058-1119-4738-bda8-90fe900e8d69}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\InputConfig">
<UniqueIdentifier>{70eb2f12-fab7-4953-8ad1-a981837c3a7e}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\NetPlay">
<UniqueIdentifier>{38fc863a-0392-4c5d-ab28-7fe1f70e8a70}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\Saves">
<UniqueIdentifier>{3727fb17-2efd-43ce-b71f-d110f0f40474}</UniqueIdentifier>
</Filter>
<Filter Include="Misc">
<UniqueIdentifier>{0721c9ae-4d49-49d6-997b-3731f8ab64cc}</UniqueIdentifier>
</Filter>
<Filter Include="Resources">
<UniqueIdentifier>{9dd3ef96-b03a-4c14-9d35-6a4850acd430}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\Debugger">
<UniqueIdentifier>{8ab1ce40-f5e7-47b8-9706-59c924af4eaa}</UniqueIdentifier>
</Filter>
<Filter Include="GUI\Video">
<UniqueIdentifier>{ff5180be-244f-4c0e-8a35-bd4bffb6a343}</UniqueIdentifier>
</Filter>
<Text Include="CMakeLists.txt" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="DolphinWX.rc">
<Filter>Resources</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\Installer\Dolphin.ico">
<Filter>Resources</Filter>
</Image>
</ItemGroup>
</Project>

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!--For some stupid reason this has to be in the .user file...-->
<LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>
<LocalDebuggerWorkingDirectory>$(BinaryOutputDir)</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>