libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-23 08:09:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update UWP port

Browse Source
This commit is contained in:
pent0 2018-12-10 20:55:07 +07:00
parent 5a72570dce
commit 4a53853f79
31 changed files with 1048 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Common/FileUtil.cpp
View File

@ -30,6 +30,7 @@
#ifdef _WIN32
#include "CommonWindows.h"
#include <Windows.h>
#include <shlobj.h> // for SHGetFolderPath
#include <shellapi.h>
#include <commdlg.h> // for GetSaveFileName
@ -121,7 +122,11 @@ std::string ResolvePath(const std::string &path) {
std::wstring input = ConvertUTF8ToWString(path);
if (getFinalPathNameByHandleW) {
#if PPSSPP_PLATFORM(UWP)
HANDLE hFile = CreateFile2(input.c_str(), GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, nullptr);
#else
HANDLE hFile = CreateFile(input.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nullptr);
#endif
if (hFile == INVALID_HANDLE_VALUE) {
wcscpy_s(buf, BUF_SIZE - 1, input.c_str());
} else {

7
Core/Debugger/WebSocket/WebSocketUtils.h
View File

@ -24,6 +24,13 @@
#include "net/websocket_server.h"
#include "Common/Log.h"
#include "ppsspp_config.h"
#ifdef PPSSPP_PLATFORM(UWP)
// Enum name overlapped with UWP macro, quick hack to disable it
#undef OPTIONAL
#endif
using namespace json;
static inline void DebuggerJsonAddTicket(JsonWriter &writer, const JsonGet &data) {

2
Core/MIPS/ARM/ArmJit.cpp
View File

@ -46,7 +46,7 @@
using namespace ArmJitConstants;
static void DisassembleArm(const u8 *data, int size) {
void DisassembleArm(const u8 *data, int size) {
char temp[256];
for (int i = 0; i < size; i += 4) {
const u32 *codePtr = (const u32 *)(data + i);

2
UI/DiscordIntegration.cpp
View File

@ -7,7 +7,7 @@
#include "DiscordIntegration.h"
#include "i18n/i18n.h"
#if (PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(LINUX)) && !PPSSPP_PLATFORM(ANDROID)
#if (PPSSPP_PLATFORM(WINDOWS) || PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(LINUX)) && !PPSSPP_PLATFORM(ANDROID) && !PPSSPP_PLATFORM(UWP)
#ifdef _MSC_VER
#define ENABLE_DISCORD

306
UWP/Armips_UWP/Armips_UWP.vcxproj Normal file
View File

@ -0,0 +1,306 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</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|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</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>{75286959-e7a2-4cbe-8b95-bf05c9c540ff}</ProjectGuid>
<Keyword>StaticLibrary</Keyword>
<RootNamespace>Armips_UWP</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<GenerateManifest>false</GenerateManifest>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)..\..\ext\armips</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<GenerateManifest>false</GenerateManifest>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)..\..\ext\armips</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<GenerateManifest>false</GenerateManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\ext\armips\Archs\Architecture.h" />
<ClInclude Include="..\..\ext\armips\Archs\ARM\Arm.h" />
<ClInclude Include="..\..\ext\armips\Archs\ARM\ArmElfRelocator.h" />
<ClInclude Include="..\..\ext\armips\Archs\ARM\ArmExpressionFunctions.h" />
<ClInclude Include="..\..\ext\armips\Archs\ARM\ArmOpcodes.h" />
<ClInclude Include="..\..\ext\armips\Archs\ARM\ArmParser.h" />
<ClInclude Include="..\..\ext\armips\Archs\ARM\CArmInstruction.h" />
<ClInclude Include="..\..\ext\armips\Archs\ARM\CThumbInstruction.h" />
<ClInclude Include="..\..\ext\armips\Archs\ARM\Pool.h" />
<ClInclude Include="..\..\ext\armips\Archs\ARM\ThumbOpcodes.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\CMipsInstruction.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\Mips.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsElfFile.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsElfRelocator.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsExpressionFunctions.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsMacros.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsOpcodes.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsParser.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\PsxRelocator.h" />
<ClInclude Include="..\..\ext\armips\Commands\CAssemblerCommand.h" />
<ClInclude Include="..\..\ext\armips\Commands\CAssemblerLabel.h" />
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveArea.h" />
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveConditional.h" />
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveData.h" />
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveFile.h" />
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveMessage.h" />
<ClInclude Include="..\..\ext\armips\Commands\CommandSequence.h" />
<ClInclude Include="..\..\ext\armips\Core\Assembler.h" />
<ClInclude Include="..\..\ext\armips\Core\Common.h" />
<ClInclude Include="..\..\ext\armips\Core\ELF\ElfFile.h" />
<ClInclude Include="..\..\ext\armips\Core\ELF\ElfRelocator.h" />
<ClInclude Include="..\..\ext\armips\Core\ELF\ElfTypes.h" />
<ClInclude Include="..\..\ext\armips\Core\Expression.h" />
<ClInclude Include="..\..\ext\armips\Core\ExpressionFunctions.h" />
<ClInclude Include="..\..\ext\armips\Core\FileManager.h" />
<ClInclude Include="..\..\ext\armips\Core\Misc.h" />
<ClInclude Include="..\..\ext\armips\Core\SymbolData.h" />
<ClInclude Include="..\..\ext\armips\Core\SymbolTable.h" />
<ClInclude Include="..\..\ext\armips\Parser\DirectivesParser.h" />
<ClInclude Include="..\..\ext\armips\Parser\ExpressionParser.h" />
<ClInclude Include="..\..\ext\armips\Parser\Parser.h" />
<ClInclude Include="..\..\ext\armips\Parser\Tokenizer.h" />
<ClInclude Include="..\..\ext\armips\stdafx.h" />
<ClInclude Include="..\..\ext\armips\Util\ByteArray.h" />
<ClInclude Include="..\..\ext\armips\Util\CRC.h" />
<ClInclude Include="..\..\ext\armips\Util\EncodingTable.h" />
<ClInclude Include="..\..\ext\armips\Util\FileClasses.h" />
<ClInclude Include="..\..\ext\armips\Util\Util.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="targetver.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\ext\armips\Archs\Architecture.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\ARM\Arm.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\ARM\ArmElfRelocator.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\ARM\ArmExpressionFunctions.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\ARM\ArmOpcodes.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\ARM\ArmParser.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\ARM\CArmInstruction.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\ARM\CThumbInstruction.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\ARM\Pool.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\ARM\ThumbOpcodes.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\CMipsInstruction.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\Mips.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsElfFile.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsElfRelocator.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsExpressionFunctions.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsMacros.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsOpcodes.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsParser.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\PsxRelocator.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CAssemblerCommand.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CAssemblerLabel.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveArea.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveConditional.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveData.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveFile.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveMessage.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CommandSequence.cpp" />
<ClCompile Include="..\..\ext\armips\Core\Assembler.cpp" />
<ClCompile Include="..\..\ext\armips\Core\Common.cpp" />
<ClCompile Include="..\..\ext\armips\Core\ELF\ElfFile.cpp" />
<ClCompile Include="..\..\ext\armips\Core\ELF\ElfRelocator.cpp" />
<ClCompile Include="..\..\ext\armips\Core\Expression.cpp" />
<ClCompile Include="..\..\ext\armips\Core\ExpressionFunctions.cpp" />
<ClCompile Include="..\..\ext\armips\Core\FileManager.cpp" />
<ClCompile Include="..\..\ext\armips\Core\Misc.cpp" />
<ClCompile Include="..\..\ext\armips\Core\SymbolData.cpp" />
<ClCompile Include="..\..\ext\armips\Core\SymbolTable.cpp" />
<ClCompile Include="..\..\ext\armips\Parser\DirectivesParser.cpp" />
<ClCompile Include="..\..\ext\armips\Parser\ExpressionParser.cpp" />
<ClCompile Include="..\..\ext\armips\Parser\Parser.cpp" />
<ClCompile Include="..\..\ext\armips\Parser\Tokenizer.cpp" />
<ClCompile Include="..\..\ext\armips\stdafx.cpp" />
<ClCompile Include="..\..\ext\armips\Util\ByteArray.cpp" />
<ClCompile Include="..\..\ext\armips\Util\CRC.cpp" />
<ClCompile Include="..\..\ext\armips\Util\EncodingTable.cpp" />
<ClCompile Include="..\..\ext\armips\Util\FileClasses.cpp" />
<ClCompile Include="..\..\ext\armips\Util\Util.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

317
UWP/Armips_UWP/Armips_UWP.vcxproj.filters Normal file
View File

@ -0,0 +1,317 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="pch.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\ARM\Arm.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\ARM\ArmElfRelocator.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\ARM\ArmExpressionFunctions.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\ARM\ArmOpcodes.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\ARM\ArmParser.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\ARM\CArmInstruction.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\ARM\CThumbInstruction.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\ARM\Pool.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\ARM\ThumbOpcodes.cpp">
<Filter>Archs\ARM</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\MIPS\CMipsInstruction.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\MIPS\Mips.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsElfFile.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsElfRelocator.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsExpressionFunctions.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsMacros.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsOpcodes.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsParser.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\MIPS\PsxRelocator.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\Architecture.cpp">
<Filter>Archs</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Core\ELF\ElfFile.cpp">
<Filter>Core\ELF</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Core\ELF\ElfRelocator.cpp">
<Filter>Core\ELF</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Core\Assembler.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Core\Common.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Core\Expression.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Core\ExpressionFunctions.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Core\FileManager.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Core\Misc.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Core\SymbolData.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Core\SymbolTable.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Commands\CAssemblerCommand.cpp">
<Filter>Commands</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Commands\CAssemblerLabel.cpp">
<Filter>Commands</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveArea.cpp">
<Filter>Commands</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveConditional.cpp">
<Filter>Commands</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveData.cpp">
<Filter>Commands</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveFile.cpp">
<Filter>Commands</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveMessage.cpp">
<Filter>Commands</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Commands\CommandSequence.cpp">
<Filter>Commands</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Parser\DirectivesParser.cpp">
<Filter>Parser</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Parser\ExpressionParser.cpp">
<Filter>Parser</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Parser\Parser.cpp">
<Filter>Parser</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Parser\Tokenizer.cpp">
<Filter>Parser</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Util\ByteArray.cpp">
<Filter>Util</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Util\CRC.cpp">
<Filter>Util</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Util\EncodingTable.cpp">
<Filter>Util</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Util\FileClasses.cpp">
<Filter>Util</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Util\Util.cpp">
<Filter>Util</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\stdafx.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="..\..\ext\armips\Archs\ARM\Arm.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\ARM\ArmElfRelocator.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\ARM\ArmExpressionFunctions.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\ARM\ArmOpcodes.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\ARM\ArmParser.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\ARM\CArmInstruction.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\ARM\CThumbInstruction.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\ARM\Pool.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\ARM\ThumbOpcodes.h">
<Filter>Archs\ARM</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\MIPS\CMipsInstruction.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\MIPS\Mips.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsElfFile.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsElfRelocator.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsExpressionFunctions.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsMacros.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsOpcodes.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsParser.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\MIPS\PsxRelocator.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\Architecture.h">
<Filter>Archs</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\ELF\ElfFile.h">
<Filter>Core\ELF</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\ELF\ElfRelocator.h">
<Filter>Core\ELF</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\ELF\ElfTypes.h">
<Filter>Core\ELF</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\Assembler.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\Common.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\Expression.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\ExpressionFunctions.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\FileManager.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\Misc.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\SymbolData.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Core\SymbolTable.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Commands\CAssemblerCommand.h">
<Filter>Commands</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Commands\CAssemblerLabel.h">
<Filter>Commands</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveArea.h">
<Filter>Commands</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveConditional.h">
<Filter>Commands</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveData.h">
<Filter>Commands</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveFile.h">
<Filter>Commands</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveMessage.h">
<Filter>Commands</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Commands\CommandSequence.h">
<Filter>Commands</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Parser\DirectivesParser.h">
<Filter>Parser</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Parser\ExpressionParser.h">
<Filter>Parser</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Parser\Parser.h">
<Filter>Parser</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Parser\Tokenizer.h">
<Filter>Parser</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Util\ByteArray.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Util\CRC.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Util\EncodingTable.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Util\FileClasses.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Util\Util.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\stdafx.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="Archs">
<UniqueIdentifier>{bb50e347-768c-4786-84ed-552556adbe31}</UniqueIdentifier>
</Filter>
<Filter Include="Archs\ARM">
<UniqueIdentifier>{1b78b12e-91fd-4345-977d-a834b2aaaa0e}</UniqueIdentifier>
</Filter>
<Filter Include="Archs\MIPS">
<UniqueIdentifier>{bef7b4a2-b049-4d00-810c-6d8d6605c2a3}</UniqueIdentifier>
</Filter>
<Filter Include="Core">
<UniqueIdentifier>{2ce1016b-f93c-48b9-abe5-d3fbbcd24780}</UniqueIdentifier>
</Filter>
<Filter Include="Core\ELF">
<UniqueIdentifier>{350e6968-15a4-41a0-8db6-0c0c4167ece2}</UniqueIdentifier>
</Filter>
<Filter Include="Commands">
<UniqueIdentifier>{1f209da4-5400-4997-bcd1-729c3e8efc7a}</UniqueIdentifier>
</Filter>
<Filter Include="Parser">
<UniqueIdentifier>{51922c53-0a94-4ccf-bc91-01c49e1ab80a}</UniqueIdentifier>
</Filter>
<Filter Include="Util">
<UniqueIdentifier>{019ffa9d-12b6-420e-9af3-2c02795d73c8}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

1
UWP/Armips_UWP/pch.cpp Normal file
View File

@ -0,0 +1 @@
#include "pch.h"

9
UWP/Armips_UWP/pch.h Normal file
View File

@ -0,0 +1,9 @@
#pragma once
#include "targetver.h"
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>

8
UWP/Armips_UWP/targetver.h Normal file
View File

@ -0,0 +1,8 @@
#pragma once
// Including SDKDDKVer.h defines the highest available Windows platform.
// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
#include <SDKDDKVer.h>

4
UWP/CommonUWP/CommonUWP.vcxproj
View File

@ -46,9 +46,9 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

32
UWP/CoreUWP/CoreUWP.vcxproj
View File

@ -46,9 +46,9 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -310,6 +310,19 @@
<ClInclude Include="..\..\Core\Debugger\DebugInterface.h" />
<ClInclude Include="..\..\Core\Debugger\DisassemblyManager.h" />
<ClInclude Include="..\..\Core\Debugger\SymbolMap.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\BreakpointSubscriber.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\CPUCoreSubscriber.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\DisasmSubscriber.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\GameBroadcaster.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\GameSubscriber.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\GPUBufferSubscriber.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\GPURecordSubscriber.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\HLESubscriber.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\LogBroadcaster.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\SteppingBroadcaster.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\SteppingSubscriber.h" />
<ClInclude Include="..\..\Core\Debugger\WebSocket\WebSocketUtils.h" />
<ClInclude Include="..\..\Core\Dialog\PSPDialog.h" />
<ClInclude Include="..\..\Core\Dialog\PSPGamedataInstallDialog.h" />
<ClInclude Include="..\..\Core\Dialog\PSPMsgDialog.h" />
@ -405,6 +418,7 @@
<ClInclude Include="..\..\Core\HLE\sceSsl.h" />
<ClInclude Include="..\..\Core\HLE\sceUmd.h" />
<ClInclude Include="..\..\Core\HLE\sceUsb.h" />
<ClInclude Include="..\..\Core\HLE\sceUsbAcc.h" />
<ClInclude Include="..\..\Core\HLE\sceUsbCam.h" />
<ClInclude Include="..\..\Core\HLE\sceUsbGps.h" />
<ClInclude Include="..\..\Core\HLE\sceUtility.h" />
@ -506,6 +520,19 @@
<ClCompile Include="..\..\Core\Debugger\Breakpoints.cpp" />
<ClCompile Include="..\..\Core\Debugger\DisassemblyManager.cpp" />
<ClCompile Include="..\..\Core\Debugger\SymbolMap.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\BreakpointSubscriber.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\CPUCoreSubscriber.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\DisasmSubscriber.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\GameBroadcaster.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\GameSubscriber.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\GPUBufferSubscriber.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\GPURecordSubscriber.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\HLESubscriber.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\LogBroadcaster.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\SteppingBroadcaster.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\SteppingSubscriber.cpp" />
<ClCompile Include="..\..\Core\Debugger\WebSocket\WebSocketUtils.cpp" />
<ClCompile Include="..\..\Core\Dialog\PSPDialog.cpp" />
<ClCompile Include="..\..\Core\Dialog\PSPGamedataInstallDialog.cpp" />
<ClCompile Include="..\..\Core\Dialog\PSPMsgDialog.cpp" />
@ -599,6 +626,7 @@
<ClCompile Include="..\..\Core\HLE\sceSsl.cpp" />
<ClCompile Include="..\..\Core\HLE\sceUmd.cpp" />
<ClCompile Include="..\..\Core\HLE\sceUsb.cpp" />
<ClCompile Include="..\..\Core\HLE\sceUsbAcc.cpp" />
<ClCompile Include="..\..\Core\HLE\sceUsbCam.cpp" />
<ClCompile Include="..\..\Core\HLE\sceUsbGps.cpp" />
<ClCompile Include="..\..\Core\HLE\sceUtility.cpp" />

89
UWP/CoreUWP/CoreUWP.vcxproj.filters
View File

@ -65,6 +65,9 @@
<Filter Include="MIPS\IR">
<UniqueIdentifier>{9c6552c2-9858-41da-a920-31ea5628d417}</UniqueIdentifier>
</Filter>
<Filter Include="Debugger\WebSocket">
<UniqueIdentifier>{2c71417c-cc7b-42cb-880d-ac0cb45ab5bb}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="pch.cpp" />
@ -621,6 +624,49 @@
<ClCompile Include="..\..\Core\HLE\sceUsbCam.cpp">
<Filter>HLE</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\WebServer.cpp" />
<ClCompile Include="..\..\Core\HLE\sceUsbAcc.cpp">
<Filter>HLE</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\BreakpointSubscriber.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\CPUCoreSubscriber.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\DisasmSubscriber.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\GameBroadcaster.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\GameSubscriber.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\GPUBufferSubscriber.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\GPURecordSubscriber.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\HLESubscriber.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\LogBroadcaster.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\SteppingBroadcaster.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\SteppingSubscriber.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
<ClCompile Include="..\..\Core\Debugger\WebSocket\WebSocketUtils.cpp">
<Filter>Debugger\WebSocket</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h" />
@ -1160,5 +1206,48 @@
<ClInclude Include="..\..\Core\HLE\sceUsbCam.h">
<Filter>HLE</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\WebServer.h" />
<ClInclude Include="..\..\Core\HLE\sceUsbAcc.h">
<Filter>HLE</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket.h">
<Filter>Debugger</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\BreakpointSubscriber.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\CPUCoreSubscriber.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\DisasmSubscriber.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\GameBroadcaster.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\GameSubscriber.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\GPUBufferSubscriber.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\GPURecordSubscriber.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\HLESubscriber.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\LogBroadcaster.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\SteppingBroadcaster.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\SteppingSubscriber.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
<ClInclude Include="..\..\Core\Debugger\WebSocket\WebSocketUtils.h">
<Filter>Debugger\WebSocket</Filter>
</ClInclude>
</ItemGroup>
</Project>

2
UWP/FastMath_UWP/FastMath_UWP.cpp Normal file
View File

@ -0,0 +1,2 @@
#include "pch.h"
#include "FastMath_UWP.h"

4
UWP/GPU_UWP/GPU_UWP.vcxproj
View File

@ -46,9 +46,9 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

395
UWP/GPU_UWP/GPU_UWP.vcxproj.filters
View File

@ -1,315 +1,114 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Common">
<UniqueIdentifier>{73b2cfa4-f51e-48f5-a9fd-2c4df203a4f0}</UniqueIdentifier>
</Filter>
<Filter Include="D3D11">
<UniqueIdentifier>{7634891c-a60e-48d4-abdb-d8fe347dfef5}</UniqueIdentifier>
</Filter>
<Filter Include="D3D9">
<UniqueIdentifier>{508714cf-18c6-4a82-b92d-1527d9a100f0}</UniqueIdentifier>
</Filter>
<Filter Include="Software">
<UniqueIdentifier>{15dc3187-4c49-46a7-8027-6ff23564cc22}</UniqueIdentifier>
</Filter>
<Filter Include="Debugger">
<UniqueIdentifier>{b5c82a80-e146-4133-b199-a07a427f04cc}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="pch.cpp" />
<ClCompile Include="..\..\GPU\Common\DepalettizeShaderCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\DrawEngineCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\FramebufferCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\GPUDebugInterface.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\GPUStateUtils.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\IndexGenerator.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\PostShader.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\ShaderId.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\ShaderTranslation.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\ShaderUniforms.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\SoftwareTransformCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\SplineCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\TextureCacheCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\TextureDecoder.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\TextureDecoderNEON.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\TextureScalerCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\TransformCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\VertexDecoderArm.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\VertexDecoderArm64.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\VertexDecoderCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\VertexDecoderFake.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\VertexDecoderX86.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\D3D11Util.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\DepalettizeShaderD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\DrawEngineD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\FragmentShaderGeneratorD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\FramebufferManagerD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\GPU_D3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\ShaderManagerD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\StateMappingD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\StencilBufferD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\TextureCacheD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\TextureScalerD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\D3D11\VertexShaderGeneratorD3D11.cpp">
<Filter>D3D11</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Directx9\PixelShaderGeneratorDX9.cpp">
<Filter>D3D9</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Directx9\VertexShaderGeneratorDX9.cpp">
<Filter>D3D9</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\DepalettizeShaderCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\DrawEngineCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\FramebufferCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\GPUDebugInterface.cpp" />
<ClCompile Include="..\..\GPU\Common\GPUStateUtils.cpp" />
<ClCompile Include="..\..\GPU\Common\IndexGenerator.cpp" />
<ClCompile Include="..\..\GPU\Common\PostShader.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderId.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderTranslation.cpp" />
<ClCompile Include="..\..\GPU\Common\ShaderUniforms.cpp" />
<ClCompile Include="..\..\GPU\Common\SoftwareTransformCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\SplineCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\StencilCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\TextureCacheCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\TextureDecoder.cpp" />
<ClCompile Include="..\..\GPU\Common\TextureDecoderNEON.cpp" />
<ClCompile Include="..\..\GPU\Common\TextureScalerCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\TransformCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\VertexDecoderArm.cpp" />
<ClCompile Include="..\..\GPU\Common\VertexDecoderArm64.cpp" />
<ClCompile Include="..\..\GPU\Common\VertexDecoderCommon.cpp" />
<ClCompile Include="..\..\GPU\Common\VertexDecoderFake.cpp" />
<ClCompile Include="..\..\GPU\Common\VertexDecoderX86.cpp" />
<ClCompile Include="..\..\GPU\D3D11\D3D11Util.cpp" />
<ClCompile Include="..\..\GPU\D3D11\DepalettizeShaderD3D11.cpp" />
<ClCompile Include="..\..\GPU\D3D11\DrawEngineD3D11.cpp" />
<ClCompile Include="..\..\GPU\D3D11\FragmentShaderGeneratorD3D11.cpp" />
<ClCompile Include="..\..\GPU\D3D11\FramebufferManagerD3D11.cpp" />
<ClCompile Include="..\..\GPU\D3D11\GPU_D3D11.cpp" />
<ClCompile Include="..\..\GPU\D3D11\ShaderManagerD3D11.cpp" />
<ClCompile Include="..\..\GPU\D3D11\StateMappingD3D11.cpp" />
<ClCompile Include="..\..\GPU\D3D11\StencilBufferD3D11.cpp" />
<ClCompile Include="..\..\GPU\D3D11\TextureCacheD3D11.cpp" />
<ClCompile Include="..\..\GPU\D3D11\TextureScalerD3D11.cpp" />
<ClCompile Include="..\..\GPU\D3D11\VertexShaderGeneratorD3D11.cpp" />
<ClCompile Include="..\..\GPU\Debugger\Breakpoints.cpp" />
<ClCompile Include="..\..\GPU\Debugger\Debugger.cpp" />
<ClCompile Include="..\..\GPU\Debugger\Record.cpp" />
<ClCompile Include="..\..\GPU\Debugger\Stepping.cpp" />
<ClCompile Include="..\..\GPU\Directx9\PixelShaderGeneratorDX9.cpp" />
<ClCompile Include="..\..\GPU\Directx9\VertexShaderGeneratorDX9.cpp" />
<ClCompile Include="..\..\GPU\GeDisasm.cpp" />
<ClCompile Include="..\..\GPU\GPU.cpp" />
<ClCompile Include="..\..\GPU\GPUCommon.cpp" />
<ClCompile Include="..\..\GPU\GPUState.cpp" />
<ClCompile Include="..\..\GPU\Math3D.cpp" />
<ClCompile Include="..\..\GPU\Software\Clipper.cpp">
<Filter>Software</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Software\Lighting.cpp">
<Filter>Software</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Software\Rasterizer.cpp">
<Filter>Software</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Software\SoftGpu.cpp">
<Filter>Software</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Software\TransformUnit.cpp">
<Filter>Software</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Debugger\Breakpoints.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Debugger\Debugger.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Debugger\Stepping.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\ShaderCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Software\Sampler.cpp">
<Filter>Software</Filter>
</ClInclude>
<ClCompile Include="..\..\GPU\Debugger\Record.cpp">
<Filter>Debugger</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Common\StencilCommon.cpp">
<Filter>Common</Filter>
</ClCompile>
<ClCompile Include="..\..\GPU\Software\Clipper.cpp" />
<ClCompile Include="..\..\GPU\Software\Lighting.cpp" />
<ClCompile Include="..\..\GPU\Software\Rasterizer.cpp" />
<ClCompile Include="..\..\GPU\Software\Sampler.cpp" />
<ClCompile Include="..\..\GPU\Software\SoftGpu.cpp" />
<ClCompile Include="..\..\GPU\Software\TransformUnit.cpp" />
<ClCompile Include="pch.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="..\..\GPU\Common\DepalettizeShaderCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\DrawEngineCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\FramebufferCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\GPUDebugInterface.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\GPUStateUtils.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\IndexGenerator.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\PostShader.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\ShaderCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\ShaderId.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\ShaderTranslation.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\ShaderUniforms.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\SoftwareLighting.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\SoftwareTransformCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\SplineCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\TextureCacheCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\TextureDecoder.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\TextureDecoderNEON.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\TextureScalerCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\TransformCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\VertexDecoderCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\D3D11Util.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\DepalettizeShaderD3D11.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\DrawEngineD3D11.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\FragmentShaderGeneratorD3D11.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\FramebufferManagerD3D11.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\GPU_D3D11.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\ShaderManagerD3D11.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\StateMappingD3D11.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\TextureCacheD3D11.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\TextureScalerD3D11.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\D3D11\VertexShaderGeneratorD3D11.h">
<Filter>D3D11</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Directx9\PixelShaderGeneratorDX9.h">
<Filter>D3D9</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Directx9\VertexShaderGeneratorDX9.h">
<Filter>D3D9</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\ge_constants.h" />
<ClInclude Include="..\..\GPU\Common\DepalettizeShaderCommon.h" />
<ClInclude Include="..\..\GPU\Common\DrawEngineCommon.h" />
<ClInclude Include="..\..\GPU\Common\FramebufferCommon.h" />
<ClInclude Include="..\..\GPU\Common\GPUDebugInterface.h" />
<ClInclude Include="..\..\GPU\Common\GPUStateUtils.h" />
<ClInclude Include="..\..\GPU\Common\IndexGenerator.h" />
<ClInclude Include="..\..\GPU\Common\PostShader.h" />
<ClInclude Include="..\..\GPU\Common\ShaderCommon.h" />
<ClInclude Include="..\..\GPU\Common\ShaderId.h" />
<ClInclude Include="..\..\GPU\Common\ShaderTranslation.h" />
<ClInclude Include="..\..\GPU\Common\ShaderUniforms.h" />
<ClInclude Include="..\..\GPU\Common\SoftwareLighting.h" />
<ClInclude Include="..\..\GPU\Common\SoftwareTransformCommon.h" />
<ClInclude Include="..\..\GPU\Common\SplineCommon.h" />
<ClInclude Include="..\..\GPU\Common\StencilCommon.h" />
<ClInclude Include="..\..\GPU\Common\TextureCacheCommon.h" />
<ClInclude Include="..\..\GPU\Common\TextureDecoder.h" />
<ClInclude Include="..\..\GPU\Common\TextureDecoderNEON.h" />
<ClInclude Include="..\..\GPU\Common\TextureScalerCommon.h" />
<ClInclude Include="..\..\GPU\Common\TransformCommon.h" />
<ClInclude Include="..\..\GPU\Common\VertexDecoderCommon.h" />
<ClInclude Include="..\..\GPU\D3D11\D3D11Util.h" />
<ClInclude Include="..\..\GPU\D3D11\DepalettizeShaderD3D11.h" />
<ClInclude Include="..\..\GPU\D3D11\DrawEngineD3D11.h" />
<ClInclude Include="..\..\GPU\D3D11\FragmentShaderGeneratorD3D11.h" />
<ClInclude Include="..\..\GPU\D3D11\FramebufferManagerD3D11.h" />
<ClInclude Include="..\..\GPU\D3D11\GPU_D3D11.h" />
<ClInclude Include="..\..\GPU\D3D11\ShaderManagerD3D11.h" />
<ClInclude Include="..\..\GPU\D3D11\StateMappingD3D11.h" />
<ClInclude Include="..\..\GPU\D3D11\TextureCacheD3D11.h" />
<ClInclude Include="..\..\GPU\D3D11\TextureScalerD3D11.h" />
<ClInclude Include="..\..\GPU\D3D11\VertexShaderGeneratorD3D11.h" />
<ClInclude Include="..\..\GPU\Debugger\Breakpoints.h" />
<ClInclude Include="..\..\GPU\Debugger\Debugger.h" />
<ClInclude Include="..\..\GPU\Debugger\Record.h" />
<ClInclude Include="..\..\GPU\Debugger\Stepping.h" />
<ClInclude Include="..\..\GPU\Directx9\PixelShaderGeneratorDX9.h" />
<ClInclude Include="..\..\GPU\Directx9\VertexShaderGeneratorDX9.h" />
<ClInclude Include="..\..\GPU\GeDisasm.h" />
<ClInclude Include="..\..\GPU\ge_constants.h" />
<ClInclude Include="..\..\GPU\GPU.h" />
<ClInclude Include="..\..\GPU\GPUCommon.h" />
<ClInclude Include="..\..\GPU\GPUInterface.h" />
<ClInclude Include="..\..\GPU\GPUState.h" />
<ClInclude Include="..\..\GPU\Math3D.h" />
<ClInclude Include="..\..\GPU\Software\Clipper.h">
<Filter>Software</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Software\Lighting.h">
<Filter>Software</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Software\Rasterizer.h">
<Filter>Software</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Software\SoftGpu.h">
<Filter>Software</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Software\TransformUnit.h">
<Filter>Software</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Debugger\Breakpoints.h">
<Filter>Debugger</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Debugger\Debugger.h">
<Filter>Debugger</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Debugger\Stepping.h">
<Filter>Debugger</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Software\Sampler.h">
<Filter>Software</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Debugger\Record.h">
<Filter>Debugger</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Common\StencilCommon.h">
<Filter>Common</Filter>
</ClInclude>
<ClInclude Include="..\..\GPU\Software\Clipper.h" />
<ClInclude Include="..\..\GPU\Software\Lighting.h" />
<ClInclude Include="..\..\GPU\Software\Rasterizer.h" />
<ClInclude Include="..\..\GPU\Software\Sampler.h" />
<ClInclude Include="..\..\GPU\Software\SoftGpu.h" />
<ClInclude Include="..\..\GPU\Software\TransformUnit.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="targetver.h" />
</ItemGroup>
</Project>

20
UWP/NativeUWP/NativeUWP.vcxproj
View File

@ -46,9 +46,9 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -215,7 +215,7 @@
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;_CRT_SECURE_NO_WARNINGS;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -230,7 +230,7 @@
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;_CRT_SECURE_NO_WARNINGS;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -245,7 +245,7 @@
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<AdditionalIncludeDirectories>../..;../../ext/native/ext;../..;../../ext/native;../../ext/zlib;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NOMINMAX;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;_CRT_SECURE_NO_WARNINGS;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -312,10 +312,12 @@
<ClInclude Include="..\..\ext\native\base\NKCodeFromSDL.h" />
<ClInclude Include="..\..\ext\native\base\stringutil.h" />
<ClInclude Include="..\..\ext\native\base\timeutil.h" />
<ClInclude Include="..\..\ext\native\data\base64.h" />
<ClInclude Include="..\..\ext\native\data\compression.h" />
<ClInclude Include="..\..\ext\native\data\listable.h" />
<ClInclude Include="..\..\ext\native\ext\cityhash\city.h" />
<ClInclude Include="..\..\ext\native\ext\cityhash\citycrc.h" />
<ClInclude Include="..\..\ext\native\ext\gason\gason.h" />
<ClInclude Include="..\..\ext\native\ext\jpge\jpgd.h" />
<ClInclude Include="..\..\ext\native\ext\jpge\jpge.h" />
<ClInclude Include="..\..\ext\native\ext\libpng17\png.h" />
@ -328,6 +330,8 @@
<ClInclude Include="..\..\ext\native\ext\libzip\config.h" />
<ClInclude Include="..\..\ext\native\ext\libzip\zip.h" />
<ClInclude Include="..\..\ext\native\ext\libzip\zipint.h" />
<ClInclude Include="..\..\ext\native\ext\rg_etc1\rg_etc1.h" />
<ClInclude Include="..\..\ext\native\ext\sha1\sha1.h" />
<ClInclude Include="..\..\ext\native\file\chunk_file.h" />
<ClInclude Include="..\..\ext\native\file\fd_util.h" />
<ClInclude Include="..\..\ext\native\file\file_util.h" />
@ -366,6 +370,7 @@
<ClInclude Include="..\..\ext\native\net\resolve.h" />
<ClInclude Include="..\..\ext\native\net\sinks.h" />
<ClInclude Include="..\..\ext\native\net\url.h" />
<ClInclude Include="..\..\ext\native\net\websocket_server.h" />
<ClInclude Include="..\..\ext\native\thin3d\thin3d.h" />
<ClInclude Include="..\..\ext\native\thread\executor.h" />
<ClInclude Include="..\..\ext\native\thread\prioritizedworkqueue.h" />
@ -397,8 +402,10 @@
<ClCompile Include="..\..\ext\native\base\logging.cpp" />
<ClCompile Include="..\..\ext\native\base\stringutil.cpp" />
<ClCompile Include="..\..\ext\native\base\timeutil.cpp" />
<ClCompile Include="..\..\ext\native\data\base64.cpp" />
<ClCompile Include="..\..\ext\native\data\compression.cpp" />
<ClCompile Include="..\..\ext\native\ext\cityhash\city.cpp" />
<ClCompile Include="..\..\ext\native\ext\gason\gason.cpp" />
<ClCompile Include="..\..\ext\native\ext\jpge\jpgd.cpp" />
<ClCompile Include="..\..\ext\native\ext\jpge\jpge.cpp" />
<ClCompile Include="..\..\ext\native\ext\libpng17\png.c">
@ -1160,6 +1167,8 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UWP Gold|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\ext\native\ext\rg_etc1\rg_etc1.cpp" />
<ClCompile Include="..\..\ext\native\ext\sha1\sha1.cpp" />
<ClCompile Include="..\..\ext\native\file\chunk_file.cpp" />
<ClCompile Include="..\..\ext\native\file\fd_util.cpp" />
<ClCompile Include="..\..\ext\native\file\file_util.cpp" />
@ -1279,6 +1288,7 @@
<ClCompile Include="..\..\ext\native\net\resolve.cpp" />
<ClCompile Include="..\..\ext\native\net\sinks.cpp" />
<ClCompile Include="..\..\ext\native\net\url.cpp" />
<ClCompile Include="..\..\ext\native\net\websocket_server.cpp" />
<ClCompile Include="..\..\ext\native\thin3d\thin3d.cpp" />
<ClCompile Include="..\..\ext\native\thin3d\thin3d_d3d11.cpp" />
<ClCompile Include="..\..\ext\native\thread\executor.cpp" />

43
UWP/NativeUWP/NativeUWP.vcxproj.filters
View File

@ -55,6 +55,15 @@
<Filter Include="data">
<UniqueIdentifier>{4d23e7d3-0b9b-4dbe-95df-6ab250782a66}</UniqueIdentifier>
</Filter>
<Filter Include="ext\gason">
<UniqueIdentifier>{fb517d8e-e6c4-4eaf-a579-9970daa96541}</UniqueIdentifier>
</Filter>
<Filter Include="ext\rg_etc1">
<UniqueIdentifier>{6c81d960-607b-4da7-b114-a6c57dff4360}</UniqueIdentifier>
</Filter>
<Filter Include="ext\sha1">
<UniqueIdentifier>{b68fe6a0-b55f-4411-91f4-63ab1eaf47a3}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="pch.cpp" />
@ -448,6 +457,23 @@
<ClCompile Include="..\..\ext\native\math\dataconv.cpp">
<Filter>math</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\json\json_reader.cpp" />
<ClCompile Include="..\..\ext\native\json\json_writer.cpp" />
<ClCompile Include="..\..\ext\native\ext\gason\gason.cpp">
<Filter>ext\gason</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\ext\rg_etc1\rg_etc1.cpp">
<Filter>ext\rg_etc1</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\ext\sha1\sha1.cpp">
<Filter>ext\sha1</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\net\websocket_server.cpp">
<Filter>net</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\native\data\base64.cpp">
<Filter>data</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h" />
@ -707,5 +733,22 @@
<ClInclude Include="..\..\ext\native\data\listable.h">
<Filter>data</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\json\json_reader.h" />
<ClInclude Include="..\..\ext\native\json\json_writer.h" />
<ClInclude Include="..\..\ext\native\ext\gason\gason.h">
<Filter>ext\gason</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\ext\rg_etc1\rg_etc1.h">
<Filter>ext\rg_etc1</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\ext\sha1\sha1.h">
<Filter>ext\sha1</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\net\websocket_server.h">
<Filter>net</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\native\data\base64.h">
<Filter>data</Filter>
</ClInclude>
</ItemGroup>
</Project>

64
UWP/PPSSPP_UWP.sln
View File

@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.28307.136
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonUWP", "CommonUWP\CommonUWP.vcxproj", "{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}"
EndProject
@ -22,141 +22,167 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glslang_UWP", "glslang_UWP\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SPIRVCross_UWP", "SPIRVCross_UWP\SPIRVCross_UWP.vcxproj", "{2B2D16BD-1D37-46AF-A3F8-552900951B26}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Armips_UWP", "Armips_UWP\Armips_UWP.vcxproj", "{75286959-E7A2-4CBE-8B95-BF05C9C540FF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
UWP Gold|ARM = UWP Gold|ARM
UWP Gold|ARM64 = UWP Gold|ARM64
UWP Gold|Win32 = UWP Gold|Win32
UWP Gold|x64 = UWP Gold|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|ARM.ActiveCfg = Debug|ARM
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|ARM.Build.0 = Debug|ARM
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|ARM64.ActiveCfg = Debug|Win32
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|Win32.ActiveCfg = Debug|Win32
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|Win32.Build.0 = Debug|Win32
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|x64.ActiveCfg = Debug|x64
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Debug|x64.Build.0 = Debug|x64
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|ARM.ActiveCfg = Release|ARM
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|ARM.Build.0 = Release|ARM
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|ARM64.ActiveCfg = Release|Win32
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|Win32.ActiveCfg = Release|Win32
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|Win32.Build.0 = Release|Win32
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|x64.ActiveCfg = Release|x64
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|x64.Build.0 = Release|x64
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|ARM64.ActiveCfg = UWP Gold|Win32
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|Win32.Build.0 = UWP Gold|Win32
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|x64.ActiveCfg = UWP Gold|x64
{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|x64.Build.0 = UWP Gold|x64
{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|ARM.ActiveCfg = Debug|ARM
{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|ARM.Build.0 = Debug|ARM
{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|ARM64.ActiveCfg = Debug|Win32
{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|Win32.ActiveCfg = Debug|Win32
{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|Win32.Build.0 = Debug|Win32
{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|x64.ActiveCfg = Debug|x64
{40B76674-02DE-40EF-889B-FAD1489685E7}.Debug|x64.Build.0 = Debug|x64
{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|ARM.ActiveCfg = Release|ARM
{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|ARM.Build.0 = Release|ARM
{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|ARM64.ActiveCfg = Release|Win32
{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|Win32.ActiveCfg = Release|Win32
{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|Win32.Build.0 = Release|Win32
{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|x64.ActiveCfg = Release|x64
{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|x64.Build.0 = Release|x64
{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|ARM64.ActiveCfg = UWP Gold|Win32
{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|Win32.Build.0 = UWP Gold|Win32
{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|x64.ActiveCfg = UWP Gold|x64
{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|x64.Build.0 = UWP Gold|x64
{5D271429-C288-4534-98AF-94475D940058}.Debug|ARM.ActiveCfg = Debug|ARM
{5D271429-C288-4534-98AF-94475D940058}.Debug|ARM.Build.0 = Debug|ARM
{5D271429-C288-4534-98AF-94475D940058}.Debug|ARM64.ActiveCfg = Debug|Win32
{5D271429-C288-4534-98AF-94475D940058}.Debug|Win32.ActiveCfg = Debug|Win32
{5D271429-C288-4534-98AF-94475D940058}.Debug|Win32.Build.0 = Debug|Win32
{5D271429-C288-4534-98AF-94475D940058}.Debug|x64.ActiveCfg = Debug|x64
{5D271429-C288-4534-98AF-94475D940058}.Debug|x64.Build.0 = Debug|x64
{5D271429-C288-4534-98AF-94475D940058}.Release|ARM.ActiveCfg = Release|ARM
{5D271429-C288-4534-98AF-94475D940058}.Release|ARM.Build.0 = Release|ARM
{5D271429-C288-4534-98AF-94475D940058}.Release|ARM64.ActiveCfg = Release|Win32
{5D271429-C288-4534-98AF-94475D940058}.Release|Win32.ActiveCfg = Release|Win32
{5D271429-C288-4534-98AF-94475D940058}.Release|Win32.Build.0 = Release|Win32
{5D271429-C288-4534-98AF-94475D940058}.Release|x64.ActiveCfg = Release|x64
{5D271429-C288-4534-98AF-94475D940058}.Release|x64.Build.0 = Release|x64
{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|ARM64.ActiveCfg = UWP Gold|Win32
{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|Win32.Build.0 = UWP Gold|Win32
{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|x64.ActiveCfg = UWP Gold|x64
{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|x64.Build.0 = UWP Gold|x64
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Debug|ARM.ActiveCfg = Debug|ARM
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Debug|ARM.Build.0 = Debug|ARM
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Debug|ARM64.ActiveCfg = Debug|Win32
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Debug|Win32.ActiveCfg = Debug|Win32
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Debug|Win32.Build.0 = Debug|Win32
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Debug|x64.ActiveCfg = Debug|x64
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Debug|x64.Build.0 = Debug|x64
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Release|ARM.ActiveCfg = Release|ARM
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Release|ARM.Build.0 = Release|ARM
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Release|ARM64.ActiveCfg = Release|Win32
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Release|Win32.ActiveCfg = Release|Win32
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Release|Win32.Build.0 = Release|Win32
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Release|x64.ActiveCfg = Release|x64
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Release|x64.Build.0 = Release|x64
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.UWP Gold|ARM64.ActiveCfg = UWP Gold|Win32
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.UWP Gold|Win32.Build.0 = UWP Gold|Win32
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.UWP Gold|x64.ActiveCfg = UWP Gold|x64
{935028AF-B850-4AD7-A00E-7BA84FB97D05}.UWP Gold|x64.Build.0 = UWP Gold|x64
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|ARM.ActiveCfg = Debug|ARM
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|ARM.Build.0 = Debug|ARM
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|ARM64.ActiveCfg = Debug|Win32
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|Win32.ActiveCfg = Debug|Win32
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|Win32.Build.0 = Debug|Win32
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|x64.ActiveCfg = Debug|x64
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Debug|x64.Build.0 = Debug|x64
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|ARM.ActiveCfg = Release|ARM
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|ARM.Build.0 = Release|ARM
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|ARM64.ActiveCfg = Release|Win32
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|Win32.ActiveCfg = Release|Win32
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|Win32.Build.0 = Release|Win32
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|x64.ActiveCfg = Release|x64
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|x64.Build.0 = Release|x64
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|ARM64.ActiveCfg = UWP Gold|Win32
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|Win32.Build.0 = UWP Gold|Win32
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|x64.ActiveCfg = UWP Gold|x64
{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|x64.Build.0 = UWP Gold|x64
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|ARM.ActiveCfg = Debug|ARM
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|ARM.Build.0 = Debug|ARM
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|ARM64.ActiveCfg = Debug|Win32
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|Win32.ActiveCfg = Debug|Win32
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|Win32.Build.0 = Debug|Win32
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|x64.ActiveCfg = Debug|x64
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Debug|x64.Build.0 = Debug|x64
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|ARM.ActiveCfg = Release|ARM
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|ARM.Build.0 = Release|ARM
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|ARM64.ActiveCfg = Release|Win32
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|Win32.ActiveCfg = Release|Win32
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|Win32.Build.0 = Release|Win32
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|x64.ActiveCfg = Release|x64
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|x64.Build.0 = Release|x64
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|ARM64.ActiveCfg = UWP Gold|Win32
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|Win32.Build.0 = UWP Gold|Win32
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|x64.ActiveCfg = UWP Gold|x64
{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|x64.Build.0 = UWP Gold|x64
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|ARM.ActiveCfg = Debug|ARM
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|ARM.Build.0 = Debug|ARM
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|ARM64.ActiveCfg = Debug|Win32
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|Win32.ActiveCfg = Debug|Win32
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|Win32.Build.0 = Debug|Win32
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|x64.ActiveCfg = Debug|x64
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Debug|x64.Build.0 = Debug|x64
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|ARM.ActiveCfg = Release|ARM
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|ARM.Build.0 = Release|ARM
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|ARM64.ActiveCfg = Release|Win32
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|Win32.ActiveCfg = Release|Win32
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|Win32.Build.0 = Release|Win32
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|x64.ActiveCfg = Release|x64
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|x64.Build.0 = Release|x64
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|ARM64.ActiveCfg = UWP Gold|Win32
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|Win32.Build.0 = UWP Gold|Win32
{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|x64.ActiveCfg = UWP Gold|x64
@ -164,6 +190,7 @@ Global
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|ARM.ActiveCfg = Debug|ARM
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|ARM.Build.0 = Debug|ARM
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|ARM.Deploy.0 = Debug|ARM
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|ARM64.ActiveCfg = Debug|Win32
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|Win32.ActiveCfg = Debug|Win32
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|Win32.Build.0 = Debug|Win32
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Debug|Win32.Deploy.0 = Debug|Win32
@ -173,6 +200,7 @@ Global
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|ARM.ActiveCfg = Release|ARM
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|ARM.Build.0 = Release|ARM
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|ARM.Deploy.0 = Release|ARM
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|ARM64.ActiveCfg = Release|Win32
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|Win32.ActiveCfg = Release|Win32
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|Win32.Build.0 = Release|Win32
{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|Win32.Deploy.0 = Release|Win32
@ -182,6 +210,7 @@ Global
{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|ARM.Deploy.0 = UWP Gold|ARM
{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|ARM64.ActiveCfg = UWP Gold|Win32
{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|Win32.Build.0 = UWP Gold|Win32
{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|Win32.Deploy.0 = UWP Gold|Win32
@ -190,42 +219,73 @@ Global
{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|x64.Deploy.0 = UWP Gold|x64
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|ARM.ActiveCfg = Debug|ARM
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|ARM.Build.0 = Debug|ARM
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|ARM64.ActiveCfg = Debug|Win32
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|Win32.ActiveCfg = Debug|Win32
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|Win32.Build.0 = Debug|Win32
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|x64.ActiveCfg = Debug|x64
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Debug|x64.Build.0 = Debug|x64
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|ARM.ActiveCfg = Release|ARM
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|ARM.Build.0 = Release|ARM
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|ARM64.ActiveCfg = Release|Win32
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|Win32.ActiveCfg = Release|Win32
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|Win32.Build.0 = Release|Win32
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|x64.ActiveCfg = Release|x64
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|x64.Build.0 = Release|x64
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|ARM64.ActiveCfg = UWP Gold|Win32
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|Win32.Build.0 = UWP Gold|Win32
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|x64.ActiveCfg = UWP Gold|x64
{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|x64.Build.0 = UWP Gold|x64
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|ARM.ActiveCfg = Debug|ARM
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|ARM.Build.0 = Debug|ARM
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|ARM64.ActiveCfg = Debug|Win32
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|Win32.ActiveCfg = Debug|Win32
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|Win32.Build.0 = Debug|Win32
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|x64.ActiveCfg = Debug|x64
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Debug|x64.Build.0 = Debug|x64
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|ARM.ActiveCfg = Release|ARM
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|ARM.Build.0 = Release|ARM
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|ARM64.ActiveCfg = Release|Win32
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|Win32.ActiveCfg = Release|Win32
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|Win32.Build.0 = Release|Win32
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|x64.ActiveCfg = Release|x64
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|x64.Build.0 = Release|x64
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|ARM64.ActiveCfg = UWP Gold|Win32
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|Win32.Build.0 = UWP Gold|Win32
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|x64.ActiveCfg = UWP Gold|x64
{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|x64.Build.0 = UWP Gold|x64
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|ARM.ActiveCfg = Debug|ARM
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|ARM.Build.0 = Debug|ARM
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|ARM64.ActiveCfg = Debug|Win32
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|Win32.ActiveCfg = Debug|Win32
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|Win32.Build.0 = Debug|Win32
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|x64.ActiveCfg = Debug|x64
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Debug|x64.Build.0 = Debug|x64
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|ARM.ActiveCfg = Release|ARM
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|ARM.Build.0 = Release|ARM
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|ARM64.ActiveCfg = Release|Win32
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|Win32.ActiveCfg = Release|Win32
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|Win32.Build.0 = Release|Win32
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|x64.ActiveCfg = Release|x64
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.Release|x64.Build.0 = Release|x64
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|ARM.ActiveCfg = Release|ARM
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|ARM.Build.0 = Release|ARM
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|ARM64.ActiveCfg = Release|x64
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|ARM64.Build.0 = Release|x64
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|Win32.ActiveCfg = Release|Win32
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|Win32.Build.0 = Release|Win32
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|x64.ActiveCfg = Release|x64
{75286959-E7A2-4CBE-8B95-BF05C9C540FF}.UWP Gold|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2C8B6968-85F7-4F06-9D3D-7CD2309F5B0E}
EndGlobalSection
EndGlobal

6
UWP/PPSSPP_UWPMain.cpp
View File

@ -120,7 +120,7 @@ PPSSPP_UWPMain::PPSSPP_UWPMain(App ^app, const std::shared_ptr<DX::DeviceResourc
std::string cacheFolder = ConvertWStringToUTF8(ApplicationData::Current->LocalFolder->Path->Data());
NativeInit(1, argv, "", "", cacheFolder.c_str(), false);
NativeInit(1, argv, "", "", cacheFolder.c_str());
NativeInitGraphics(ctx_.get());
NativeResized();
@ -322,8 +322,10 @@ void PPSSPP_UWPMain::LoadStorageFile(StorageFile ^file) {
}
UWPGraphicsContext::UWPGraphicsContext(std::shared_ptr<DX::DeviceResources> resources) {
std::vector<std::string> adapterNames;
draw_ = Draw::T3DCreateD3D11Context(
resources->GetD3DDevice(), resources->GetD3DDeviceContext(), resources->GetD3DDevice(), resources->GetD3DDeviceContext(), resources->GetDeviceFeatureLevel(), 0);
resources->GetD3DDevice(), resources->GetD3DDeviceContext(), resources->GetD3DDevice(), resources->GetD3DDeviceContext(), resources->GetDeviceFeatureLevel(), 0, adapterNames);
bool success = draw_->CreatePresets();
assert(success);
}

15
UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj
View File

@ -46,9 +46,9 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -169,6 +169,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -182,6 +183,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -195,6 +197,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -208,6 +211,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -221,6 +225,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -234,6 +239,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -247,6 +253,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -260,6 +267,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -273,6 +281,7 @@
<CompileAsWinRT>false</CompileAsWinRT>
<SDLCheck>true</SDLCheck>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@ -314,4 +323,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

2
UWP/SPIRVCross_UWP/SPIRVCross_UWP.vcxproj.filters
View File

@ -13,6 +13,7 @@
<ClCompile Include="..\..\ext\SPIRV-Cross\spirv_glsl.cpp" />
<ClCompile Include="..\..\ext\SPIRV-Cross\spirv_hlsl.cpp" />
<ClCompile Include="..\..\ext\SPIRV-Cross\spirv_msl.cpp" />
<ClCompile Include="..\..\ext\SPIRV-Cross\spirv_cross_util.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h" />
@ -24,5 +25,6 @@
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_glsl.hpp" />
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_hlsl.hpp" />
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_msl.hpp" />
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross_util.hpp" />
</ItemGroup>
</Project>

6
UWP/UI_UWP/UI_UWP.vcxproj
View File

@ -46,9 +46,9 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -378,4 +378,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

11
UWP/UWP.vcxproj
View File

@ -46,10 +46,10 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<ProjectName>PPSSPP_UWP</ProjectName>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -156,7 +156,7 @@
<PackageCertificateKeyFile>PPSSPP_UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
<AppxBundle>Never</AppxBundle>
<AppxBundle>Never</AppxBundle>
<PackageCertificateThumbprint>B57919568D3F60B8D25EC6856DE94173682C548C</PackageCertificateThumbprint>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@ -464,6 +464,9 @@ copy AssetsGold\*.* Assets /Y
<None Include="UWP_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Armips_UWP\Armips_UWP.vcxproj">
<Project>{75286959-e7a2-4cbe-8b95-bf05c9c540ff}</Project>
</ProjectReference>
<ProjectReference Include="CommonUWP\CommonUWP.vcxproj">
<Project>{acb316ca-3ecb-48e5-be0a-91e72d5b0f12}</Project>
</ProjectReference>
@ -506,4 +509,4 @@ copy AssetsGold\*.* Assets /Y
<Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\MeshContentTask.targets" />
<Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ShaderGraphContentTask.targets" />
</ImportGroup>
</Project>
</Project>

1
UWP/UWPHost.cpp
View File

@ -31,7 +31,6 @@
#include "UI/OnScreenDisplay.h"
#include "Windows/XinputDevice.h"
#include "Windows/DSoundStream.h"
#include "UWP/XAudioSoundStream.h"
#include "UWP/UWPHost.h"

3
UWP/XAudioSoundStream.h
View File

@ -2,7 +2,8 @@
#include "Common/CommonWindows.h"
#include "Core/Config.h"
#include "Windows/DSoundStream.h"
#include "Windows/WindowsAudio.h"
// Factory
WindowsAudioBackend *CreateAudioBackend(AudioBackendType type);

6
UWP/glslang_UWP/glslang_UWP.vcxproj
View File

@ -46,9 +46,9 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -302,6 +302,7 @@
<ClInclude Include="..\..\ext\glslang\glslang\Include\revision.h" />
<ClInclude Include="..\..\ext\glslang\glslang\Include\ShHandle.h" />
<ClInclude Include="..\..\ext\glslang\glslang\Include\Types.h" />
<ClInclude Include="..\..\ext\glslang\glslang\MachineIndependent\attribute.h" />
<ClInclude Include="..\..\ext\glslang\glslang\MachineIndependent\glslang_tab.cpp.h" />
<ClInclude Include="..\..\ext\glslang\glslang\MachineIndependent\gl_types.h" />
<ClInclude Include="..\..\ext\glslang\glslang\MachineIndependent\Initialize.h" />
@ -347,6 +348,7 @@
<ItemGroup>
<ClCompile Include="..\..\ext\glslang\glslang\GenericCodeGen\CodeGen.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\GenericCodeGen\Link.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\attribute.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\Constant.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\glslang_tab.cpp" />
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\InfoSink.cpp" />

6
UWP/glslang_UWP/glslang_UWP.vcxproj.filters
View File

@ -160,6 +160,9 @@
<ClCompile Include="..\..\ext\glslang\OGLCompilersDLL\InitializeDll.cpp">
<Filter>OGLCompilersDLL</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\attribute.cpp">
<Filter>glslang\MachineIndependent</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h" />
@ -317,5 +320,8 @@
<ClInclude Include="..\..\ext\glslang\OGLCompilersDLL\InitializeDll.h">
<Filter>OGLCompilersDLL</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\glslang\glslang\MachineIndependent\attribute.h">
<Filter>glslang\MachineIndependent</Filter>
</ClInclude>
</ItemGroup>
</Project>

4
UWP/libkirk_UWP/libkirk_UWP.vcxproj
View File

@ -46,9 +46,9 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

4
UWP/zlib_UWP/zlib_UWP.vcxproj
View File

@ -46,9 +46,9 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformMinVersion>10.0.14393.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
ext/native/math/fast/fast_math.c
View File

@ -5,8 +5,10 @@
void InitFastMath(int enableNEON) {
// Every architecture has its own define. This needs to be added to.
if (enableNEON) {
#ifndef _MSC_VER
#if PPSSPP_ARCH(ARM_NEON) && !PPSSPP_ARCH(ARM64)
fast_matrix_mul_4x4 = &fast_matrix_mul_4x4_neon;
#endif
#endif
}
}

5
ext/native/net/http_server.cpp
View File

@ -1,4 +1,5 @@
#include "base/timeutil.h"
#include "ppsspp_config.h"
#ifdef _WIN32
@ -23,6 +24,10 @@
#endif
#ifdef PPSSPP_PLATFORM(UWP)
#define in6addr_any IN6ADDR_ANY_INIT
#endif
#include <algorithm>
#include <functional>