jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 11:38:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[WIP] Basic mtgjsonv4 support (#3458)

Browse source 
* Basic mtgjsonv4 support

* Fix set type

* [WIP] Oracle: use zx instead of zip

* clanfigy fixes

* Fix reading last block of xz

* Added back zip support

* [WIP] adding xz on ci + fixes

* typo

* resolve conflict

* Make gcc an happy puppy

* test appveyor build

* appveyor maybe

* Appveyor: add  xz bindir

* Update ssl version (the old one is not available anymore)

* Windows is a really shitty platform to code on.

* test vcpkg

* again

* gosh

* nowarn

* warning 2

* static

* Maybe

* cmake fix

* fsck this pain

* FindWin32SslRuntime: add vcpkg path

* Appveyor: cache support, force usable of openssl from vcpkg

* updated as suggested

* ouch

* Import card uuids and expose this property as !uuid! for card image download

* Minor style fixes

* address changed URL
This commit is contained in:
ctrlaltca 2018-12-21 00:05:03 +01:00 • committed by Zach H
parent cee69705d8
commit 65f41e520e
22 changed files with 419 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.travis.yml
View file

@ -15,6 +15,7 @@ matrix:
packages:
- libprotobuf-dev
- protobuf-compiler
- liblzma-dev
- qt5-default
- qttools5-dev
- qttools5-dev-tools
@ -87,9 +88,7 @@ matrix:
env: HOMEBREW_NO_AUTO_UPDATE=1
cache: ccache
before_install:
- brew install ccache
- brew install protobuf
- brew install qt
- brew install ccache protobuf qt xz
script: bash ./.ci/travis-compile.sh --server --install --debug
- name: macOS (Release)
@ -99,9 +98,7 @@ matrix:
env: HOMEBREW_NO_AUTO_UPDATE=1
cache: ccache
before_install:
- brew install ccache
- brew install protobuf
- brew install qt
- brew install ccache protobuf qt xz
script: bash ./.ci/travis-compile.sh --server --package "$TRAVIS_OS_NAME" --release