Fix rust deps for gui + nogui.

project-slippi · Sep 9, 2024 · 615b74c · 615b74c
1 parent 833772a
commit 615b74c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt
@@ -12,3 +12,14 @@ add_subdirectory(VideoBackends)
 if(ENABLE_QT)
 	add_subdirectory(DolphinQt)
 endif()
+
+# Build SlippiRustExtensions for DolphinWX and DolphinNoGui.
+#
+# (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})
diff --git a/Source/Core/DolphinNoGUI/CMakeLists.txt b/Source/Core/DolphinNoGUI/CMakeLists.txt
@@ -19,16 +19,6 @@ target_link_libraries(dolphin-nogui PRIVATE
   ${LIBS}
 )
 
-# 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-nogui PUBLIC slippi-rust-extensions)
 
 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} dolphin-nogui)

diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
@@ -133,16 +133,6 @@ if(wxWidgets_FOUND)
 	add_executable("${DOLPHIN_EXE}" ${SRCS} ${GUI_SRCS})
 	target_link_libraries("${DOLPHIN_EXE}" ${LIBS} ${WXLIBS})
 
-	# 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_EXE}" PUBLIC slippi-rust-extensions)
 
 	if(APPLE)
@@ -155,7 +145,7 @@ if(wxWidgets_FOUND)
 			MACOSX_BUNDLE true
 			MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
 		)
-		
+
 		# Link MoltenVK for the Vulkan (experimental) backend; the framework is
 		# added into the bundle in Tools/deploy-mac.py due to legacy build reasons.
 		find_library(MOLTENVK libvulkan.dylib PATHS ${CMAKE_SOURCE_DIR}/Externals/MoltenVK)