diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj index 6938b7389608..1a30dc46a289 100644 --- a/Common/Common.vcxproj +++ b/Common/Common.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -37,6 +53,19 @@ Unicode $(DefaultPlatformToolset) + + StaticLibrary + true + Unicode + $(DefaultPlatformToolset) + + + StaticLibrary + true + Unicode + $(DefaultPlatformToolset) + true + StaticLibrary false @@ -49,6 +78,19 @@ Unicode $(DefaultPlatformToolset) + + StaticLibrary + false + Unicode + $(DefaultPlatformToolset) + + + StaticLibrary + false + Unicode + $(DefaultPlatformToolset) + true + @@ -58,12 +100,24 @@ + + + + + + + + + + + + @@ -121,6 +175,62 @@ ../Windows/git-version-gen.cmd + + + Use + Level3 + stdafx.h;Common/DbgNew.h + MultiThreadedDebug + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../ext/native;../ext/snappy;.. + NotSet + Precise + false + true + false + false + ProgramDatabase + + + Windows + true + + + Winmm.lib + + + Updating git-version.cpp + ../Windows/git-version-gen.cmd + + + + + Use + Level3 + stdafx.h;Common/DbgNew.h + MultiThreadedDebug + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../ext/native;../ext/snappy;.. + NotSet + Precise + false + true + false + false + ProgramDatabase + + + Windows + true + + + Winmm.lib + + + Updating git-version.cpp + ../Windows/git-version-gen.cmd + + Level3 @@ -187,6 +297,74 @@ ../Windows/git-version-gen.cmd + + + Level3 + Use + MaxSpeed + true + true + USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + stdafx.h + ../ext/native;../ext/snappy;.. + false + NotSet + Precise + Speed + false + true + false + MultiThreaded + true + + + Windows + true + true + true + + + Winmm.lib + + + Updating git-version.cpp + ../Windows/git-version-gen.cmd + + + + + Level3 + Use + MaxSpeed + true + true + USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + stdafx.h + ../ext/native;../ext/snappy;.. + false + NotSet + Precise + Speed + false + true + false + MultiThreaded + true + + + Windows + true + true + true + + + Winmm.lib + + + Updating git-version.cpp + ../Windows/git-version-gen.cmd + + @@ -217,13 +395,21 @@ true true true + true + true true + true + true true true true + true + true true + true + true @@ -258,14 +444,22 @@ true true true + false + false true + false + false true true true + false + false true + false + false @@ -279,19 +473,31 @@ true true true + true + true true + true + true true true true + true + true true + true + true true true true + true + true true + true + true @@ -307,8 +513,12 @@ Create Create + Create + Create Create Create + Create + Create @@ -330,4 +540,4 @@ - \ No newline at end of file + diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index 1e505e246d7e..fd905fd4a3c7 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -21,7 +37,8 @@ {533F1D30-D04D-47CC-AD71-20F658907E36} Core - + + @@ -36,6 +53,19 @@ Unicode $(DefaultPlatformToolset) + + StaticLibrary + true + Unicode + $(DefaultPlatformToolset) + + + StaticLibrary + true + Unicode + $(DefaultPlatformToolset) + true + StaticLibrary false @@ -49,6 +79,19 @@ Unicode $(DefaultPlatformToolset) + + StaticLibrary + false + Unicode + $(DefaultPlatformToolset) + + + StaticLibrary + false + Unicode + $(DefaultPlatformToolset) + true + @@ -58,12 +101,24 @@ + + + + + + + + + + + + @@ -111,6 +166,52 @@ Updating git-version.cpp + + + Level3 + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + NotSet + Precise + false + true + false + false + MultiThreadedDebug + Common/DbgNew.h + ProgramDatabase + + + true + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + + + + Level3 + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + NotSet + Precise + false + true + false + false + MultiThreadedDebug + Common/DbgNew.h + ProgramDatabase + + + true + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + Level3 @@ -170,6 +271,64 @@ Updating git-version.cpp + + + Level3 + MaxSpeed + true + true + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\aarch64\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + NotSet + Precise + false + false + Speed + false + true + USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_64=1;_LIB;NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) + false + MultiThreaded + true + + + true + true + true + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + + + + Level3 + MaxSpeed + true + true + ..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\arm\include;../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + NotSet + Precise + false + false + Speed + false + true + USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;USE_FFMPEG;WIN32;_ARCH_32=1;_LIB;NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) + false + MultiThreaded + true + + + true + true + true + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + @@ -252,7 +411,11 @@ MaxSpeed + MaxSpeed + MaxSpeed Default + Default + Default @@ -336,128 +499,212 @@ true true true + false + true true + false + true true true true + false + true true + false + true true true true + false + true true + false + true true true true + false + true true + false + true true true true + false + true true + false + true true true true + false + true true + false + true true true true + false + true true + false + true true true true + false + true true + false + true true true true + false + true true + false + true true true true + false + true true + false + true true true true + true + false true + true + false true true true + true + false true + true + false true true true + true + false true + true + false true true true + true + false true + true + false true true true + true + false true + true + false true true true + true + false true + true + false true true true + true + false true + true + false true true true + true + false true + true + false true true true + true + false true + true + false true true true + true + false true + true + false true true true + true + false true + true + false @@ -477,19 +724,78 @@ true true true + true + true true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true - - - - - - - - - - - @@ -501,7 +807,11 @@ true true true + false + false true + false + false @@ -513,15 +823,27 @@ true Speed MaxSpeed + MaxSpeed + MaxSpeed true + true + true Speed + Speed + Speed AnySuitable ProgramDatabase Default Default + Default + Default AnySuitable + AnySuitable + AnySuitable AnySuitable AnySuitable + AnySuitable + AnySuitable @@ -697,37 +1019,61 @@ true true true + false + true true + false + true true true true + false + true true + false + true true true true + false + true true + false + true true true true + true + false true + true + false true true true + true + false true + true + false true true true + true + false true + true + false @@ -748,12 +1094,36 @@ true true true + true + true true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true - - - - @@ -767,7 +1137,11 @@ true true true + false + false true + false + false @@ -803,4 +1177,4 @@ - \ No newline at end of file + diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj index 589d78ae7d67..93852595ec01 100644 --- a/GPU/GPU.vcxproj +++ b/GPU/GPU.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -36,6 +52,19 @@ Unicode $(DefaultPlatformToolset) + + StaticLibrary + true + Unicode + $(DefaultPlatformToolset) + + + StaticLibrary + true + Unicode + $(DefaultPlatformToolset) + true + StaticLibrary false @@ -49,6 +78,19 @@ Unicode $(DefaultPlatformToolset) + + StaticLibrary + false + Unicode + $(DefaultPlatformToolset) + + + StaticLibrary + false + Unicode + $(DefaultPlatformToolset) + true + @@ -58,12 +100,24 @@ + + + + + + + + + + + + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); @@ -73,10 +127,26 @@ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); + + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM64);$(WindowsSdk_LibraryPath_ARM64); + + + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM);$(WindowsSdk_LibraryPath_ARM); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); + + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM64);$(WindowsSdk_LibraryPath_ARM64); + + + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM);$(WindowsSdk_LibraryPath_ARM); + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); @@ -126,6 +196,52 @@ Updating git-version.cpp + + + Level3 + ..\dx9sdk\Include\DX11;../common;..;../ext;../ext/native;../ext/glew;../ext/snappy; + NotSet + Precise + false + true + false + false + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + MultiThreadedDebug + Common/DbgNew.h + ProgramDatabase + + + true + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + + + + Level3 + ..\dx9sdk\Include\DX11;../common;..;../ext;../ext/native;../ext/glew;../ext/snappy; + NotSet + Precise + false + true + false + false + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + MultiThreadedDebug + Common/DbgNew.h + ProgramDatabase + + + true + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + Level3 @@ -180,6 +296,62 @@ Updating git-version.cpp + + + Level3 + MaxSpeed + true + true + ..\dx9sdk\Include\DX11;../common;..;../ext;../ext/native;../ext/glew;../ext/snappy; + false + NotSet + Precise + Speed + false + true + false + USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_64=1;_LIB;NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) + MultiThreaded + true + + + true + true + true + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + + + + Level3 + MaxSpeed + true + true + ..\dx9sdk\Include\DX11;../common;..;../ext;../ext/native;../ext/glew;../ext/snappy; + false + NotSet + Precise + Speed + false + true + false + USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_ARCH_32=1;_LIB;NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) + MultiThreaded + true + + + true + true + true + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + @@ -200,7 +372,11 @@ true true true + false + false true + false + false @@ -232,17 +408,72 @@ - - - - - - - - - - - + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + @@ -289,7 +520,11 @@ true true true + false + false true + false + false @@ -299,16 +534,29 @@ true true true + true + false true + true + false true true true + false + true true + false + true - + + true + true + true + true + @@ -337,19 +585,84 @@ - - - - - - - - - - - - - + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + @@ -389,4 +702,4 @@ - \ No newline at end of file + diff --git a/UI/UI.vcxproj b/UI/UI.vcxproj index ab7e4583a5d7..594287ba9948 100644 --- a/UI/UI.vcxproj +++ b/UI/UI.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -108,6 +124,19 @@ $(DefaultPlatformToolset) Unicode + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + true + StaticLibrary false @@ -121,6 +150,19 @@ $(DefaultPlatformToolset) Unicode + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + true + @@ -130,12 +172,24 @@ + + + + + + + + + + + + @@ -186,6 +240,56 @@ ../Windows/git-version-gen.cmd + + + + + Level3 + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + true + false + false + MultiThreadedDebug + false + Common/DbgNew.h + $(EXTERNAL_COMPILE_OPTIONS) + ProgramDatabase + + + Windows + true + + + Updating git-version.cpp + ../Windows/git-version-gen.cmd + + + + + + + Level3 + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;_DEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + true + false + false + MultiThreadedDebug + false + Common/DbgNew.h + $(EXTERNAL_COMPILE_OPTIONS) + ProgramDatabase + + + Windows + true + + + Updating git-version.cpp + ../Windows/git-version-gen.cmd + + Level3 @@ -244,7 +348,67 @@ ../Windows/git-version-gen.cmd + + + Level3 + + + MaxSpeed + true + true + USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_64=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + false + true + false + MultiThreaded + true + $(EXTERNAL_COMPILE_OPTIONS) + false + Size + + + Windows + true + true + true + + + Updating git-version.cpp + ../Windows/git-version-gen.cmd + + + + + Level3 + + + MaxSpeed + true + true + USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;_ARCH_32=1;WIN32;NDEBUG;_LIB;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../common;..;../ext/native;../ext/glew;../ext/snappy;../ext/zlib;../ext/native/ext + false + true + false + MultiThreaded + true + $(EXTERNAL_COMPILE_OPTIONS) + false + Size + + + Windows + true + true + true + + + Updating git-version.cpp + ../Windows/git-version-gen.cmd + + - \ No newline at end of file + diff --git a/Windows/PPSSPP.sln b/Windows/PPSSPP.sln index 918e2910d6f9..e7fa1760c140 100644 --- a/Windows/PPSSPP.sln +++ b/Windows/PPSSPP.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28803.202 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPSSPPWindows", "PPSSPP.vcxproj", "{567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}" ProjectSection(ProjectDependencies) = postProject @@ -81,120 +81,236 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "discord-rpc", "..\ext\disco 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 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Debug|ARM.ActiveCfg = Debug|ARM + {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Debug|ARM.Build.0 = Debug|ARM + {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Debug|ARM64.Build.0 = Debug|ARM64 {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Debug|Win32.ActiveCfg = Debug|Win32 {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Debug|Win32.Build.0 = Debug|Win32 {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Debug|x64.ActiveCfg = Debug|x64 {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Debug|x64.Build.0 = Debug|x64 + {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Release|ARM.ActiveCfg = Release|ARM + {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Release|ARM.Build.0 = Release|ARM + {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Release|ARM64.ActiveCfg = Release|ARM64 + {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Release|ARM64.Build.0 = Release|ARM64 {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Release|Win32.ActiveCfg = Release|Win32 {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Release|Win32.Build.0 = Release|Win32 {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Release|x64.ActiveCfg = Release|x64 {567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}.Release|x64.Build.0 = Release|x64 + {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Debug|ARM.ActiveCfg = Debug|ARM + {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Debug|ARM.Build.0 = Debug|ARM + {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Debug|ARM64.Build.0 = Debug|ARM64 {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Debug|Win32.ActiveCfg = Debug|Win32 {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Debug|Win32.Build.0 = Debug|Win32 {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Debug|x64.ActiveCfg = Debug|x64 {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Debug|x64.Build.0 = Debug|x64 + {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Release|ARM.ActiveCfg = Release|ARM + {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Release|ARM.Build.0 = Release|ARM + {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Release|ARM64.ActiveCfg = Release|ARM64 + {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Release|ARM64.Build.0 = Release|ARM64 {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Release|Win32.ActiveCfg = Release|Win32 {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Release|Win32.Build.0 = Release|Win32 {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Release|x64.ActiveCfg = Release|x64 {3FCDBAE2-5103-4350-9A8E-848CE9C73195}.Release|x64.Build.0 = Release|x64 + {F761046E-6C38-4428-A5F1-38391A37BB34}.Debug|ARM.ActiveCfg = Debug|ARM + {F761046E-6C38-4428-A5F1-38391A37BB34}.Debug|ARM.Build.0 = Debug|ARM + {F761046E-6C38-4428-A5F1-38391A37BB34}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F761046E-6C38-4428-A5F1-38391A37BB34}.Debug|ARM64.Build.0 = Debug|ARM64 {F761046E-6C38-4428-A5F1-38391A37BB34}.Debug|Win32.ActiveCfg = Debug|Win32 {F761046E-6C38-4428-A5F1-38391A37BB34}.Debug|Win32.Build.0 = Debug|Win32 {F761046E-6C38-4428-A5F1-38391A37BB34}.Debug|x64.ActiveCfg = Debug|x64 {F761046E-6C38-4428-A5F1-38391A37BB34}.Debug|x64.Build.0 = Debug|x64 + {F761046E-6C38-4428-A5F1-38391A37BB34}.Release|ARM.ActiveCfg = Release|ARM + {F761046E-6C38-4428-A5F1-38391A37BB34}.Release|ARM.Build.0 = Release|ARM + {F761046E-6C38-4428-A5F1-38391A37BB34}.Release|ARM64.ActiveCfg = Release|ARM64 + {F761046E-6C38-4428-A5F1-38391A37BB34}.Release|ARM64.Build.0 = Release|ARM64 {F761046E-6C38-4428-A5F1-38391A37BB34}.Release|Win32.ActiveCfg = Release|Win32 {F761046E-6C38-4428-A5F1-38391A37BB34}.Release|Win32.Build.0 = Release|Win32 {F761046E-6C38-4428-A5F1-38391A37BB34}.Release|x64.ActiveCfg = Release|x64 {F761046E-6C38-4428-A5F1-38391A37BB34}.Release|x64.Build.0 = Release|x64 + {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Debug|ARM.ActiveCfg = Debug|ARM + {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Debug|ARM.Build.0 = Debug|ARM + {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Debug|ARM64.Build.0 = Debug|ARM64 {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Debug|Win32.ActiveCfg = Debug|Win32 {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Debug|Win32.Build.0 = Debug|Win32 {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Debug|x64.ActiveCfg = Debug|x64 {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Debug|x64.Build.0 = Debug|x64 + {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Release|ARM.ActiveCfg = Release|ARM + {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Release|ARM.Build.0 = Release|ARM + {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Release|ARM64.ActiveCfg = Release|ARM64 + {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Release|ARM64.Build.0 = Release|ARM64 {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Release|Win32.ActiveCfg = Release|Win32 {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Release|Win32.Build.0 = Release|Win32 {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Release|x64.ActiveCfg = Release|x64 {457F45D2-556F-47BC-A31D-AFF0D15BEAED}.Release|x64.Build.0 = Release|x64 + {533F1D30-D04D-47CC-AD71-20F658907E36}.Debug|ARM.ActiveCfg = Debug|ARM + {533F1D30-D04D-47CC-AD71-20F658907E36}.Debug|ARM.Build.0 = Debug|ARM + {533F1D30-D04D-47CC-AD71-20F658907E36}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {533F1D30-D04D-47CC-AD71-20F658907E36}.Debug|ARM64.Build.0 = Debug|ARM64 {533F1D30-D04D-47CC-AD71-20F658907E36}.Debug|Win32.ActiveCfg = Debug|Win32 {533F1D30-D04D-47CC-AD71-20F658907E36}.Debug|Win32.Build.0 = Debug|Win32 {533F1D30-D04D-47CC-AD71-20F658907E36}.Debug|x64.ActiveCfg = Debug|x64 {533F1D30-D04D-47CC-AD71-20F658907E36}.Debug|x64.Build.0 = Debug|x64 + {533F1D30-D04D-47CC-AD71-20F658907E36}.Release|ARM.ActiveCfg = Release|ARM + {533F1D30-D04D-47CC-AD71-20F658907E36}.Release|ARM.Build.0 = Release|ARM + {533F1D30-D04D-47CC-AD71-20F658907E36}.Release|ARM64.ActiveCfg = Release|ARM64 + {533F1D30-D04D-47CC-AD71-20F658907E36}.Release|ARM64.Build.0 = Release|ARM64 {533F1D30-D04D-47CC-AD71-20F658907E36}.Release|Win32.ActiveCfg = Release|Win32 {533F1D30-D04D-47CC-AD71-20F658907E36}.Release|Win32.Build.0 = Release|Win32 {533F1D30-D04D-47CC-AD71-20F658907E36}.Release|x64.ActiveCfg = Release|x64 {533F1D30-D04D-47CC-AD71-20F658907E36}.Release|x64.Build.0 = Release|x64 + {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Debug|ARM.ActiveCfg = Debug|ARM + {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Debug|ARM.Build.0 = Debug|ARM + {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Debug|ARM64.Build.0 = Debug|ARM64 {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Debug|Win32.ActiveCfg = Debug|Win32 {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Debug|Win32.Build.0 = Debug|Win32 {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Debug|x64.ActiveCfg = Debug|x64 {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Debug|x64.Build.0 = Debug|x64 + {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Release|ARM.ActiveCfg = Release|ARM + {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Release|ARM.Build.0 = Release|ARM + {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Release|ARM64.ActiveCfg = Release|ARM64 + {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Release|ARM64.Build.0 = Release|ARM64 {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Release|Win32.ActiveCfg = Release|Win32 {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Release|Win32.Build.0 = Release|Win32 {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Release|x64.ActiveCfg = Release|x64 {C4DF647E-80EA-4111-A0A8-218B1B711E18}.Release|x64.Build.0 = Release|x64 + {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Debug|ARM.ActiveCfg = Debug|ARM + {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Debug|ARM.Build.0 = Debug|ARM + {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Debug|ARM64.Build.0 = Debug|ARM64 {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Debug|Win32.ActiveCfg = Debug|Win32 {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Debug|Win32.Build.0 = Debug|Win32 {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Debug|x64.ActiveCfg = Debug|x64 {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Debug|x64.Build.0 = Debug|x64 + {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Release|ARM.ActiveCfg = Release|ARM + {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Release|ARM.Build.0 = Release|ARM + {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Release|ARM64.ActiveCfg = Release|ARM64 + {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Release|ARM64.Build.0 = Release|ARM64 {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Release|Win32.ActiveCfg = Release|Win32 {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Release|Win32.Build.0 = Release|Win32 {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Release|x64.ActiveCfg = Release|x64 {EE9BD869-CAA3-447D-8328-294D90DE2C1F}.Release|x64.Build.0 = Release|x64 + {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Debug|ARM.ActiveCfg = Debug|ARM + {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Debug|ARM.Build.0 = Debug|ARM + {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Debug|ARM64.Build.0 = Debug|ARM64 {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Debug|Win32.ActiveCfg = Debug|Win32 {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Debug|Win32.Build.0 = Debug|Win32 {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Debug|x64.ActiveCfg = Debug|x64 {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Debug|x64.Build.0 = Debug|x64 + {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Release|ARM.ActiveCfg = Release|ARM + {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Release|ARM.Build.0 = Release|ARM + {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Release|ARM64.ActiveCfg = Release|ARM64 + {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Release|ARM64.Build.0 = Release|ARM64 {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Release|Win32.ActiveCfg = Release|Win32 {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Release|Win32.Build.0 = Release|Win32 {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Release|x64.ActiveCfg = Release|x64 {3BAAE095-E0AB-4B0E-B5DF-CE39C8AE31DE}.Release|x64.Build.0 = Release|x64 + {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Debug|ARM.ActiveCfg = Debug|ARM + {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Debug|ARM.Build.0 = Debug|ARM + {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Debug|ARM64.Build.0 = Debug|ARM64 {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Debug|Win32.ActiveCfg = Debug|Win32 {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Debug|Win32.Build.0 = Debug|Win32 {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Debug|x64.ActiveCfg = Debug|x64 {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Debug|x64.Build.0 = Debug|x64 + {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Release|ARM.ActiveCfg = Release|ARM + {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Release|ARM.Build.0 = Release|ARM + {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Release|ARM64.ActiveCfg = Release|ARM64 + {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Release|ARM64.Build.0 = Release|ARM64 {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Release|Win32.ActiveCfg = Release|Win32 {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Release|Win32.Build.0 = Release|Win32 {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Release|x64.ActiveCfg = Release|x64 {37CBC214-7CE7-4655-B619-F7CEE16E3313}.Release|x64.Build.0 = Release|x64 + {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Debug|ARM.ActiveCfg = Debug|ARM + {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Debug|ARM.Build.0 = Debug|ARM + {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Debug|ARM64.Build.0 = Debug|ARM64 {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Debug|Win32.ActiveCfg = Debug|Win32 {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Debug|Win32.Build.0 = Debug|Win32 {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Debug|x64.ActiveCfg = Debug|x64 {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Debug|x64.Build.0 = Debug|x64 + {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Release|ARM.ActiveCfg = Release|ARM + {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Release|ARM.Build.0 = Release|ARM + {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Release|ARM64.ActiveCfg = Release|ARM64 + {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Release|ARM64.Build.0 = Release|ARM64 {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Release|Win32.ActiveCfg = Release|Win32 {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Release|Win32.Build.0 = Release|Win32 {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Release|x64.ActiveCfg = Release|x64 {004B8D11-2BE3-4BD9-AB40-2BE04CF2096F}.Release|x64.Build.0 = Release|x64 + {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Debug|ARM.ActiveCfg = Tests|ARM + {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Debug|ARM.Build.0 = Debug|ARM + {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Debug|ARM64.Build.0 = Debug|ARM64 {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Debug|Win32.ActiveCfg = Debug|Win32 {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Debug|Win32.Build.0 = Debug|Win32 {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Debug|x64.ActiveCfg = Debug|x64 {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Debug|x64.Build.0 = Debug|x64 + {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Release|ARM.ActiveCfg = Release|ARM + {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Release|ARM.Build.0 = Release|ARM + {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Release|ARM64.ActiveCfg = Release|ARM64 + {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Release|ARM64.Build.0 = Release|ARM64 {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Release|Win32.ActiveCfg = Release|Win32 {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Release|Win32.Build.0 = Release|Win32 {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Release|x64.ActiveCfg = Release|x64 {129E5E2B-39C1-4D84-96FE-DFD22DBB4A25}.Release|x64.Build.0 = Release|x64 + {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Debug|ARM.ActiveCfg = Debug|ARM + {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Debug|ARM.Build.0 = Debug|ARM + {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Debug|ARM64.Build.0 = Debug|ARM64 {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Debug|Win32.ActiveCfg = Debug|Win32 {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Debug|Win32.Build.0 = Debug|Win32 {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Debug|x64.ActiveCfg = Debug|x64 {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Debug|x64.Build.0 = Debug|x64 + {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Release|ARM.ActiveCfg = Release|ARM + {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Release|ARM.Build.0 = Release|ARM + {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Release|ARM64.ActiveCfg = Release|ARM64 + {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Release|ARM64.Build.0 = Release|ARM64 {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Release|Win32.ActiveCfg = Release|Win32 {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Release|Win32.Build.0 = Release|Win32 {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Release|x64.ActiveCfg = Release|x64 {EDFA2E87-8AC1-4853-95D4-D7594FF81947}.Release|x64.Build.0 = Release|x64 + {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Debug|ARM.ActiveCfg = Debug|ARM + {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Debug|ARM.Build.0 = Debug|ARM + {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Debug|ARM64.Build.0 = Debug|ARM64 {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Debug|Win32.ActiveCfg = Debug|Win32 {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Debug|Win32.Build.0 = Debug|Win32 {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Debug|x64.ActiveCfg = Debug|x64 {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Debug|x64.Build.0 = Debug|x64 + {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Release|ARM.ActiveCfg = Release|ARM + {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Release|ARM.Build.0 = Release|ARM + {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Release|ARM64.ActiveCfg = Release|ARM64 + {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Release|ARM64.Build.0 = Release|ARM64 {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Release|Win32.ActiveCfg = Release|Win32 {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Release|Win32.Build.0 = Release|Win32 {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Release|x64.ActiveCfg = Release|x64 {4328A62C-F1E9-47ED-B816-A1A81DAF4363}.Release|x64.Build.0 = Release|x64 + {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Debug|ARM.ActiveCfg = Debug|ARM + {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Debug|ARM.Build.0 = Debug|ARM + {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Debug|ARM64.Build.0 = Debug|ARM64 {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Debug|Win32.ActiveCfg = Debug|Win32 {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Debug|Win32.Build.0 = Debug|Win32 {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Debug|x64.ActiveCfg = Debug|x64 {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Debug|x64.Build.0 = Debug|x64 + {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Release|ARM.ActiveCfg = Release|ARM + {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Release|ARM.Build.0 = Release|ARM + {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Release|ARM64.ActiveCfg = Release|ARM64 + {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Release|ARM64.Build.0 = Release|ARM64 {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Release|Win32.ActiveCfg = Release|Win32 {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Release|Win32.Build.0 = Release|Win32 {BEB0A821-3C7F-410F-A525-63AFBC69BF8F}.Release|x64.ActiveCfg = Release|x64 diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index 0291adb8b720..ffddcb744d3f 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -42,11 +58,34 @@ Unicode $(DefaultPlatformToolset) + + Application + Unicode + $(DefaultPlatformToolset) + + + Application + Unicode + $(DefaultPlatformToolset) + true + Application Unicode $(DefaultPlatformToolset) + + Application + Unicode + $(DefaultPlatformToolset) + Spectre + + + Application + Unicode + $(DefaultPlatformToolset) + true + @@ -62,10 +101,26 @@ + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 @@ -73,25 +128,45 @@ true ..\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ true + true + true ..\ $(Configuration)\ false ..\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ false + false + false AllRules.ruleset AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset AllRules.ruleset + AllRules.ruleset + AllRules.ruleset + + + + ..\ @@ -106,12 +181,40 @@ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); + + PPSSPPDebugARM64 + false + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM64);$(WindowsSdk_LibraryPath_ARM64); + ..\ + + + PPSSPPDebugARM + false + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM);$(WindowsSdk_LibraryPath_ARM); + ..\ + PPSSPPWindows64 false ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); + + PPSSPPWindowsARM64 + false + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM64);$(WindowsSdk_LibraryPath_ARM64); + ..\ + + + PPSSPPWindowsARM + false + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM);$(WindowsSdk_LibraryPath_ARM); + ..\ + false ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); @@ -187,6 +290,74 @@ Updating git-version.cpp + + + + false + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + Sync + Use + Level3 + ProgramDatabase + ../dx9sdk/Include/DX11;../ext;../common;..;../ext/native;../ext/glew;../ext/zlib + stdafx.h;Common/DbgNew.h + MultiThreadedDebug + false + NotSet + Precise + true + false + Disabled + $(EXTERNAL_COMPILE_OPTIONS) + + + oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;..\ffmpeg\Windows\aarch64\lib\avcodec.lib;..\ffmpeg\Windows\aarch64\lib\avformat.lib;..\ffmpeg\Windows\aarch64\lib\avutil.lib;..\ffmpeg\Windows\aarch64\lib\swresample.lib;..\ffmpeg\Windows\aarch64\lib\swscale.lib;%(AdditionalDependencies) + true + $(OutDir)$(ProjectName).pdb + true + LinkVerboseLib + /ignore:4049 /ignore:4217 %(AdditionalOptions) + Windows + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + + + + + false + _CRTDBG_MAP_ALLOC;USING_WIN_UI;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + Sync + Use + Level3 + ProgramDatabase + ../dx9sdk/Include/DX11;../ext;../common;..;../ext/native;../ext/glew;../ext/zlib + stdafx.h;Common/DbgNew.h + MultiThreadedDebug + false + NotSet + Precise + true + false + Disabled + $(EXTERNAL_COMPILE_OPTIONS) + + + oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;..\ffmpeg\Windows\arm\lib\avcodec.lib;..\ffmpeg\Windows\arm\lib\avformat.lib;..\ffmpeg\Windows\arm\lib\avutil.lib;..\ffmpeg\Windows\arm\lib\swresample.lib;..\ffmpeg\Windows\arm\lib\swscale.lib;%(AdditionalDependencies) + true + $(OutDir)$(ProjectName).pdb + true + LinkVerboseLib + /ignore:4049 /ignore:4217 %(AdditionalOptions) + Windows + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + AnySuitable @@ -276,54 +447,168 @@ $(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + + + + AnySuitable + true + Speed + false + USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + Use + Level3 + ProgramDatabase + ../dx9sdk/Include/DX11;../ext;../common;..;../ext/native;../ext/glew;../ext/zlib + stdafx.h + true + false + $(EXTERNAL_COMPILE_OPTIONS) + + + oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;..\ffmpeg\Windows\aarch64\lib\avcodec.lib;..\ffmpeg\Windows\aarch64\lib\avformat.lib;..\ffmpeg\Windows\aarch64\lib\avutil.lib;..\ffmpeg\Windows\aarch64\lib\swresample.lib;..\ffmpeg\Windows\aarch64\lib\swscale.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + true + true + /ignore:4049 /ignore:4217 %(AdditionalOptions) + true + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + + $(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + + + + + + AnySuitable + true + Speed + false + USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + Use + Level3 + ProgramDatabase + ../dx9sdk/Include/DX11;../ext;../common;..;../ext/native;../ext/glew;../ext/zlib + stdafx.h + true + false + $(EXTERNAL_COMPILE_OPTIONS) + + + oleaut32.lib;comdlg32.lib;shell32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;Winmm.lib;Ws2_32.lib;dsound.lib;comctl32.lib;d3d9.lib;dxguid.lib;..\ffmpeg\Windows\arm\lib\avcodec.lib;..\ffmpeg\Windows\arm\lib\avformat.lib;..\ffmpeg\Windows\arm\lib\avutil.lib;..\ffmpeg\Windows\arm\lib\swresample.lib;..\ffmpeg\Windows\arm\lib\swscale.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + true + Windows + true + true + /ignore:4049 /ignore:4217 %(AdditionalOptions) + true + + + ../Windows/git-version-gen.cmd + Updating git-version.cpp + + + $(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + + true true true + true + true true + true + true true true true + true + true true + true + true true true true + true + true true + true + true true true true + true + true true + true + true true true true + true + true true + true + true true true true + true + true true + true + true true true true + true + true true + true + true true true true + true + true true + true + true @@ -334,29 +619,57 @@ NotUsing + NotUsing + NotUsing + + + + NotUsing + NotUsing + NotUsing + + + + + true + true + true + true true true true + true + true true + true + true true true true + true + true true + true + true true true true + true + true true + true + true @@ -370,15 +683,53 @@ - - - + + true + true + true + true + + + true + true + true + true + + + true + true + - - - - - + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + @@ -389,8 +740,12 @@ $(IntDir)%(Filename)2.obj $(IntDir)%(Filename)2.obj + $(IntDir)%(Filename)2.obj + $(IntDir)%(Filename)2.obj $(IntDir)%(Filename)2.obj $(IntDir)%(Filename)2.obj + $(IntDir)%(Filename)2.obj + $(IntDir)%(Filename)2.obj @@ -398,7 +753,12 @@ - + + true + true + true + true + @@ -406,8 +766,12 @@ Create Create + Create + Create Create Create + Create + Create @@ -416,25 +780,41 @@ true true true + true + true true + true + true true true true + true + true true + true + true true true true + true + true true + true + true true true true + true + true true + true + true @@ -443,13 +823,21 @@ true true true + true + true true + true + true true true true + true + true true + true + true @@ -458,13 +846,21 @@ true true true + true + true true + true + true true true true + true + true true + true + true @@ -478,14 +874,47 @@ - - - + + true + true + true + true + + + true + true + true + true + + + true + true + - - - - + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + @@ -543,6 +972,8 @@ $(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) $(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + $(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) + $(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) @@ -586,4 +1017,4 @@ - \ No newline at end of file + diff --git a/ext/SPIRV-Cross.vcxproj b/ext/SPIRV-Cross.vcxproj index a802a23474d5..3c4cb76671c9 100644 --- a/ext/SPIRV-Cross.vcxproj +++ b/ext/SPIRV-Cross.vcxproj @@ -1,10 +1,26 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -43,12 +59,38 @@ $(DefaultPlatformToolset) Unicode + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + true + StaticLibrary false $(DefaultPlatformToolset) Unicode + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + true + @@ -63,9 +105,21 @@ + + + + + + + + + + + + $(SolutionDir)$(Platform)\SPIRV-Cross$(Configuration)\ @@ -79,10 +133,26 @@ $(Platform)\SPIRV-Cross$(Configuration)\ $(SolutionDir)$(Platform)\SPIRV-Cross$(Configuration)\ + + $(Platform)\SPIRV-Cross$(Configuration)\ + $(SolutionDir)$(Platform)\SPIRV-Cross$(Configuration)\ + + + $(Platform)\SPIRV-Cross$(Configuration)\ + $(SolutionDir)$(Platform)\SPIRV-Cross$(Configuration)\ + $(Platform)\SPIRV-Cross$(Configuration)\ $(SolutionDir)$(Platform)\SPIRV-Cross$(Configuration)\ + + $(Platform)\SPIRV-Cross$(Configuration)\ + $(SolutionDir)$(Platform)\SPIRV-Cross$(Configuration)\ + + + $(Platform)\SPIRV-Cross$(Configuration)\ + $(SolutionDir)$(Platform)\SPIRV-Cross$(Configuration)\ + @@ -115,6 +185,38 @@ Windows + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + false + MultiThreadedDebug + true + ProgramDatabase + + + Windows + + + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + false + MultiThreadedDebug + true + ProgramDatabase + + + Windows + + Level3 @@ -154,6 +256,46 @@ true + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + false + true + false + + + Windows + true + true + + + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + false + true + false + + + Windows + true + true + + @@ -177,4 +319,4 @@ - \ No newline at end of file + diff --git a/ext/discord-rpc-build/discord-rpc.vcxproj b/ext/discord-rpc-build/discord-rpc.vcxproj index bbf0c03363a5..78d19d888785 100644 --- a/ext/discord-rpc-build/discord-rpc.vcxproj +++ b/ext/discord-rpc-build/discord-rpc.vcxproj @@ -1,10 +1,26 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -62,12 +78,38 @@ $(DefaultPlatformToolset) Unicode + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + true + StaticLibrary false $(DefaultPlatformToolset) Unicode + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + true + @@ -82,19 +124,43 @@ + + + + + + + + + + + + false + + false + + + false + true true + + true + + + true + false @@ -119,6 +185,48 @@ true + + + Level3 + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + ..\discord-rpc\include;..\discord-rpc\src;..\rapidjson\include + MultiThreaded + true + false + false + + + Windows + true + true + true + + + + + Level3 + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + ..\discord-rpc\include;..\discord-rpc\src;..\rapidjson\include + MultiThreaded + true + false + false + + + Windows + true + true + true + + Level3 @@ -151,6 +259,38 @@ true + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + ..\discord-rpc\include;..\discord-rpc\src;..\rapidjson\include + MultiThreadedDebug + true + ProgramDatabase + + + Windows + true + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + ..\discord-rpc\include;..\discord-rpc\src;..\rapidjson\include + MultiThreadedDebug + true + ProgramDatabase + + + Windows + true + + Level3 @@ -174,4 +314,4 @@ - \ No newline at end of file + diff --git a/ext/glslang.vcxproj b/ext/glslang.vcxproj index f482878cad1d..c3325050c61f 100644 --- a/ext/glslang.vcxproj +++ b/ext/glslang.vcxproj @@ -1,10 +1,26 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -43,12 +59,38 @@ $(DefaultPlatformToolset) Unicode + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + true + StaticLibrary false $(DefaultPlatformToolset) Unicode + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + true + @@ -63,9 +105,21 @@ + + + + + + + + + + + + @@ -106,6 +160,44 @@ true + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + glslang/glslang/OSDependent/Windows;glslang/glslang/MachineIndependent + MultiThreadedDebug + false + Default + true + ProgramDatabase + + + Windows + true + + + + + + + Level3 + Disabled + _DEBUG;_LIB;%(PreprocessorDefinitions) + glslang/glslang/OSDependent/Windows;glslang/glslang/MachineIndependent + MultiThreadedDebug + false + Default + true + ProgramDatabase + + + Windows + true + + Level3 @@ -149,6 +241,50 @@ true + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + glslang/glslang/OSDependent/Windows;glslang/glslang/MachineIndependent + MultiThreaded + false + true + false + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + glslang/glslang/OSDependent/Windows;glslang/glslang/MachineIndependent + MultiThreaded + false + true + false + + + Windows + true + true + true + + @@ -256,4 +392,4 @@ - \ No newline at end of file + diff --git a/ext/libarmips.vcxproj b/ext/libarmips.vcxproj index 9bcfc4f4def6..a30fc1b7ec4d 100644 --- a/ext/libarmips.vcxproj +++ b/ext/libarmips.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -17,6 +33,14 @@ Release x64 + + Tests + ARM + + + Tests + ARM64 + Tests Win32 @@ -45,6 +69,19 @@ $(DefaultPlatformToolset) Unicode + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + true + StaticLibrary true @@ -57,6 +94,18 @@ $(DefaultPlatformToolset) Unicode + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + StaticLibrary false @@ -70,6 +119,19 @@ $(DefaultPlatformToolset) Unicode + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + true + @@ -79,18 +141,36 @@ + + + + + + + + + + + + + + + + + + .;$(IncludePath) @@ -104,6 +184,18 @@ _Output\ _Output\$(ProjectName)\$(Configuration)64\ + + $(ProjectName)dARM64 + .;$(IncludePath) + _Output\ + _Output\$(ProjectName)\$(Configuration)ARM64\ + + + $(ProjectName)dARM + .;$(IncludePath) + _Output\ + _Output\$(ProjectName)\$(Configuration)ARM\ + .;$(IncludePath) _Output\ @@ -116,6 +208,18 @@ _Output\ _Output\$(ProjectName)\$(Configuration)64\ + + .;$(IncludePath) + $(ProjectName)testsARM64 + _Output\ + _Output\$(ProjectName)\$(Configuration)ARM64\ + + + .;$(IncludePath) + $(ProjectName)testsARM + _Output\ + _Output\$(ProjectName)\$(Configuration)ARM\ + .;$(IncludePath) _Output\ @@ -128,6 +232,18 @@ _Output\ _Output\$(ProjectName)\$(Configuration)64\ + + $(ProjectName)ARM64 + .;$(IncludePath) + _Output\ + _Output\$(ProjectName)\$(Configuration)ARM64\ + + + $(ProjectName)ARM + .;$(IncludePath) + _Output\ + _Output\$(ProjectName)\$(Configuration)ARM\ + Use @@ -169,6 +285,48 @@ $(OutDir)$(TargetName)$(TargetExt) + + + Use + Level3 + _CRTDBG_MAP_ALLOC;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + armips + false + + + true + ProgramDatabase + + + Windows + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + Use + Level3 + _CRTDBG_MAP_ALLOC;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + armips + false + + + true + ProgramDatabase + + + Windows + true + + + $(OutDir)$(TargetName)$(TargetExt) + + Use @@ -195,6 +353,33 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + armips + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + armips + MultiThreadedDebug + + + Windows + true + + Level3 @@ -237,6 +422,50 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + armips + false + true + true + false + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + armips + false + true + true + false + + + Windows + true + true + true + + @@ -282,10 +511,16 @@ Create Create + Create + Create Create Create + Create + Create Create Create + Create + Create @@ -347,4 +582,4 @@ - \ No newline at end of file + diff --git a/ext/libkirk/libkirk.vcxproj b/ext/libkirk/libkirk.vcxproj index 3c1e3a62d4ec..064eafe63648 100644 --- a/ext/libkirk/libkirk.vcxproj +++ b/ext/libkirk/libkirk.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -36,6 +52,19 @@ $(DefaultPlatformToolset) Unicode + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + true + $(DefaultPlatformToolset) + Unicode + true + StaticLibrary false @@ -49,6 +78,19 @@ $(DefaultPlatformToolset) Unicode + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + + + StaticLibrary + false + $(DefaultPlatformToolset) + Unicode + true + @@ -58,12 +100,24 @@ + + + + + + + + + + + + @@ -98,6 +152,38 @@ true + + + Level3 + true + false + false + MultiThreadedDebug + false + ../../Common/DbgNew.h + _CRTDBG_MAP_ALLOC;_USING_V110_SDK71_;%(PreprocessorDefinitions) + ProgramDatabase + + + true + + + + + Level3 + true + false + false + MultiThreadedDebug + false + ../../Common/DbgNew.h + _CRTDBG_MAP_ALLOC;_USING_V110_SDK71_;%(PreprocessorDefinitions) + ProgramDatabase + + + true + + Level3 @@ -139,6 +225,46 @@ true + + + Level3 + MaxSpeed + true + true + false + true + false + MultiThreaded + true + Speed + false + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + false + true + false + MultiThreaded + true + Speed + false + + + true + true + true + + @@ -159,4 +285,4 @@ - \ No newline at end of file + diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj index 3b5a40afd5ff..3a7d58e58e79 100644 --- a/ext/native/native.vcxproj +++ b/ext/native/native.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -37,6 +53,19 @@ Unicode $(DefaultPlatformToolset) + + StaticLibrary + true + Unicode + $(DefaultPlatformToolset) + + + StaticLibrary + true + Unicode + $(DefaultPlatformToolset) + true + StaticLibrary false @@ -50,6 +79,19 @@ Unicode $(DefaultPlatformToolset) + + StaticLibrary + false + Unicode + $(DefaultPlatformToolset) + + + StaticLibrary + false + Unicode + $(DefaultPlatformToolset) + true + @@ -59,21 +101,45 @@ + + + + + + + + + + + + + + $(VC_IncludePath);$(WindowsSDK_IncludePath) + + + $(VC_IncludePath);$(WindowsSDK_IncludePath) + + + $(VC_IncludePath);$(WindowsSDK_IncludePath) + + + $(VC_IncludePath);$(WindowsSDK_IncludePath) + @@ -119,6 +185,52 @@ Ws2_32.lib + + + + + Level3 + _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + true + false + false + MultiThreadedDebug + false + ../../Common/DbgNew.h + ProgramDatabase + + + Windows + true + + + Ws2_32.lib + + + + + + + Level3 + _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + true + false + false + MultiThreadedDebug + false + ../../Common/DbgNew.h + ProgramDatabase + + + Windows + true + + + Ws2_32.lib + + Level3 @@ -175,12 +287,74 @@ Ws2_32.lib + + + Level3 + + + MaxSpeed + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + NotSet + Precise + true + false + MultiThreaded + false + true + false + + + Windows + true + true + true + + + Ws2_32.lib + + + + + Level3 + + + MaxSpeed + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ..\..\ext;..\..;..\..\dx9sdk\Include;..\..\dx9sdk\Include\DX11;..\zlib;..\ext\zlib;..\native;..\RollerballGL;..\glew;..\SDL\include;..\native\ext;%(AdditionalIncludeDirectories); + NotSet + Precise + true + false + MultiThreaded + false + true + false + + + Windows + true + true + true + + + Ws2_32.lib + + true true true + true + true true + true + true @@ -310,13 +484,21 @@ true true true + true + true true + true + true true true true + true + true true + true + true @@ -329,20 +511,42 @@ AnySuitable Speed AnySuitable + AnySuitable + AnySuitable true + true + true Speed + Speed + Speed false + false + false AnySuitable + AnySuitable + AnySuitable Speed + Speed + Speed false + false + false StreamingSIMDExtensions2 Precise StreamingSIMDExtensions2 + StreamingSIMDExtensions2 + StreamingSIMDExtensions2 Precise + Precise + Precise MaxSpeed MaxSpeed + MaxSpeed + MaxSpeed Default Default + Default + Default @@ -366,325 +570,541 @@ CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp CompileAsCpp + CompileAsCpp + CompileAsCpp @@ -719,7 +1139,11 @@ true true true + true + true true + true + true @@ -741,6 +1165,8 @@ AssemblyAndSourceCode + AssemblyAndSourceCode + AssemblyAndSourceCode @@ -772,4 +1198,4 @@ - \ No newline at end of file + diff --git a/ext/zlib/zlib.vcxproj b/ext/zlib/zlib.vcxproj index 7ecc6db1f252..d36394dcb6b8 100644 --- a/ext/zlib/zlib.vcxproj +++ b/ext/zlib/zlib.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -67,6 +83,19 @@ Unicode $(DefaultPlatformToolset) + + StaticLibrary + true + Unicode + $(DefaultPlatformToolset) + + + StaticLibrary + true + Unicode + $(DefaultPlatformToolset) + true + StaticLibrary false @@ -80,6 +109,19 @@ Unicode $(DefaultPlatformToolset) + + StaticLibrary + false + Unicode + $(DefaultPlatformToolset) + + + StaticLibrary + false + Unicode + $(DefaultPlatformToolset) + true + @@ -89,12 +131,24 @@ + + + + + + + + + + + + @@ -140,6 +194,50 @@ true + + + + + Level3 + _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + false + NotSet + Precise + Default + true + false + false + MultiThreadedDebug + ../../Common/DbgNew.h + ProgramDatabase + + + Windows + true + + + + + + + Level3 + _CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + false + NotSet + Precise + Default + true + false + false + MultiThreadedDebug + ../../Common/DbgNew.h + ProgramDatabase + + + Windows + true + + Level3 @@ -192,7 +290,61 @@ true + + + Level3 + + + MaxSpeed + true + true + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + false + AnySuitable + Speed + false + NotSet + Precise + true + false + MultiThreaded + true + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + false + AnySuitable + Speed + false + NotSet + Precise + true + false + MultiThreaded + true + + + Windows + true + true + true + + - \ No newline at end of file + diff --git a/headless/Headless.vcxproj b/headless/Headless.vcxproj index 0fdb7d83c423..fe83733d67da 100644 --- a/headless/Headless.vcxproj +++ b/headless/Headless.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -38,6 +54,19 @@ Unicode $(DefaultPlatformToolset) + + Application + true + Unicode + $(DefaultPlatformToolset) + + + Application + true + Unicode + $(DefaultPlatformToolset) + true + Application false @@ -51,6 +80,19 @@ Unicode $(DefaultPlatformToolset) + + Application + false + Unicode + $(DefaultPlatformToolset) + + + Application + false + Unicode + $(DefaultPlatformToolset) + true + @@ -60,12 +102,24 @@ + + + + + + + + + + + + true @@ -77,6 +131,16 @@ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); + + true + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM64);$(WindowsSdk_LibraryPath_ARM64); + + + true + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM);$(WindowsSdk_LibraryPath_ARM); + false ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); @@ -87,6 +151,16 @@ ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); + + false + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM64);$(WindowsSdk_LibraryPath_ARM64); + + + false + ..\dx9sdk\Include;$(VC_IncludePath);$(WindowsSdk_IncludePath); + $(VC_LibraryPath_ARM);$(WindowsSdk_LibraryPath_ARM); + NotUsing @@ -151,6 +225,70 @@ Updating git-version.cpp + + + NotUsing + Level3 + _CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_CONSOLE;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../dx9sdk/Include/DX11;../Common;..;../Core;../ext/glew;../ext/native + NotSet + Precise + false + true + false + false + MultiThreadedDebug + Common/DbgNew.h + ProgramDatabase + + + Console + true + Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;d3dx9d.lib;dxguid.lib;%(AdditionalDependencies) + 0x00400000 + false + true + /ignore:4049 /ignore:4217 %(AdditionalOptions) + + + ../Windows/git-version-gen.cmd + + + Updating git-version.cpp + + + + + NotUsing + Level3 + _CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_CONSOLE;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../dx9sdk/Include/DX11;../Common;..;../Core;../ext/glew;../ext/native + NotSet + Precise + false + true + false + false + MultiThreadedDebug + Common/DbgNew.h + ProgramDatabase + + + Console + true + Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;d3dx9d.lib;dxguid.lib;%(AdditionalDependencies) + 0x00400000 + false + true + /ignore:4049 /ignore:4217 %(AdditionalOptions) + + + ../Windows/git-version-gen.cmd + + + Updating git-version.cpp + + Level3 @@ -221,11 +359,93 @@ Updating git-version.cpp + + + Level3 + NotUsing + true + true + USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_CONSOLE;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../dx9sdk/Include/DX11;../Common;..;../Core;../ext/glew;../ext/native + false + NotSet + Precise + Speed + false + true + false + MultiThreaded + true + + + Console + true + true + true + Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;d3dx9.lib;dxguid.lib;%(AdditionalDependencies) + 0x00400000 + false + true + /ignore:4049 /ignore:4217 %(AdditionalOptions) + + + ../Windows/git-version-gen.cmd + + + Updating git-version.cpp + + + + + Level3 + NotUsing + true + true + USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_CONSOLE;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../dx9sdk/Include/DX11;../Common;..;../Core;../ext/glew;../ext/native + false + NotSet + Precise + Speed + false + true + false + MultiThreaded + true + + + Console + true + true + true + Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;d3dx9.lib;dxguid.lib;%(AdditionalDependencies) + 0x00400000 + false + true + /ignore:4049 /ignore:4217 %(AdditionalOptions) + + + ../Windows/git-version-gen.cmd + + + Updating git-version.cpp + + - + + true + true + true + true + - + + true + true + true + true + @@ -233,13 +453,21 @@ NotUsing NotUsing NotUsing + NotUsing + NotUsing NotUsing + NotUsing + NotUsing true true true + true + true true + true + true @@ -280,4 +508,4 @@ - \ No newline at end of file + diff --git a/unittest/UnitTests.vcxproj b/unittest/UnitTests.vcxproj index a18fda2780a7..081563f498e4 100644 --- a/unittest/UnitTests.vcxproj +++ b/unittest/UnitTests.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM + + + Debug + ARM64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + Release + ARM + + + Release + ARM64 + Release Win32 @@ -38,6 +54,19 @@ $(DefaultPlatformToolset) Unicode + + Application + true + $(DefaultPlatformToolset) + Unicode + + + Application + true + $(DefaultPlatformToolset) + Unicode + true + Application false @@ -51,6 +80,19 @@ $(DefaultPlatformToolset) Unicode + + Application + false + $(DefaultPlatformToolset) + Unicode + + + Application + false + $(DefaultPlatformToolset) + Unicode + true + @@ -60,12 +102,24 @@ + + + + + + + + + + + + true @@ -75,6 +129,14 @@ true ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); + + true + $(VC_LibraryPath_ARM64);$(WindowsSdk_LibraryPath_ARM64); + + + true + $(VC_LibraryPath_ARM);$(WindowsSdk_LibraryPath_ARM); + false ..\dx9sdk\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSdk_LibraryPath_x86); @@ -83,6 +145,14 @@ false ..\dx9sdk\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSdk_LibraryPath_x64); + + false + $(VC_LibraryPath_ARM64);$(WindowsSdk_LibraryPath_ARM64); + + + false + $(VC_LibraryPath_ARM);$(WindowsSdk_LibraryPath_ARM); + @@ -128,6 +198,52 @@ ..\ffmpeg\Windows\x86_64\lib + + + + + Level3 + _CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../ext;../common;..;../ext/native;../ext/glew;../ext/zlib + true + false + false + MultiThreadedDebug + false + Common/DbgNew.h + ProgramDatabase + + + Console + true + Ws2_32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;dsound.lib;glu32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;%(AdditionalDependencies) + /ignore:4049 /ignore:4217 %(AdditionalOptions) + ..\ffmpeg\Windows\x86_64\lib + + + + + + + Level3 + _CRTDBG_MAP_ALLOC;USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../ext;../common;..;../ext/native;../ext/glew;../ext/zlib + true + false + false + MultiThreadedDebug + false + Common/DbgNew.h + ProgramDatabase + + + Console + true + Ws2_32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;dsound.lib;glu32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;%(AdditionalDependencies) + /ignore:4049 /ignore:4217 %(AdditionalOptions) + ..\ffmpeg\Windows\x86_64\lib + + Level3 @@ -182,6 +298,62 @@ ..\ffmpeg\Windows\x86_64\lib + + + Level3 + + + MaxSpeed + true + true + USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_64=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../ext;../common;..;../ext/native;../ext/glew;../ext/zlib + false + true + false + MultiThreaded + true + Size + false + + + Console + true + true + true + Ws2_32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;dsound.lib;glu32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;%(AdditionalDependencies) + /ignore:4049 /ignore:4217 %(AdditionalOptions) + ..\ffmpeg\Windows\x86_64\lib + + + + + Level3 + + + MaxSpeed + true + true + USING_WIN_UI;GLEW_STATIC;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_ARCH_32=1;_WINDOWS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ../ext;../common;..;../ext/native;../ext/glew;../ext/zlib + false + true + false + MultiThreaded + true + Size + false + + + Console + true + true + true + Ws2_32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;opengl32.lib;dsound.lib;glu32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;comctl32.lib;d3d9.lib;dxguid.lib;%(AdditionalDependencies) + /ignore:4049 /ignore:4217 %(AdditionalOptions) + ..\ffmpeg\Windows\x86_64\lib + + @@ -225,4 +397,4 @@ - \ No newline at end of file +