ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11068 from JosJuice/revert-vcredist 

Revert "windows: distribute vcredist loose files"
This commit is contained in:
JosJuice 2022-09-18 23:40:33 +02:00 committed by GitHub
parent 69ad2cc4d0 7866fba1be
commit eec43ce3f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Data/license.txt
View File

@ -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 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 library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. 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/

3
LICENSES/MSVC-Redist.txt
View File

@ -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/

22
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -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" 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. # 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_target_property(MOC_EXECUTABLE_LOCATION Qt${QT_VERSION_MAJOR}::moc IMPORTED_LOCATION)
get_filename_component(QT_BINARY_DIRECTORY "${MOC_EXECUTABLE_LOCATION}" DIRECTORY) get_filename_component(QT_BINARY_DIRECTORY "${MOC_EXECUTABLE_LOCATION}" DIRECTORY)

12
Source/VSProps/Base.Dolphin.props
View File

@ -84,16 +84,4 @@
<AdditionalOptions>/NODEFAULTLIB:msvcrt %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/NODEFAULTLIB:msvcrt %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </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> </Project>