--- a/CMakeLists.txt Tue Sep 05 17:02:08 2023 +0200
+++ b/CMakeLists.txt Fri Jan 19 13:07:22 2024 +0100
@@ -109,6 +109,7 @@
#platform specific init code
include(${CMAKE_MODULE_PATH}/platform.cmake)
+add_subdirectory(tools/corrosion)
#when build type is not specified, assume Debug/Release according to build version information
if(CMAKE_BUILD_TYPE)
--- a/QTfrontend/CMakeLists.txt Tue Sep 05 17:02:08 2023 +0200
+++ b/QTfrontend/CMakeLists.txt Fri Jan 19 13:07:22 2024 +0100
@@ -14,7 +14,7 @@
include(CheckLibraryExists)
find_package(SDL2 REQUIRED CONFIG)
-find_package(SDL2_mixer REQUIRED CONFIG) #audio in SDLInteraction
+find_package(SDL2_mixer REQUIRED) #audio in SDLInteraction
include_directories(${SDL2_INCLUDE_DIRS})
include_directories(${SDL2_MIXER_INCLUDE_DIRS})
--- a/project_files/hwc/CMakeLists.txt Tue Sep 05 17:02:08 2023 +0200
+++ b/project_files/hwc/CMakeLists.txt Fri Jan 19 13:07:22 2024 +0100
@@ -6,6 +6,8 @@
find_package(SDL2_image 2 REQUIRED)
find_package(SDL2_ttf 2 REQUIRED)
+corrosion_import_crate(MANIFEST_PATH "${CMAKE_SOURCE_DIR}/rust/lib-hwengine-future/Cargo.toml")
+
#compile our rtl implementation
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/rtl)
include_directories(${PHYSFS_INCLUDE_DIR})
@@ -119,6 +121,7 @@
physfs
physlayer
m
+ hwengine_future
${HW_LINK_LIBS}
#TODO: add other libraries
)
--- a/rust/lib-hwengine-future/Cargo.toml Tue Sep 05 17:02:08 2023 +0200
+++ b/rust/lib-hwengine-future/Cargo.toml Fri Jan 19 13:07:22 2024 +0100
@@ -15,4 +15,4 @@
[lib]
name = "hwengine_future"
-crate-type = ["dylib"]
+crate-type = ["cdylib"]