[rsl] Statically link riistudio_rs

Seems we no longer need it as a .dll as a workaround

Author: snailspeed3

source/cli/CMakeLists.txt

@@ -50,7 +50,7 @@ elseif (APPLE)
   set(GLFW_VERSION "3.4")
   set(FREETYPE_VERSION "2.13.2")
 
-  SET_TARGET_PROPERTIES(cli PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework Security -ldl ${HOMEBREW_CELLAR}/glfw/${GLFW_VERSION}/lib/libglfw.dylib ${HOMEBREW_CELLAR}/freetype/${FREETYPE_VERSION}/lib/libfreetype.dylib")
+  SET_TARGET_PROPERTIES(cli PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework Security -framework SystemConfiguration -ldl ${HOMEBREW_CELLAR}/glfw/${GLFW_VERSION}/lib/libglfw.dylib ${HOMEBREW_CELLAR}/freetype/${FREETYPE_VERSION}/lib/libfreetype.dylib")
 elseif (UNIX AND NOT EMSCRIPTEN)
   find_library(GLFW3_LIBRARY NAMES libglfw.so PATHS /usr/lib)
   find_library(FREETYPE_LIBRARY NAMES libfreetype.so PATHS /usr/lib)
@@ -100,7 +100,7 @@ add_custom_command(
 add_dependencies(cli rsl)
 
 # Disabled: No DLLs exist
-if (WIN32) # AND CMAKE_BUILD_TYPE STREQUAL "Debug"
+if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_custom_command(TARGET cli POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:cli> $<TARGET_FILE_DIR:cli> 
     COMMAND_EXPAND_LISTS

source/frontend/CMakeLists.txt

@@ -154,7 +154,7 @@ if (NOT MSVC)
     set(GLFW_VERSION "3.4")
     set(FREETYPE_VERSION "2.13.2")
 
-    SET_TARGET_PROPERTIES(frontend PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework Security -ldl ${HOMEBREW_CELLAR}/glfw/${GLFW_VERSION}/lib/libglfw.dylib ${HOMEBREW_CELLAR}/freetype/${FREETYPE_VERSION}/lib/libfreetype.dylib")
+    SET_TARGET_PROPERTIES(frontend PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework Security -framework SystemConfiguration -ldl ${HOMEBREW_CELLAR}/glfw/${GLFW_VERSION}/lib/libglfw.dylib ${HOMEBREW_CELLAR}/freetype/${FREETYPE_VERSION}/lib/libfreetype.dylib")
   elseif (UNIX)
     # --start-group, --end-group allows circular dependencies among object files
     if (EMSCRIPTEN)
@@ -285,7 +285,7 @@ if (NOT EMSCRIPTEN)
 endif()
 
 # Disabled: No DLLs exist
-if (WIN32)  # AND CMAKE_BUILD_TYPE STREQUAL "Debug"
+if (WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_custom_command(TARGET frontend POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:frontend> $<TARGET_FILE_DIR:frontend> 
     COMMAND_EXPAND_LISTS

source/rsl/CMakeLists.txt

@@ -26,7 +26,7 @@ if (WIN32)
 endif()
 
 # Annoying bzip2 version conflict (so use dylib)
-corrosion_import_crate(MANIFEST_PATH rust/Cargo.toml CRATE_TYPES cdylib FLAGS --crate-type=cdylib)
+corrosion_import_crate(MANIFEST_PATH rust/Cargo.toml CRATE_TYPES staticlib FLAGS --crate-type=staticlib)
 
 target_link_libraries(rsl PUBLIC core riistudio_rs vendor)
 

source/rust_bundle/build.rs

@@ -45,6 +45,7 @@ fn main() {
     {
         println!("cargo:rustc-link-lib=framework={}", "CoreFoundation");
         println!("cargo:rustc-link-lib=framework={}", "Security");
+        println!("cargo:rustc-link-lib=framework={}", "SystemConfiguration");
         println!("cargo:rustc-link-search=native={}", "/opt/homebrew/Cellar/freetype/2.13.2/lib/");
         println!("cargo:rustc-link-lib=static={}", "freetype");
         println!("cargo:rustc-link-search=native={}", "/opt/homebrew/Cellar/glfw/3.4/lib/");

source/tests/CMakeLists.txt

@@ -54,7 +54,7 @@ elseif (APPLE)
     set(GLFW_VERSION "3.4")
 	set(FREETYPE_VERSION "2.13.2")
 
-    SET_TARGET_PROPERTIES(tests PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework Security -ldl ${HOMEBREW_CELLAR}/glfw/${GLFW_VERSION}/lib/libglfw.dylib ${HOMEBREW_CELLAR}/freetype/${FREETYPE_VERSION}/lib/libfreetype.dylib")
+    SET_TARGET_PROPERTIES(tests PROPERTIES LINK_FLAGS "-framework CoreFoundation -framework Security -framework SystemConfiguration -ldl ${HOMEBREW_CELLAR}/glfw/${GLFW_VERSION}/lib/libglfw.dylib ${HOMEBREW_CELLAR}/freetype/${FREETYPE_VERSION}/lib/libfreetype.dylib")
 elseif(UNIX AND NOT EMSCRIPTEN)
 	# TODO: code duplication, extract FindBzip2.cmake to top level CMakeLists
 	find_library(BZIP2_LIBRARY NAMES libbz2.so PATHS /usr/lib)
@@ -94,12 +94,12 @@ if (WIN32)
 			$<TARGET_FILE_DIR:tests>
 	)
   # Disabled: No DLLs exist
-  #if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+  if (CMAKE_BUILD_TYPE STREQUAL "Debug")
 	  add_custom_command(TARGET tests POST_BUILD
 	    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:tests> $<TARGET_FILE_DIR:tests> 
 	    COMMAND_EXPAND_LISTS
 	  )
-  #endif()
+  endif()
 endif()
 
 add_custom_command(