fix(build): rust dep for nogui build (#17)

Co-authored-by: Nikhil Narayana <nikhil.narayana@live.com>
project-slippi · Jun 1, 2024 · 8fa4122 · 8fa4122
1 parent 66559aa
commit 8fa4122
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt
@@ -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})
diff --git a/Source/Core/DolphinNoGUI/CMakeLists.txt b/Source/Core/DolphinNoGUI/CMakeLists.txt
@@ -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
@@ -54,4 +55,3 @@ endif()
 
 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} dolphin-nogui)
 install(TARGETS dolphin-nogui RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
@@ -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)