mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-20 01:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: always copy rust dlls on windows

Browse source
This commit is contained in:
Nikhil Narayana 2025-08-08 21:03:08 -07:00
commit 62f1dd7d04
No known key found for this signature in database
GPG key ID: 2D6E647B8732451F
2 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
CMakeLists.txt
View file

@ -609,9 +609,27 @@ if(ENABLE_ANALYTICS)
add_definitions(-DUSE_ANALYTICS=1)
endif()
# Slippi Stuff
# slippi change
message("Using static Corrosion from Externals for Rust linking support")
add_subdirectory(Externals/corrosion)
# Copy Rust DLLs
if (WIN32)
# this custom target will always run during a build and thus copy the rust DLLs to the binary folder if you're making rust only changes
string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
add_custom_target(copy_rust_dll ALL
COMMENT "dummy target for copying rust dlls on windows after every build"
# my understanding is that `common` depends on rust so depending on common will ensure that the rust libs fully build before the copy dll target is triggered
# using the slippi_rust_extensions target did not work, for reasons i can't explain
DEPENDS common
)
# Copy Rust DLLs
add_custom_command(TARGET copy_rust_dll POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/cargo/build/x86_64-pc-windows-msvc/${CMAKE_BUILD_TYPE_LOWER}/slippi_rust_extensions.dll" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/slippi_rust_extensions.dll"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/cargo/build/x86_64-pc-windows-msvc/${CMAKE_BUILD_TYPE_LOWER}/slippi_rust_extensions.dll.lib" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/slippi_rust_extensions.dll.lib"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/cargo/build/x86_64-pc-windows-msvc/${CMAKE_BUILD_TYPE_LOWER}/slippi_rust_extensions.pdb" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/slippi_rust_extensions.pdb"
)
endif()
# end slippi change
if(SLIPPI_PLAYBACK)
# Slippi Playback build option

18
Source/Core/DolphinQt/CMakeLists.txt
View file

@ -483,21 +483,9 @@ if(WIN32)
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf.win" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf"
)
string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
# Copy Rust DLLs
add_custom_command(TARGET dolphin-emu POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/cargo/build/x86_64-pc-windows-msvc/${CMAKE_BUILD_TYPE_LOWER}/slippi_rust_extensions.dll" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/slippi_rust_extensions.dll"
)
add_custom_command(TARGET dolphin-emu POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/cargo/build/x86_64-pc-windows-msvc/${CMAKE_BUILD_TYPE_LOWER}/slippi_rust_extensions.dll.lib" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/slippi_rust_extensions.dll.lib"
)
# Copy Rust PDB (should not go out in releases)
add_custom_command(TARGET dolphin-emu POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/cargo/build/x86_64-pc-windows-msvc/${CMAKE_BUILD_TYPE_LOWER}/slippi_rust_extensions.pdb" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/slippi_rust_extensions.pdb"
)
# slippi change
add_dependencies(dolphin-emu copy_rust_dll)
# end slippi change
# create portable.txt automatically for Windows since we always use portable builds for dev and release
add_custom_command(TARGET dolphin-emu POST_BUILD