diff --git a/pkg/msvc-uwp/.gitignore b/pkg/msvc-uwp/.gitignore index 48e44f353f..42a3bc66e5 100644 --- a/pkg/msvc-uwp/.gitignore +++ b/pkg/msvc-uwp/.gitignore @@ -1,16 +1,12 @@ AppPackages/ */BundleArtifacts/ .vs/ -/RetroArch-msvcUWP/ARM /RetroArch-msvcUWP/ARM64 /RetroArch-msvcUWP/DebugANGLE /RetroArch-msvcUWP/ReleaseANGLE /RetroArch-msvcUWP/x64 -/RetroArch-msvcUWP/x86 /RetroArch-msvcUWP/Generated Files /DebugANGLE /ReleaseANGLE /x64 -/x86 -/ARM /ARM64 \ No newline at end of file diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP.sln b/pkg/msvc-uwp/RetroArch-msvcUWP.sln index eea9cf4b79..9262880936 100644 --- a/pkg/msvc-uwp/RetroArch-msvcUWP.sln +++ b/pkg/msvc-uwp/RetroArch-msvcUWP.sln @@ -7,50 +7,34 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvcUWP", "RetroA EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 - DebugANGLE|ARM = DebugANGLE|ARM DebugANGLE|ARM64 = DebugANGLE|ARM64 DebugANGLE|x64 = DebugANGLE|x64 - Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 - ReleaseANGLE|ARM = ReleaseANGLE|ARM ReleaseANGLE|ARM64 = ReleaseANGLE|ARM64 ReleaseANGLE|x64 = ReleaseANGLE|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|ARM.ActiveCfg = Debug|ARM - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|ARM.Build.0 = Debug|ARM - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|ARM.Deploy.0 = Debug|ARM {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|ARM64.ActiveCfg = Debug|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|ARM64.Build.0 = Debug|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|ARM64.Deploy.0 = Debug|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|x64.ActiveCfg = Debug|x64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|x64.Build.0 = Debug|x64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Debug|x64.Deploy.0 = Debug|x64 - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.DebugANGLE|ARM.ActiveCfg = DebugANGLE|ARM - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.DebugANGLE|ARM.Build.0 = DebugANGLE|ARM - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.DebugANGLE|ARM.Deploy.0 = DebugANGLE|ARM {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.DebugANGLE|ARM64.ActiveCfg = DebugANGLE|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.DebugANGLE|ARM64.Build.0 = DebugANGLE|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.DebugANGLE|ARM64.Deploy.0 = DebugANGLE|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.DebugANGLE|x64.ActiveCfg = DebugANGLE|x64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.DebugANGLE|x64.Build.0 = DebugANGLE|x64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.DebugANGLE|x64.Deploy.0 = DebugANGLE|x64 - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|ARM.ActiveCfg = Release|ARM - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|ARM.Build.0 = Release|ARM - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|ARM.Deploy.0 = Release|ARM {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|ARM64.ActiveCfg = Release|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|ARM64.Build.0 = Release|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|ARM64.Deploy.0 = Release|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|x64.ActiveCfg = Release|x64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|x64.Build.0 = Release|x64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.Release|x64.Deploy.0 = Release|x64 - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.ReleaseANGLE|ARM.ActiveCfg = ReleaseANGLE|ARM - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.ReleaseANGLE|ARM.Build.0 = ReleaseANGLE|ARM - {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.ReleaseANGLE|ARM.Deploy.0 = ReleaseANGLE|ARM {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.ReleaseANGLE|ARM64.ActiveCfg = ReleaseANGLE|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.ReleaseANGLE|ARM64.Build.0 = ReleaseANGLE|ARM64 {F5E937B6-1BA0-4446-B94B-F3BBDEF908F4}.ReleaseANGLE|ARM64.Deploy.0 = ReleaseANGLE|ARM64 diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/ANGLE/ARM/libEGL.lib b/pkg/msvc-uwp/RetroArch-msvcUWP/ANGLE/ARM/libEGL.lib deleted file mode 100644 index 902a542f47..0000000000 Binary files a/pkg/msvc-uwp/RetroArch-msvcUWP/ANGLE/ARM/libEGL.lib and /dev/null differ diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/ANGLE/ARM/libGLESv2.lib b/pkg/msvc-uwp/RetroArch-msvcUWP/ANGLE/ARM/libGLESv2.lib deleted file mode 100644 index 91ec66f2fb..0000000000 Binary files a/pkg/msvc-uwp/RetroArch-msvcUWP/ANGLE/ARM/libGLESv2.lib and /dev/null differ diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/RetroArch-msvcUWP.vcxproj b/pkg/msvc-uwp/RetroArch-msvcUWP/RetroArch-msvcUWP.vcxproj index 2fc684aa61..2c37290019 100644 --- a/pkg/msvc-uwp/RetroArch-msvcUWP/RetroArch-msvcUWP.vcxproj +++ b/pkg/msvc-uwp/RetroArch-msvcUWP/RetroArch-msvcUWP.vcxproj @@ -17,22 +17,6 @@ Release x64 - - DebugANGLE - ARM - - - Debug - ARM - - - ReleaseANGLE - ARM - - - Release - ARM - DebugANGLE ARM64 @@ -96,51 +80,6 @@ True RetroArch-msvcUWP_TemporaryKey.pfx - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm - /nodefaultlib:vccorlibd /nodefaultlib:msvcrtd vccorlibd.lib msvcrtd.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\7zip;$(MSBuildProjectDirectory)\..\..\..\deps\dr;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) /utf-8 - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_BUILTINGLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_ONLINE_UPDATER;HAVE_UPDATE_ASSETS;HAVE_UPDATE_CORES;HAVE_UPDATE_CORE_INFO;HAVE_UPDATE_CORE_INFO;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_CHD;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_7ZIP;_7ZIP_ST;HAVE_TRANSLATE;HAVE_RPNG;HAVE_CORE_INFO_CACHE;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;DEBUG;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_STD_VORBIS;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_IFINFO;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_GFX_WIDGETS;HAVE_CONFIGFILE;HAVE_PATCH;HAVE_DSP_FILTER;HAVE_VIDEO_FILTER;HAVE_REWIND;HAVE_SCREENSHOTS;HAVE_CHEATS;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_AUDIOMIXER;HAVE_RWAV;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS;_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING - - - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm - /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\7zip;$(MSBuildProjectDirectory)\..\..\..\deps\dr;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) /utf-8 - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_BUILTINGLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_ONLINE_UPDATER;HAVE_UPDATE_ASSETS;HAVE_UPDATE_CORES;HAVE_UPDATE_CORE_INFO;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_CHD;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_7ZIP;_7ZIP_ST;HAVE_TRANSLATE;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;HAVE_RPNG;HAVE_CORE_INFO_CACHE;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_STD_VORBIS;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_IFINFO;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_MENU;HAVE_GFX_WIDGETS;HAVE_CONFIGFILE;HAVE_PATCH;HAVE_DSP_FILTER;HAVE_VIDEO_FILTER;HAVE_REWIND;HAVE_SCREENSHOTS;HAVE_CHEATS;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_AUDIOMIXER;HAVE_RWAV;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS;_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING - - - - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) - %(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm ;$(MSBuildProjectDirectory)\ANGLE\$(Platform) - /nodefaultlib:vccorlib /nodefaultlib:msvcrt vccorlib.lib msvcrt.lib %(AdditionalOptions) - - - - - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\7zip;$(MSBuildProjectDirectory)\..\..\..\deps\dr;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include\ANGLE;%(AdditionalIncludeDirectories) - /bigobj %(AdditionalOptions) /utf-8 - 4453;28204 - WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_BUILTINGLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_ONLINE_UPDATER;HAVE_UPDATE_ASSETS;HAVE_UPDATE_CORES;HAVE_UPDATE_CORE_INFO;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_CHD;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_7ZIP;_7ZIP_ST;HAVE_TRANSLATE;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;HAVE_RPNG;HAVE_CORE_INFO_CACHE;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_STD_VORBIS;HAVE_DR_FLAC;HAVE_DR_MP3;HAVE_DIRECTX;HAVE_NETWORKING;HAVE_IFINFO;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_MENU;HAVE_GFX_WIDGETS;HAVE_CONFIGFILE;HAVE_PATCH;HAVE_DSP_FILTER;HAVE_VIDEO_FILTER;HAVE_REWIND;HAVE_SCREENSHOTS;HAVE_CHEATS;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_AUDIOMIXER;HAVE_RWAV;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS;HAVE_ANGLE;HAVE_OPENGL;HAVE_OPENGLES;HAVE_OPENGLES2;HAVE_GLSL;_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING - - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; dxguid.lib; %(AdditionalDependencies) diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/cores/ARM/.empty b/pkg/msvc-uwp/RetroArch-msvcUWP/cores/ARM/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pkg/msvc-uwp/RetroArch-msvcUWP/cores/ARM/cores/.empty b/pkg/msvc-uwp/RetroArch-msvcUWP/cores/ARM/cores/.empty deleted file mode 100644 index e69de29bb2..0000000000