From 798de7589f2f3d0a9b0f8cf971f672006bfa3f93 Mon Sep 17 00:00:00 2001 From: BagelSketches Date: Thu, 3 Jul 2025 16:48:29 +1000 Subject: [PATCH] Added QTLibs directory to cpack --- .github/workflows/ci.yml | 12 ++++++------ CMakeLists.txt | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cdd7c579..9fb2cc99 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,12 @@ jobs: - name: Build (CMake) run: cmake --build build --verbose - + - name: Pack QT Libs(windows) + if: ${{ matrix.os == 'windows-latest' }} + run: | + cd build + mkdir QTLibs + windeployqt isle-config.exe --dir QTLibs - name: Package (CPack) if: ${{ !matrix.n3ds }} @@ -144,11 +149,6 @@ jobs: cd build mkdir dist mv *.3dsx dist/ - - name: Pack stuff(windows) - if: ${{ matrix.os == 'windows-latest' }} - run: | - cd build/dist - windeployqt isle-config.exe - name: Upload Build Artifacts uses: actions/upload-artifact@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3808cbe1..cfa3c63e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -668,6 +668,10 @@ if(NINTENDO_3DS) ICON "ISLE/res/3ds/isle.png" ) +if(WIN32){ + install(DIRECTORY "$/QTLibs" DESTINATION "${CMAKE_INSTALL_BINDIR}") +} + ctr_create_3dsx(isle SMDH isle.smdh) install(FILES "$/isle.3dsx" DESTINATION "${CMAKE_INSTALL_BINDIR}") endif()