diff options
| author | JosJuice <josjuice@gmail.com> | 2022-09-18 23:40:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-18 23:40:33 +0200 |
| commit | eec43ce3f332dfc1aa6a72d199f25b05dfb6c7e2 (patch) | |
| tree | 3cfacc89ae69b4fc420f1f980c7a0153e28d6ab8 /Source | |
| parent | 69ad2cc4d0f4efa3b933773ee12f119001bbbf62 (diff) | |
| parent | 7866fba1bee0fb6e73ecceca8c239c2c950a2527 (diff) | |
Merge pull request #11068 from JosJuice/revert-vcredist
Revert "windows: distribute vcredist loose files"
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinQt/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | Source/VSProps/Base.Dolphin.props | 12 |
2 files changed, 0 insertions, 34 deletions
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt index 27e6eea689..cd7e9def60 100644 --- a/Source/Core/DolphinQt/CMakeLists.txt +++ b/Source/Core/DolphinQt/CMakeLists.txt @@ -440,28 +440,6 @@ if(WIN32) COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf.win" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf" ) - # Copy VC++ Redist. - # NOTE This *intentionally* does not copy debug redist files. - # TODO This should really occur for any executable target. - # TODO Actually use cmake 'install' and InstallRequiredSystemLibraries. - if(MSVC_C_ARCHITECTURE_ID) - string(TOLOWER "${MSVC_C_ARCHITECTURE_ID}" CMAKE_MSVC_ARCH) - elseif(MSVC_CXX_ARCHITECTURE_ID) - string(TOLOWER "${MSVC_CXX_ARCHITECTURE_ID}" CMAKE_MSVC_ARCH) - else() - set(CMAKE_MSVC_ARCH x86) - endif() - set(MSVC_REDIST_NAME VC${MSVC_TOOLSET_VERSION}) - find_path(MSVC_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.CRT) - mark_as_advanced(MSVC_REDIST_DIR) - set(MSVC_CRT_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.CRT") - file(GLOB MSVC_REDIST_DLLS "${MSVC_CRT_DIR}/*.dll") - foreach(MsvcRedistDll IN LISTS MSVC_REDIST_DLLS) - add_custom_command(TARGET dolphin-emu POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${MsvcRedistDll}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" - ) - endforeach() - # Delegate to Qt's official deployment binary on Windows to copy over the necessary Qt-specific libraries, etc. get_target_property(MOC_EXECUTABLE_LOCATION Qt${QT_VERSION_MAJOR}::moc IMPORTED_LOCATION) get_filename_component(QT_BINARY_DIRECTORY "${MOC_EXECUTABLE_LOCATION}" DIRECTORY) diff --git a/Source/VSProps/Base.Dolphin.props b/Source/VSProps/Base.Dolphin.props index b8bf4f213a..7f5c2a83d4 100644 --- a/Source/VSProps/Base.Dolphin.props +++ b/Source/VSProps/Base.Dolphin.props @@ -84,16 +84,4 @@ <AdditionalOptions>/NODEFAULTLIB:msvcrt %(AdditionalOptions)</AdditionalOptions> </Link> </ItemDefinitionGroup> - - <Target Name="CopyVCRedist" AfterTargets="Build" Condition="'$(ConfigurationType)'=='Application'"> - <ItemGroup> - <VCRedistSourceFiles - Include="$(VCToolsRedistInstallDir)$(Platform)\Microsoft.VC$(PlatformToolsetVersion).CRT\*.dll" /> - </ItemGroup> - <Copy - SourceFiles="@(VCRedistSourceFiles)" - DestinationFolder="$(BinaryOutputDir)" - SkipUnchangedFiles="true" - /> - </Target> </Project> |