mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-04 20:43:54 -07:00
Compare commits
2 commits
d2732ac742
...
36aba81b1b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
36aba81b1b | ||
|
|
f9fb03b26b |
2 changed files with 8 additions and 5 deletions
12
.github/workflows/desktop-build.yml
vendored
12
.github/workflows/desktop-build.yml
vendored
|
|
@ -270,7 +270,7 @@ jobs:
|
||||||
override_target: 13
|
override_target: 13
|
||||||
make_package: 1
|
make_package: 1
|
||||||
package_suffix: "-macOS13_Intel"
|
package_suffix: "-macOS13_Intel"
|
||||||
qt_version: 6.10.*
|
qt_version: 6.11.*
|
||||||
qt_arch: clang_64
|
qt_arch: clang_64
|
||||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||||
cmake_generator: Ninja
|
cmake_generator: Ninja
|
||||||
|
|
@ -284,7 +284,7 @@ jobs:
|
||||||
type: Release
|
type: Release
|
||||||
make_package: 1
|
make_package: 1
|
||||||
package_suffix: "-macOS14"
|
package_suffix: "-macOS14"
|
||||||
qt_version: 6.10.*
|
qt_version: 6.11.*
|
||||||
qt_arch: clang_64
|
qt_arch: clang_64
|
||||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||||
cmake_generator: Ninja
|
cmake_generator: Ninja
|
||||||
|
|
@ -298,7 +298,7 @@ jobs:
|
||||||
type: Release
|
type: Release
|
||||||
make_package: 1
|
make_package: 1
|
||||||
package_suffix: "-macOS15"
|
package_suffix: "-macOS15"
|
||||||
qt_version: 6.10.*
|
qt_version: 6.11.*
|
||||||
qt_arch: clang_64
|
qt_arch: clang_64
|
||||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||||
cmake_generator: Ninja
|
cmake_generator: Ninja
|
||||||
|
|
@ -310,7 +310,7 @@ jobs:
|
||||||
soc: Apple
|
soc: Apple
|
||||||
xcode: "16.4"
|
xcode: "16.4"
|
||||||
type: Debug
|
type: Debug
|
||||||
qt_version: 6.10.*
|
qt_version: 6.11.*
|
||||||
qt_arch: clang_64
|
qt_arch: clang_64
|
||||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||||
cmake_generator: Ninja
|
cmake_generator: Ninja
|
||||||
|
|
@ -322,7 +322,7 @@ jobs:
|
||||||
type: Release
|
type: Release
|
||||||
make_package: 1
|
make_package: 1
|
||||||
package_suffix: "-Win10"
|
package_suffix: "-Win10"
|
||||||
qt_version: 6.10.*
|
qt_version: 6.11.*
|
||||||
qt_arch: win64_msvc2022_64
|
qt_arch: win64_msvc2022_64
|
||||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||||
cmake_generator: "Visual Studio 17 2022"
|
cmake_generator: "Visual Studio 17 2022"
|
||||||
|
|
@ -409,6 +409,8 @@ jobs:
|
||||||
if: matrix.os == 'Windows'
|
if: matrix.os == 'Windows'
|
||||||
uses: jurplel/install-qt-action@v4
|
uses: jurplel/install-qt-action@v4
|
||||||
with:
|
with:
|
||||||
|
# qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released
|
||||||
|
aqtsource: git+https://github.com/miurahr/aqtinstall.git
|
||||||
version: ${{ steps.resolve_qt_version.outputs.version }}
|
version: ${{ steps.resolve_qt_version.outputs.version }}
|
||||||
arch: ${{matrix.qt_arch}}
|
arch: ${{matrix.qt_arch}}
|
||||||
modules: ${{matrix.qt_modules}}
|
modules: ${{matrix.qt_modules}}
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ const QMap<QString, CardSet::Priority> setTypePriorities{
|
||||||
{"archenemy", CardSet::PriorityReprint},
|
{"archenemy", CardSet::PriorityReprint},
|
||||||
{"arsenal", CardSet::PriorityReprint},
|
{"arsenal", CardSet::PriorityReprint},
|
||||||
{"box", CardSet::PriorityReprint},
|
{"box", CardSet::PriorityReprint},
|
||||||
|
{"eternal", CardSet::PriorityReprint},
|
||||||
{"from_the_vault", CardSet::PriorityReprint},
|
{"from_the_vault", CardSet::PriorityReprint},
|
||||||
{"masterpiece", CardSet::PriorityReprint},
|
{"masterpiece", CardSet::PriorityReprint},
|
||||||
{"masters", CardSet::PriorityReprint},
|
{"masters", CardSet::PriorityReprint},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue