From 99b7255c66dbacfb9e12daf47325022e9508814a Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sat, 29 Jun 2024 14:58:15 +0000 Subject: [PATCH] Fix the Windows build (#18) Updates libphysis to remove the cdylib which was causing linking troubles, update DLLs --- .github/workflows/main.yml | 5 ++++- external/CMakeLists.txt | 3 ++- external/libphysis | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 400a2d4..0bb6837 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -250,7 +250,10 @@ jobs: Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/Kirigami.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/KirigamiDelegates.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/KirigamiPlatform.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin - + Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/KirigamiPrimitives.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin + Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/KirigamiDialogs.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin + Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/KirigamiLayouts.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin + Copy-Item -Force -Recurse -Path ${{ steps.strings.outputs.prefix-dir }}\lib\qml\* -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/qml/ - name: Remove extra files diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index fa867de..4809e2a 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -13,7 +13,8 @@ find_package(Corrosion REQUIRED) corrosion_import_crate(MANIFEST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/Cargo.toml NO_DEFAULT_FEATURES - FEATURES game_install visual_data logging) # FIXME: split visual_data? we only need texture decompression + FEATURES game_install visual_data logging + CRATE_TYPES staticlib) # FIXME: split visual_data? we only need texture decompression add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libphysis/logger EXCLUDE_FROM_ALL) target_include_directories(physis INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libphysis/target/public) diff --git a/external/libphysis b/external/libphysis index edc63df..0b09892 160000 --- a/external/libphysis +++ b/external/libphysis @@ -1 +1 @@ -Subproject commit edc63df3afa9761f82c4c02e5a05844622cafba7 +Subproject commit 0b098928db2fb8cfbffdef9b9a420847bdde1e8e