mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-27 00:14:40 -07:00
Merge branch 'master' into tooomm_ninja-win
This commit is contained in:
commit
0467031c6e
810 changed files with 52151 additions and 9604 deletions
|
|
@ -157,6 +157,9 @@ if [[ $MAKE_TEST ]]; then
|
|||
fi
|
||||
if [[ $USE_CCACHE == "1" ]]; then
|
||||
flags+=("-DUSE_CCACHE=1")
|
||||
# PCH-aware caching is required or ccache refuses to cache any TU that
|
||||
# consumes a precompiled header, silently recompiling everything on every run.
|
||||
ccache --set-config sloppiness=pch_defines,time_macros
|
||||
if [[ -n $CCACHE_SIZE ]]; then
|
||||
# Note, this setting persists after running the script
|
||||
ccache --max-size "$CCACHE_SIZE"
|
||||
|
|
@ -169,6 +172,7 @@ if [[ -n $PACKAGE_TYPE ]]; then
|
|||
fi
|
||||
if [[ $USE_VCPKG ]]; then
|
||||
flags+=("-DUSE_VCPKG=1")
|
||||
flags+=("-DVCPKG_INSTALL_OPTIONS=--x-abi-tools-use-exact-versions")
|
||||
# if [[ $MAKE_PACKAGE && $RUNNER_OS == Windows ]]; then
|
||||
# flags+=("-DVCPKG_APPLOCAL_DEPS=OFF") # disable copying of runtime DLLs into build output
|
||||
# fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue