From fec6f1bd5a1ee73233694c9c486e747c585f30c3 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 16 Sep 2022 10:33:39 +0200 Subject: [PATCH] Revert "windows: distribute vcredist loose files" This reverts commit 0837af4344e037bdb23f6520519775fad5f671d9. --- Data/license.txt | 5 ----- Source/Core/DolphinQt/CMakeLists.txt | 22 ---------------------- Source/VSProps/Base.Dolphin.props | 12 ------------ 3 files changed, 39 deletions(-) diff --git a/Data/license.txt b/Data/license.txt index d39e6b481b..d511905c16 100644 --- a/Data/license.txt +++ b/Data/license.txt @@ -337,8 +337,3 @@ proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - - -This program uses VC++ Redistributable code. The license for those object -files can be found at: -https://visualstudio.microsoft.com/license-terms/vs2022-ga-community/ 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 @@ /NODEFAULTLIB:msvcrt %(AdditionalOptions) - - - - - - -