From c5440c95c8aa63ac813a4bbd2c226b69573852d8 Mon Sep 17 00:00:00 2001 From: max Date: Wed, 24 Jul 2019 19:01:55 +0300 Subject: [PATCH] [MSbuild] Extend support to v142 toolset - Added support for current default toolset, explitly specified c++17 standard and 8.1 win sdk. - properties were defined via `common_default.props` and `common_default_macros.props` Note: There are 2 files because some properties need to be imported before `Microsoft.Cpp.Default.props` , but other common properties can be imported after but they require marco defined in `Microsoft.Cpp.Default.props`. - Added hidapi and libusb project files to repository to simplify msbuild changes. --- 3rdparty/hidapi.vcxproj | 105 +++++++++++++++++++++ 3rdparty/hidapi.vcxproj.filters | 27 ++++++ 3rdparty/libpng.vcxproj | 4 +- 3rdparty/libusb_static.vcxproj | 90 ++++++++++++++++++ 3rdparty/pnglibconf.vcxproj | 4 +- 3rdparty/xxhash.vcxproj | 4 +- 3rdparty/yaml-cpp.vcxproj | 4 +- 3rdparty/zlib.vcxproj | 5 +- Vulkan/glslang-build/glslang-build.vcxproj | 5 +- asmjitsrc/asmjit.vcxproj | 4 +- common_default.props | 15 +++ common_default_macros.props | 11 +++ llvm_build/llvm_build.vcxproj | 16 ++-- rpcs3.sln | 4 +- rpcs3/D3D12GSRender.vcxproj | 6 +- rpcs3/GLGSRender.vcxproj | 4 +- rpcs3/OpenAL.vcxproj | 4 +- rpcs3/VKGSRender.vcxproj | 4 +- rpcs3/XAudio.vcxproj | 4 +- rpcs3/emucore.vcxproj | 4 +- rpcs3/rpcs3.vcxproj | 11 +-- rpcs3_default.props | 2 +- 22 files changed, 290 insertions(+), 47 deletions(-) create mode 100644 3rdparty/hidapi.vcxproj create mode 100644 3rdparty/hidapi.vcxproj.filters create mode 100644 3rdparty/libusb_static.vcxproj create mode 100644 common_default.props create mode 100644 common_default_macros.props diff --git a/3rdparty/hidapi.vcxproj b/3rdparty/hidapi.vcxproj new file mode 100644 index 0000000000..6709629acc --- /dev/null +++ b/3rdparty/hidapi.vcxproj @@ -0,0 +1,105 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {A107C21C-418A-4697-BB10-20C3AA60E2E4} + hidapi + Win32Proj + + + + + + StaticLibrary + Unicode + + + StaticLibrary + MultiByte + + + + + + + + + + + + + <_ProjectFileVersion>15.0.26323.1 + + + true + $(SolutionDir)lib/ + $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/ + + + false + $(SolutionDir)lib/ + $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/ + + + + Disabled + hidapi\hidapi;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + setupapi.lib;%(AdditionalDependencies) + true + Windows + + + setupapi.lib + + + + + MaxSpeed + true + hidapi\hidapi;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + Level3 + ProgramDatabase + + + setupapi.lib;%(AdditionalDependencies) + true + Windows + true + true + + + setupapi.lib + + + + + + + + + + + + \ No newline at end of file diff --git a/3rdparty/hidapi.vcxproj.filters b/3rdparty/hidapi.vcxproj.filters new file mode 100644 index 0000000000..74f1b00db0 --- /dev/null +++ b/3rdparty/hidapi.vcxproj.filters @@ -0,0 +1,27 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/3rdparty/libpng.vcxproj b/3rdparty/libpng.vcxproj index 5bff70c476..1b43cbadd8 100644 --- a/3rdparty/libpng.vcxproj +++ b/3rdparty/libpng.vcxproj @@ -16,16 +16,16 @@ libpng + + StaticLibrary MultiByte - v141 StaticLibrary MultiByte - v141 diff --git a/3rdparty/libusb_static.vcxproj b/3rdparty/libusb_static.vcxproj new file mode 100644 index 0000000000..f98f08e27f --- /dev/null +++ b/3rdparty/libusb_static.vcxproj @@ -0,0 +1,90 @@ + + + + + Debug + x64 + + + Release + x64 + + + + libusb-1.0 (static) + {349EE8F9-7D25-4909-AAF5-FF3FADE72187} + libusb + + + + + + StaticLibrary + Unicode + true + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)lib/ + $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/ + libusb-1.0 + + + + libusb\msvc;libusb\libusb;%(AdditionalIncludeDirectories) + WINVER=0x0501;_WIN32_WINNT=0x0501;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pdb + Level4 + + + ProgramDatabase + Disabled + MultiThreadedDebug + + + NDEBUG;%(PreprocessorDefinitions) + MultiThreaded + + + $(OutDir)libusb-1.0.lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/3rdparty/pnglibconf.vcxproj b/3rdparty/pnglibconf.vcxproj index 17b6875fbb..c633292592 100644 --- a/3rdparty/pnglibconf.vcxproj +++ b/3rdparty/pnglibconf.vcxproj @@ -9,15 +9,15 @@ {EB33566E-DA7F-4D28-9077-88C0B7C77E35} pnglibconf - 8.1 + + Application false true MultiByte - v141 diff --git a/3rdparty/xxhash.vcxproj b/3rdparty/xxhash.vcxproj index 5e412b49fd..2bc39ceb00 100644 --- a/3rdparty/xxhash.vcxproj +++ b/3rdparty/xxhash.vcxproj @@ -12,12 +12,12 @@ {939FE206-1182-ABC3-1234-FEAB88E98404} - 8.1 + + StaticLibrary - v141 Unicode diff --git a/3rdparty/yaml-cpp.vcxproj b/3rdparty/yaml-cpp.vcxproj index 41b50e99c1..849068e0d6 100644 --- a/3rdparty/yaml-cpp.vcxproj +++ b/3rdparty/yaml-cpp.vcxproj @@ -13,13 +13,13 @@ {FDC361C5-7734-493B-8CFB-037308B35122} yamlcpp - 8.1 + + StaticLibrary Unicode - v141 diff --git a/3rdparty/zlib.vcxproj b/3rdparty/zlib.vcxproj index b953170e67..43bc2d2800 100644 --- a/3rdparty/zlib.vcxproj +++ b/3rdparty/zlib.vcxproj @@ -27,17 +27,16 @@ {60F89955-91C6-3A36-8000-13C592FEC2DF} Win32Proj zlib - 8.1 + + StaticLibrary - v141 StaticLibrary - v141 diff --git a/Vulkan/glslang-build/glslang-build.vcxproj b/Vulkan/glslang-build/glslang-build.vcxproj index d4a92f169d..d7f49fa26a 100644 --- a/Vulkan/glslang-build/glslang-build.vcxproj +++ b/Vulkan/glslang-build/glslang-build.vcxproj @@ -13,18 +13,17 @@ {8F85B6CC-250F-4ACA-A617-E820A74E3E3C} MakeFileProj - 8.1 + + Makefile true - v141 Makefile false - v141 diff --git a/asmjitsrc/asmjit.vcxproj b/asmjitsrc/asmjit.vcxproj index 5697719d70..17c1715f7b 100644 --- a/asmjitsrc/asmjit.vcxproj +++ b/asmjitsrc/asmjit.vcxproj @@ -87,13 +87,13 @@ {AC40FF01-426E-4838-A317-66354CEFAE88} asmjit - 8.1 + + StaticLibrary Unicode - v141 diff --git a/common_default.props b/common_default.props new file mode 100644 index 0000000000..246f6bf8f9 --- /dev/null +++ b/common_default.props @@ -0,0 +1,15 @@ + + + + + + + 8.1 + + + + stdcpp17 + + + + \ No newline at end of file diff --git a/common_default_macros.props b/common_default_macros.props new file mode 100644 index 0000000000..5939a53568 --- /dev/null +++ b/common_default_macros.props @@ -0,0 +1,11 @@ + + + + + + + $(DefaultPlatformToolset) + + + + \ No newline at end of file diff --git a/llvm_build/llvm_build.vcxproj b/llvm_build/llvm_build.vcxproj index f93596a3e2..655d8e3591 100644 --- a/llvm_build/llvm_build.vcxproj +++ b/llvm_build/llvm_build.vcxproj @@ -14,16 +14,16 @@ {8BC303AB-25BE-4276-8E57-73F171B2D672} MakeFileProj + + Makefile true - v141 Makefile false - v141 @@ -41,30 +41,30 @@ - cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m - cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m - cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m - cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m - cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m - cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm + cmake -G $(CmakeGenerator) -A x64 -Thost=x64 -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) ../llvm msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m diff --git a/rpcs3.sln b/rpcs3.sln index dfe857926d..ccc39005e9 100644 --- a/rpcs3.sln +++ b/rpcs3.sln @@ -69,7 +69,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxpro EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hidapi", "hidapi", "{FA1E6C16-CA63-45F8-8D52-E21DF396BE36}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidapi", "3rdparty\hidapi\windows\hidapi.vcxproj", "{A107C21C-418A-4697-BB10-20C3AA60E2E4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hidapi", "3rdparty\hidapi.vcxproj", "{A107C21C-418A-4697-BB10-20C3AA60E2E4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xxhash", "xxhash", "{D16E245C-CC5A-4B9A-8BAB-1176F02C1631}" EndProject @@ -77,7 +77,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xxhash", "3rdparty\xxhash.v EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libusb", "libusb", "{6D8E86F7-84A0-45BA-ACC3-F02FC5545B3B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "3rdparty\libusb\msvc\libusb_static_2017.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "3rdparty\libusb_static.vcxproj", "{349EE8F9-7D25-4909-AAF5-FF3FADE72187}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/rpcs3/D3D12GSRender.vcxproj b/rpcs3/D3D12GSRender.vcxproj index 26e9400943..4e6d64b58c 100644 --- a/rpcs3/D3D12GSRender.vcxproj +++ b/rpcs3/D3D12GSRender.vcxproj @@ -25,13 +25,13 @@ {FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078} D3D12GSRender - 8.1 + + StaticLibrary Unicode - v141 @@ -96,4 +96,4 @@ - + \ No newline at end of file diff --git a/rpcs3/GLGSRender.vcxproj b/rpcs3/GLGSRender.vcxproj index 29f6d29492..ca23f8ba4b 100644 --- a/rpcs3/GLGSRender.vcxproj +++ b/rpcs3/GLGSRender.vcxproj @@ -24,14 +24,14 @@ GLGSRender - 8.1 {3384223A-6D97-4799-9862-359F85312892} + + StaticLibrary Unicode - v141 diff --git a/rpcs3/OpenAL.vcxproj b/rpcs3/OpenAL.vcxproj index b398c854bd..7a7326670a 100644 --- a/rpcs3/OpenAL.vcxproj +++ b/rpcs3/OpenAL.vcxproj @@ -26,12 +26,12 @@ {30A05C4D-F5FD-421C-A864-17A64BDEAA75} Win32Proj OpenAL - 8.1 + + StaticLibrary - v141 Unicode diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/VKGSRender.vcxproj index 0ced25f148..f23b98303a 100644 --- a/rpcs3/VKGSRender.vcxproj +++ b/rpcs3/VKGSRender.vcxproj @@ -67,12 +67,12 @@ {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D} Win32Proj VKGSRender - 8.1 + + StaticLibrary - v141 Unicode diff --git a/rpcs3/XAudio.vcxproj b/rpcs3/XAudio.vcxproj index ea1ab488a1..dd6926f4e8 100644 --- a/rpcs3/XAudio.vcxproj +++ b/rpcs3/XAudio.vcxproj @@ -25,13 +25,13 @@ {78CB2F39-B809-4A06-8329-8C0A19119D3D} XAudio - 8.1 + + StaticLibrary Unicode - v141 diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index c15fc5fbe6..199dbb1293 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -25,12 +25,12 @@ {C4A10229-4712-4BD2-B63E-50D93C67A038} emucore - 8.1 + + StaticLibrary - v141 Unicode diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 55bf90a3ce..4adcf3e579 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -22,11 +22,11 @@ {70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12} rpcs3 Qt4VSv1.0 - 8.1 + + - v141 release\ false Unicode @@ -35,7 +35,6 @@ rpcs3 - v141 release\ false Unicode @@ -44,7 +43,6 @@ rpcs3 - v141 debug\ false Unicode @@ -53,7 +51,6 @@ rpcs3 - v141 debug\ false Unicode @@ -195,8 +192,8 @@ Level3 - gdi32.lib;..\hidapi.lib;libusb-1.0.lib;winmm.lib;OpenAL.lib;XAudio.lib;D3D12GSRender.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;HLSL.lib;Advapi32.lib;user32.lib;zlib.lib;..\libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;$(QTDIR)\lib\qtmain.lib;shell32.lib;opengl32.lib;$(QTDIR)\lib\Qt5OpenGL.lib;$(QTDIR)\lib\Qt5Widgets.lib;$(QTDIR)\lib\Qt5Gui.lib;$(QTDIR)\lib\Qt5Qml.lib;$(QTDIR)\lib\Qt5Network.lib;$(QTDIR)\lib\Qt5Core.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5WinExtras.lib;%(AdditionalDependencies) - ..\3rdparty\libusb\x64\Release\lib;$(VULKAN_SDK)\Lib;..\3rdparty\OpenAL\libs\Win64;..\Vulkan\glslang-build\hlsl\Release;..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\glslang-build\glslang\Release;..\lib\$(CONFIGURATION)-$(PLATFORM);..\3rdparty\minidx12\Lib;..\3rdparty\discord-rpc\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories) + gdi32.lib;..\hidapi.lib;..\libusb-1.0.lib;winmm.lib;OpenAL.lib;XAudio.lib;D3D12GSRender.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;HLSL.lib;Advapi32.lib;user32.lib;zlib.lib;..\libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;$(QTDIR)\lib\qtmain.lib;shell32.lib;opengl32.lib;$(QTDIR)\lib\Qt5OpenGL.lib;$(QTDIR)\lib\Qt5Widgets.lib;$(QTDIR)\lib\Qt5Gui.lib;$(QTDIR)\lib\Qt5Qml.lib;$(QTDIR)\lib\Qt5Network.lib;$(QTDIR)\lib\Qt5Core.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5WinExtras.lib;%(AdditionalDependencies) + $(VULKAN_SDK)\Lib;..\3rdparty\OpenAL\libs\Win64;..\Vulkan\glslang-build\hlsl\Release;..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\glslang-build\glslang\Release;..\lib\$(CONFIGURATION)-$(PLATFORM);..\3rdparty\minidx12\Lib;..\3rdparty\discord-rpc\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories) "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) true Debug diff --git a/rpcs3_default.props b/rpcs3_default.props index 2c47a47ccd..79339558b1 100644 --- a/rpcs3_default.props +++ b/rpcs3_default.props @@ -19,7 +19,7 @@ false true NotUsing - /Zc:throwingNew /std:c++latest + /Zc:throwingNew xxhash.lib;ws2_32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib