diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ab97f90..9a514797 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,7 @@ jobs: run: cmake --build build --verbose - name: Package (CPack) - if: ${{ !matrix.n3ds && !matrix.xbox-one }} + if: ${{ !matrix.n3ds }} run: | cd build cpack . @@ -144,15 +144,6 @@ jobs: cd build mkdir dist mv *.3dsx dist/ - - - name: Package (Xbox One) - if: ${{ matrix.xbox-one }} - run: | - cd build - mkdir dist - mv AppPackages/isle/*/Dependencies/x64/Microsoft.VCLibs.x64.*.14.00.appx dist/ - mv AppPackages/isle/*/*.msix dist/ || true - mv AppPackages/isle/*/*.msixbundle dist/ || true - name: Upload Build Artifacts uses: actions/upload-artifact@v4 @@ -162,9 +153,6 @@ jobs: build/dist/isle-* build/dist/*.AppImage build/dist/*.3dsx - build/dist/*.msix - build/dist/*.msixbundle - build/dist/Microsoft.VCLibs.x64.*.14.00.appx flatpak: name: "Flatpak (${{ matrix.arch }})" diff --git a/CMakeLists.txt b/CMakeLists.txt index 8409a88e..1d6aa738 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -695,14 +695,20 @@ endif() string(REPLACE ";" "-" ISLE_CPUS_STRING "${ISLE_CPUS}") string(TOLOWER "${ISLE_CPUS_STRING}" ISLE_CPUS_STRING) -set(ISLE_PACKAGE_NAME "${CMAKE_SYSTEM_NAME}-${ISLE_CPUS_STRING}" CACHE STRING "Platform name of the package") +if (WINDOWS_STORE) + set(ISLE_PACKAGE_NAME "Xbox_One_Series_XS-${ISLE_CPUS_STRING}" CACHE STRING "Platform name of the package") +else() + set(ISLE_PACKAGE_NAME "${CMAKE_SYSTEM_NAME}-${ISLE_CPUS_STRING}" CACHE STRING "Platform name of the package") +endif() if(BUILD_SHARED_LIBS) list(APPEND install_extra_targets lego1) endif() -install(TARGETS isle ${install_extra_targets} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -) +if (NOT (NINTENDO_3DS OR WINDOWS_STORE)) + install(TARGETS isle ${install_extra_targets} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ) +endif() if (ISLE_BUILD_CONFIG) if(WIN32) find_program(WINDEPLOYQT_EXECUTABLE windeployqt)