From d630213d3634a316211704f807887d4f8526f8d7 Mon Sep 17 00:00:00 2001 From: driver1998 Date: Tue, 11 Jun 2019 02:40:46 +0800 Subject: [PATCH 1/2] Windows ARM64 support --- config.def.h | 8 +- ...troArch-msvc2017-UWP-cores-nonfree.vcxproj | 2 +- .../RetroArch-msvc2017-UWP/Bundle.Mapping.txt | 2 +- .../RetroArch-msvc2017-UWP.vcxproj | 8 +- pkg/msvc/RetroArch-msvc2017.sln | 28 +- pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj | 608 +++++++++++++++++- .../RetroArch-msvc2017.vcxproj.filters | 15 +- 7 files changed, 654 insertions(+), 17 deletions(-) diff --git a/config.def.h b/config.def.h index d2b136935e..3ec80177eb 100644 --- a/config.def.h +++ b/config.def.h @@ -903,16 +903,20 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x64/latest/"; #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86/latest/"; -#elif defined(__arm__) || defined(_M_ARM) +#elif defined(__arm__) || defined(_M_ARM) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm/latest/"; +#elif defined(__aarch64__) || defined(_M_ARM64) +static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm64/latest/"; #endif #else #if defined(__x86_64__) || defined(_M_X64) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x64/latest/"; #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86/latest/"; -#elif defined(__arm__) || defined(_M_ARM) +#elif defined(__arm__) || defined(_M_ARM) static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/"; +#elif defined(__aarch64__) || defined(_M_ARM64) +static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm64/latest/"; #endif #endif #elif _MSC_VER == 1600 diff --git a/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj index ce015f68d1..94d4becc97 100644 --- a/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj +++ b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj @@ -122,7 +122,7 @@ False False Always - x86|x64|arm + arm64 1 OnApplicationRun diff --git a/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Bundle.Mapping.txt b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Bundle.Mapping.txt index ba39b44f25..146e2ac67e 100644 --- a/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Bundle.Mapping.txt +++ b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/Bundle.Mapping.txt @@ -1,2 +1,2 @@ [ExternalPackages] -"..\AppPackages\RetroArch-msvc2017-UWP-cores-nonfree\RetroArch-msvc2017-UWP-cores-nonfree_1.0.0.0_Test\RetroArch-msvc2017-UWP-cores-nonfree_1.0.0.0_x86_x64_arm.appxbundle" +"..\AppPackages\RetroArch-msvc2017-UWP-cores-nonfree\RetroArch-msvc2017-UWP-cores-nonfree_1.0.0.0_Test\RetroArch-msvc2017-UWP-cores-nonfree_1.0.0.0_x86_x64_arm_arm64.appxbundle" diff --git a/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj index 4f3836821d..e5180b5087 100644 --- a/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj +++ b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj @@ -132,7 +132,7 @@ RetroArch-UWP_TemporaryKey.pfx False False - x86|x64|arm + arm64 1 OnApplicationRun Always @@ -176,7 +176,7 @@ - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;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_MENU_WIDGETS;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS @@ -191,7 +191,7 @@ - $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 WIN32;HAVE_MAIN;HAVE_DYNAMIC;HAVE_XAUDIO2;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_GLSLANG;HAVE_SLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_XINPUT;HAVE_XINPUT2;HAVE_XAUDIO;HAVE_DIRECTX;HAVE_NETWORKING;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_MENU_WIDGETS;HAVE_RGUI;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_STATIC_DUMMY;HAVE_STATIC_VIDEO_FILTERS;HAVE_STATIC_AUDIO_FILTERS @@ -337,4 +337,4 @@ - \ No newline at end of file + diff --git a/pkg/msvc/RetroArch-msvc2017.sln b/pkg/msvc/RetroArch-msvc2017.sln index 64effc45f8..3083924920 100644 --- a/pkg/msvc/RetroArch-msvc2017.sln +++ b/pkg/msvc/RetroArch-msvc2017.sln @@ -1,82 +1,106 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26228.9 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28803.452 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2017", "msvc-2017\RetroArch-msvc2017.vcxproj", "{27FF7CE1-4059-4AA1-8062-FD529560FA54}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Cg|ARM = Debug Cg|ARM + Debug Cg|ARM64 = Debug Cg|ARM64 Debug Cg|x64 = Debug Cg|x64 Debug Cg|x86 = Debug Cg|x86 Debug QT|ARM = Debug QT|ARM + Debug QT|ARM64 = Debug QT|ARM64 Debug QT|x64 = Debug QT|x64 Debug QT|x86 = Debug QT|x86 Debug QT+CG|ARM = Debug QT+CG|ARM + Debug QT+CG|ARM64 = Debug QT+CG|ARM64 Debug QT+CG|x64 = Debug QT+CG|x64 Debug QT+CG|x86 = Debug QT+CG|x86 Debug|ARM = Debug|ARM + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release Cg|ARM = Release Cg|ARM + Release Cg|ARM64 = Release Cg|ARM64 Release Cg|x64 = Release Cg|x64 Release Cg|x86 = Release Cg|x86 Release QT|ARM = Release QT|ARM + Release QT|ARM64 = Release QT|ARM64 Release QT|x64 = Release QT|x64 Release QT|x86 = Release QT|x86 Release QT+CG|ARM = Release QT+CG|ARM + Release QT+CG|ARM64 = Release QT+CG|ARM64 Release QT+CG|x64 = Release QT+CG|x64 Release QT+CG|x86 = Release QT+CG|x86 Release|ARM = Release|ARM + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM.ActiveCfg = Debug Cg|ARM {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM.Build.0 = Debug Cg|ARM + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM64.ActiveCfg = Debug Cg|ARM64 + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|ARM64.Build.0 = Debug Cg|ARM64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x64.ActiveCfg = Debug Cg|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x64.Build.0 = Debug Cg|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x86.ActiveCfg = Debug Cg|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x86.Build.0 = Debug Cg|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM.ActiveCfg = Debug QT|ARM {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM.Build.0 = Debug QT|ARM + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM64.ActiveCfg = Debug QT|ARM64 + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|ARM64.Build.0 = Debug QT|ARM64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x64.ActiveCfg = Debug QT|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x64.Build.0 = Debug QT|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x86.ActiveCfg = Debug QT|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT|x86.Build.0 = Debug QT|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM.ActiveCfg = Debug QT+CG|ARM {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM.Build.0 = Debug QT+CG|ARM + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM64.ActiveCfg = Debug QT+CG|ARM64 + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|ARM64.Build.0 = Debug QT+CG|ARM64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x64.ActiveCfg = Debug QT+CG|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x64.Build.0 = Debug QT+CG|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x86.ActiveCfg = Debug QT+CG|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug QT+CG|x86.Build.0 = Debug QT+CG|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM.ActiveCfg = Debug|ARM {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM.Build.0 = Debug|ARM + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|ARM64.Build.0 = Debug|ARM64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x64.ActiveCfg = Debug|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x64.Build.0 = Debug|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x86.ActiveCfg = Debug|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x86.Build.0 = Debug|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM.ActiveCfg = Release Cg|ARM {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM.Build.0 = Release Cg|ARM + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM64.ActiveCfg = Release Cg|ARM64 + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|ARM64.Build.0 = Release Cg|ARM64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x64.ActiveCfg = Release Cg|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x64.Build.0 = Release Cg|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x86.ActiveCfg = Release Cg|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x86.Build.0 = Release Cg|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM.ActiveCfg = Release QT|ARM {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM.Build.0 = Release QT|ARM + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM64.ActiveCfg = Release QT|ARM64 + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|ARM64.Build.0 = Release QT|ARM64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x64.ActiveCfg = Release QT|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x64.Build.0 = Release QT|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x86.ActiveCfg = Release QT|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT|x86.Build.0 = Release QT|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM.ActiveCfg = Release QT+CG|ARM {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM.Build.0 = Release QT+CG|ARM + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM64.ActiveCfg = Release QT+CG|ARM64 + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|ARM64.Build.0 = Release QT+CG|ARM64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x64.ActiveCfg = Release QT+CG|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x64.Build.0 = Release QT+CG|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x86.ActiveCfg = Release QT+CG|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release QT+CG|x86.Build.0 = Release QT+CG|Win32 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM.ActiveCfg = Release|ARM {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM.Build.0 = Release|ARM + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM64.ActiveCfg = Release|ARM64 + {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|ARM64.Build.0 = Release|ARM64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x64.ActiveCfg = Release|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x64.Build.0 = Release|x64 {27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x86.ActiveCfg = Release|Win32 diff --git a/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj b/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj index b5d991b3b0..80805f42f8 100644 --- a/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj +++ b/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj @@ -5,6 +5,10 @@ Debug Cg ARM + + Debug Cg + ARM64 + Debug Cg Win32 @@ -17,6 +21,10 @@ Debug QT+CG ARM + + Debug QT+CG + ARM64 + Debug QT+CG Win32 @@ -29,6 +37,10 @@ Debug QT ARM + + Debug QT + ARM64 + Debug QT Win32 @@ -41,6 +53,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -53,6 +69,10 @@ Release Cg ARM + + Release Cg + ARM64 + Release Cg Win32 @@ -65,6 +85,10 @@ Release QT+CG ARM + + Release QT+CG + ARM64 + Release QT+CG Win32 @@ -77,6 +101,10 @@ Release QT ARM + + Release QT + ARM64 + Release QT Win32 @@ -89,6 +117,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -118,6 +150,13 @@ v141 true + + Application + true + NotSet + v141 + true + Application true @@ -130,6 +169,12 @@ NotSet v141 + + Application + true + NotSet + v141 + Application true @@ -142,6 +187,12 @@ NotSet v141 + + Application + true + NotSet + v141 + Application true @@ -154,6 +205,12 @@ NotSet v141 + + Application + true + NotSet + v141 + Application true @@ -193,6 +250,14 @@ v141 true + + Application + false + true + NotSet + v141 + true + Application false @@ -207,6 +272,13 @@ NotSet v141 + + Application + false + true + NotSet + v141 + Application false @@ -221,6 +293,13 @@ NotSet v141 + + Application + false + true + NotSet + v141 + Application false @@ -235,6 +314,13 @@ NotSet v141 + + Application + false + true + NotSet + v141 + Application false @@ -272,24 +358,36 @@ + + + + + + + + + + + + @@ -308,24 +406,36 @@ + + + + + + + + + + + + @@ -355,6 +465,14 @@ + + true + $(IncludePath);$(DXSDK_DIR)Include + $(LibraryPath) + AllRules.ruleset + + + true $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include @@ -371,6 +489,14 @@ + + true + $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include + $(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath) + AllRules.ruleset + + + true $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2015\include\QtCore;$(QtDirectory)\msvc2015\include\QtWidgets;$(QtDirectory)\msvc2015\include\QtGui;$(QtDirectory)\msvc2015\include @@ -389,6 +515,15 @@ $(QtDirectory)\msvc2015\bin;$(ExecutablePath) + + true + $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2015\include\QtCore;$(QtDirectory)\msvc2015\include\QtWidgets;$(QtDirectory)\msvc2015\include\QtGui;$(QtDirectory)\msvc2015\include + $(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(QtDirectory)\msvc2015\lib;$(LibraryPath) + AllRules.ruleset + + + $(QtDirectory)\msvc2015\bin;$(ExecutablePath) + true $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2015\include\QtCore;$(QtDirectory)\msvc2015\include\QtWidgets;$(QtDirectory)\msvc2015\include\QtGui;$(QtDirectory)\msvc2015\include @@ -407,6 +542,15 @@ $(QtDirectory)\msvc2015\bin;$(ExecutablePath) + + true + $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2015\include\QtCore;$(QtDirectory)\msvc2015\include\QtWidgets;$(QtDirectory)\msvc2015\include\QtGui;$(QtDirectory)\msvc2015\include + $(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(QtDirectory)\msvc2015\lib;$(LibraryPath) + AllRules.ruleset + + + $(QtDirectory)\msvc2015\bin;$(ExecutablePath) + true $(IncludePath);$(DXSDK_DIR)Include @@ -457,6 +601,14 @@ + + false + $(IncludePath);$(DXSDK_DIR)Include + $(LibraryPath) + AllRules.ruleset + + + false $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include @@ -473,6 +625,14 @@ + + false + $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include + $(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(LibraryPath) + AllRules.ruleset + + + false $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2015\include\QtCore;$(QtDirectory)\msvc2015\include\QtWidgets;$(QtDirectory)\msvc2015\include\QtGui;$(QtDirectory)\msvc2015\include @@ -491,6 +651,15 @@ $(QtDirectory)\msvc2015\bin;$(ExecutablePath) + + false + $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2015\include\QtCore;$(QtDirectory)\msvc2015\include\QtWidgets;$(QtDirectory)\msvc2015\include\QtGui;$(QtDirectory)\msvc2015\include + $(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(QtDirectory)\msvc2015\lib;$(LibraryPath) + AllRules.ruleset + + + $(QtDirectory)\msvc2015\bin;$(ExecutablePath) + false $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2015\include\QtCore;$(QtDirectory)\msvc2015\include\QtWidgets;$(QtDirectory)\msvc2015\include\QtGui;$(QtDirectory)\msvc2015\include @@ -509,6 +678,15 @@ $(QtDirectory)\msvc2015\bin;$(ExecutablePath) + + false + $(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)Include;$(QtDirectory)\msvc2015\include\QtCore;$(QtDirectory)\msvc2015\include\QtWidgets;$(QtDirectory)\msvc2015\include\QtGui;$(QtDirectory)\msvc2015\include + $(DXSDK_DIR)Lib\x86;$(CG_LIB_PATH);$(QtDirectory)\msvc2015\lib;$(LibraryPath) + AllRules.ruleset + + + $(QtDirectory)\msvc2015\bin;$(ExecutablePath) + false $(IncludePath);$(DXSDK_DIR)Include @@ -588,6 +766,29 @@ LinkVerboseLib + + + + + Level3 + Disabled + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_DSOUND;HAVE_WASAPI;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_MENU_WIDGETS;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + CompileAsCpp + Fast + StreamingSIMDExtensions + OldStyle + 4566;4819 + /bigobj /utf-8 %(AdditionalOptions) + + + Console + true + msimg32.lib;gdi32.lib;ole32.lib;shell32.lib;comdlg32.lib;winmm.lib;dxguid.lib;Iphlpapi.lib;%(AdditionalDependencies) + LinkVerboseLib + + @@ -634,6 +835,29 @@ $(CG_LIB_PATH) + + + + + Level3 + Disabled + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_OPENGL_CORE;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_MENU_WIDGETS;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + CompileAsCpp + Fast + StreamingSIMDExtensions + OldStyle + 4566;4819 + /utf-8 %(AdditionalOptions) + + + Console + true + msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;%(AdditionalDependencies) + $(CG_LIB_PATH) + + @@ -680,6 +904,29 @@ $(CG_LIB_PATH) + + + + + Level3 + Disabled + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_OPENGL_CORE;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_MENU_WIDGETS;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + CompileAsCpp + Fast + StreamingSIMDExtensions + OldStyle + 4566;4819 + /utf-8 %(AdditionalOptions) + + + Console + true + msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies) + $(CG_LIB_PATH) + + @@ -726,6 +973,29 @@ $(CG_LIB_PATH) + + + + + Level3 + Disabled + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_OPENGL_CORE;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_MENU_WIDGETS;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug + CompileAsCpp + Fast + StreamingSIMDExtensions + OldStyle + 4566;4819 + /utf-8 %(AdditionalOptions) + + + Console + true + msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies) + $(CG_LIB_PATH) + + @@ -868,6 +1138,34 @@ LinkVerboseLib + + + Level3 + + + MaxSpeed + true + true + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_DSOUND;HAVE_WASAPI;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_MENU_WIDGETS;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + MultiThreaded + CompileAsCpp + Fast + StreamingSIMDExtensions + true + OldStyle + 4566;4819 + /utf-8 %(AdditionalOptions) + + + Console + true + true + true + msimg32.lib;gdi32.lib;ole32.lib;shell32.lib;comdlg32.lib;winmm.lib;dxguid.lib;Iphlpapi.lib;%(AdditionalDependencies) + LinkVerboseLib + + Level3 @@ -924,6 +1222,34 @@ $(CG_LIB_PATH) + + + Level3 + + + MaxSpeed + true + true + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_OPENGL_CORE;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_MENU_WIDGETS;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + MultiThreaded + CompileAsCpp + Fast + StreamingSIMDExtensions + true + OldStyle + 4566;4819 + /utf-8 %(AdditionalOptions) + + + Console + true + true + true + msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;%(AdditionalDependencies) + $(CG_LIB_PATH) + + Level3 @@ -980,6 +1306,34 @@ $(CG_LIB_PATH) + + + Level3 + + + MaxSpeed + true + true + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_OPENGL_CORE;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_MENU_WIDGETS;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + MultiThreaded + CompileAsCpp + Fast + StreamingSIMDExtensions + true + OldStyle + 4566;4819 + /utf-8 %(AdditionalOptions) + + + Console + true + true + true + msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies) + $(CG_LIB_PATH) + + Level3 @@ -1036,6 +1390,34 @@ $(CG_LIB_PATH) + + + Level3 + + + MaxSpeed + true + true + WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_OZONE;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_OPENGL_CORE;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_MENU_WIDGETS;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT + $(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include\compat\zlib;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories) + MultiThreaded + CompileAsCpp + Fast + StreamingSIMDExtensions + true + OldStyle + 4566;4819 + /utf-8 %(AdditionalOptions) + + + Console + true + true + true + msimg32.lib;winmm.lib;Dinput8.lib;dxguid.lib;Iphlpapi.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Network.lib;Qt5Concurrent.lib;%(AdditionalDependencies) + $(CG_LIB_PATH) + + Level3 @@ -1151,20 +1533,28 @@ CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC + CompileAsC CompileAsC CompileAsC CompileAsC @@ -1193,46 +1583,66 @@ false false false + false false false + false false false + false false false + false false false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp @@ -1251,15 +1661,19 @@ false true true + true true true true + true true true true + true true true true + true true @@ -1267,46 +1681,66 @@ false false false + false false false + false false false + false false false + false false false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp @@ -1325,15 +1759,19 @@ false true true + true true true true + true true true true + true true true true + true true @@ -1341,46 +1779,66 @@ false false false + false false false + false false false + false false false + false false false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp @@ -1399,15 +1857,19 @@ false true true + true true true true + true true true true + true true true true + true true @@ -1415,46 +1877,66 @@ false false false + false false false + false false false + false false false + false false false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp @@ -1473,15 +1955,19 @@ false true true + true true true true + true true true true + true true true true + true true @@ -1489,46 +1975,66 @@ false false false + false false false + false false false + false false false + false false false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp @@ -1547,15 +2053,19 @@ false true true + true true true true + true true true true + true true true true + true true @@ -1563,46 +2073,66 @@ false false false + false false false + false false false + false false false + false false false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp @@ -1621,15 +2151,19 @@ false true true + true true true true + true true true true + true true true true + true true @@ -1637,46 +2171,66 @@ false false false + false false false + false false false + false false false + false false false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp @@ -1695,15 +2249,19 @@ false true true + true true true true + true true true true + true true true true + true true @@ -1711,46 +2269,66 @@ false false false + false false false + false false false + false false false + false false false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp @@ -1769,15 +2347,19 @@ false true true + true true true true + true true true true + true true true true + true true @@ -1793,46 +2375,66 @@ %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false false false + false false false + false false false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" + moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp + QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp %(RootDir)%(Directory)moc_%(Filename).cpp + %(RootDir)%(Directory)moc_%(Filename).cpp false false + false false false + false moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" moc.exe "%(FullPath)" > "%(RootDir)%(Directory)moc_%(Filename).cpp" QT: Generate %(RootDir)%(Directory)moc_%(Filename).cpp @@ -1843,15 +2445,19 @@ false true true + true true true true + true true true true + true true true true + true true @@ -1958,4 +2564,4 @@ - \ No newline at end of file + diff --git a/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj.filters b/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj.filters index 99b62e847d..2f5501c8c2 100644 --- a/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj.filters +++ b/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj.filters @@ -21,12 +21,6 @@ griffin - - QT - - - QT - @@ -35,5 +29,14 @@ QT + + + + + + + + + \ No newline at end of file From c2f2219a62eb244cdb1f60f1371fdcd8ddcf1b11 Mon Sep 17 00:00:00 2001 From: driver1998 Date: Tue, 11 Jun 2019 04:10:44 +0800 Subject: [PATCH 2/2] UWP: recover AppxBundlePlatforms --- .../RetroArch-msvc2017-UWP-cores-nonfree.vcxproj | 2 +- .../RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj index 94d4becc97..32f67726ca 100644 --- a/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj +++ b/pkg/msvc-uwp/RetroArch-msvc2017-UWP-cores-nonfree/RetroArch-msvc2017-UWP-cores-nonfree.vcxproj @@ -122,7 +122,7 @@ False False Always - arm64 + x86|x64|arm|arm64 1 OnApplicationRun diff --git a/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj index e5180b5087..3e75eeac41 100644 --- a/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj +++ b/pkg/msvc-uwp/RetroArch-msvc2017-UWP/RetroArch-msvc2017-UWP.vcxproj @@ -132,7 +132,7 @@ RetroArch-UWP_TemporaryKey.pfx False False - arm64 + x86|x64|arm|arm64 1 OnApplicationRun Always @@ -337,4 +337,4 @@ - +