diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a514797..26d7fe64 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: include: - { name: 'Linux', os: 'ubuntu-latest', generator: 'Ninja', dx5: false, config: true, linux: true, werror: true, clang-tidy: true } - { name: 'MSVC (x86)', os: 'windows-latest', generator: 'Ninja', dx5: true, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64_x86' } - - { name: 'MSVC (x64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64' } + - { name: 'MSVC (x64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64' } - { name: 'MSVC (arm64)', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, msvc: true, werror: false, clang-tidy: false, vc-arch: 'amd64_arm64' } - { name: 'msys2 mingw32', os: 'windows-latest', generator: 'Ninja', dx5: false, config: false, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw32', msys-env: 'mingw-w64-i686', shell: 'msys2 {0}' } - { name: 'msys2 mingw64', os: 'windows-latest', generator: 'Ninja', dx5: false, config: true, mingw: true, werror: true, clang-tidy: true, msystem: 'mingw64', msys-env: 'mingw-w64-x86_64', shell: 'msys2 {0}' } @@ -107,7 +107,7 @@ jobs: -Werror=dev - name: Build (CMake) - run: cmake --build build --verbose + run: cmake --build build --verbose --config Release - name: Package (CPack) if: ${{ !matrix.n3ds }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d6aa738..cfc0c1c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -757,7 +757,7 @@ if(NINTENDO_3DS) install(FILES "$/isle.3dsx" DESTINATION "${CMAKE_INSTALL_BINDIR}") endif() if(WINDOWS_STORE) - file(GLOB MSIX_FILES "${CMAKE_BINARY_DIR}/AppPackages/isle/*/Dependencies/x64/Microsoft.VCLibs.x64.Debug.14.00.appx" + file(GLOB MSIX_FILES "${CMAKE_BINARY_DIR}/AppPackages/isle/*/Dependencies/x64/Microsoft.VCLibs.x64*.14.00.appx" "${CMAKE_BINARY_DIR}/AppPackages/isle/*/*.msix" "${CMAKE_BINARY_DIR}/AppPackages/isle/*/*.msixbundle" )