mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-27 08:24:39 -07:00
Compare commits
5 commits
9274eb194f
...
8990b6103f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8990b6103f | ||
|
|
fa0d954afa | ||
|
|
7b452b923f | ||
|
|
88b1d753c6 | ||
|
|
efe7a8234b |
3 changed files with 4 additions and 8 deletions
|
|
@ -285,7 +285,7 @@ echo "::endgroup::"
|
|||
# Build
|
||||
echo "::group::Build project"
|
||||
echo "Running CMake with following build flags: ${buildflags[*]}"
|
||||
cmake --build . "${buildflags[@]}"
|
||||
cmake --build . --verbose "${buildflags[@]}"
|
||||
echo "::endgroup::"
|
||||
|
||||
# Post-build
|
||||
|
|
|
|||
2
.github/workflows/desktop-build.yml
vendored
2
.github/workflows/desktop-build.yml
vendored
|
|
@ -419,7 +419,7 @@ jobs:
|
|||
- name: "[Windows] Install NSIS"
|
||||
if: matrix.os == 'Windows'
|
||||
shell: bash
|
||||
run: choco install nsis
|
||||
run: choco install nsis --no-progress
|
||||
|
||||
- name: "Setup vcpkg cache"
|
||||
id: vcpkg-cache
|
||||
|
|
|
|||
|
|
@ -172,10 +172,6 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) # Linux/GCC, BSD/GCC, Windows/MinGW
|
|||
set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0 -Wall -Wextra")
|
||||
endif()
|
||||
|
||||
if(APPLE) # macOS
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++20") # still needed?
|
||||
endif()
|
||||
|
||||
set(ADDITIONAL_DEBUG_FLAGS
|
||||
-Wcast-align
|
||||
-Wmissing-declarations
|
||||
|
|
@ -339,8 +335,8 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libco
|
|||
add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility)
|
||||
|
||||
if(WITH_CLIENT
|
||||
OR WITH_ORACLE
|
||||
OR WITH_SERVER
|
||||
OR WITH_ORACLE
|
||||
OR WITH_SERVER
|
||||
)
|
||||
add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue