Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix rust dep for nogui build #17

Merged
merged 2 commits into from
Jun 1, 2024
Merged

Fix rust dep for nogui build #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f35148c
Fix rust dep for nogui.
vladfi1 Mar 4, 2024
575327d
Discard changes to build-mac.sh
NikhilNarayana Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Source/Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,12 @@ endif()
if (WIN32 AND ENABLE_AUTOUPDATE)
add_subdirectory(WinUpdater)
endif()

# Build SlippiRustExtensions for DolphinQt and DolphinNoGui
#
#set(RUST_FEATURES "")
#if(DIS_PLAYBACK)
# set(RUST_FEATURES "playback")
#endif()

corrosion_import_crate(MANIFEST_PATH ${CMAKE_SOURCE_DIR}/Externals/SlippiRustExtensions/Cargo.toml ${RUST_FEATURES})
4 changes: 2 additions & 2 deletions Source/Core/DolphinNoGUI/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME dolphin-emu-nogui)

target_link_libraries(dolphin-nogui
PUBLIC
z
slippi-rust-extensions
z
PRIVATE
core
uicommon
Expand Down Expand Up @@ -54,4 +55,3 @@ endif()

set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} dolphin-nogui)
install(TARGETS dolphin-nogui RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

10 changes: 0 additions & 10 deletions Source/Core/DolphinQt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,16 +582,6 @@ if(GETTEXT_MSGFMT_EXECUTABLE)
endforeach()
endif()

# Link SlippiRustExtensions in.
#
# (This doesn't feel perfect here, but truth be told I can't think offhand of
# a better location for it at the moment.)
#set(RUST_FEATURES "")
#if(DIS_PLAYBACK)
# set(RUST_FEATURES "playback")
#endif()

corrosion_import_crate(MANIFEST_PATH ${CMAKE_SOURCE_DIR}/Externals/SlippiRustExtensions/Cargo.toml ${RUST_FEATURES})
target_link_libraries(dolphin-emu PUBLIC slippi-rust-extensions)

if(APPLE)
Expand Down
Loading