diff --git a/Data/license.txt b/Data/license.txt index d39e6b481bdb..d511905c1647 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/LICENSES/MSVC-Redist.txt b/LICENSES/MSVC-Redist.txt deleted file mode 100644 index f569f5a9a8c0..000000000000 --- a/LICENSES/MSVC-Redist.txt +++ /dev/null @@ -1,3 +0,0 @@ -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 27e6eea68940..cd7e9def6098 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 b8bf4f213ad6..7f5c2a83d4d1 100644 --- a/Source/VSProps/Base.Dolphin.props +++ b/Source/VSProps/Base.Dolphin.props @@ -84,16 +84,4 @@ /NODEFAULTLIB:msvcrt %(AdditionalOptions) - - - - - - -