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

Support Windows Debug Builds (#5242)

Browse source
This commit is contained in:
Zach H 2024-12-13 16:58:46 -05:00 • committed by GitHub
parent a5de633c64
commit 0463a6fd70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -140,10 +140,12 @@ endif()
# Define proper compilation flags # Define proper compilation flags
if(MSVC) if(MSVC)
# Visual Studio: Maximum optimization, disable warning C4251, establish C++17 compatibility # Visual Studio: Disable Warning C4251, C++17 compatibility, Multi-threaded Builds, Warn Detection, Unwind Semantics
set(CMAKE_CXX_FLAGS_RELEASE "/Ox /MD /wd4251 /Zc:__cplusplus /std:c++17 /permissive- /W4") set(CMAKE_CXX_FLAGS "/wd4251 /Zc:__cplusplus /std:c++17 /permissive- /W4 /MP /EHsc")
# Generate complete debugging information # Visual Studio: Maximum Optimization, Multi-threaded DLL
#set(CMAKE_CXX_FLAGS_DEBUG "/Zi") set(CMAKE_CXX_FLAGS_RELEASE "/Ox /MD")
# Visual Studio: No Optimization, Multi-threaded Debug DLL, Debug Symbols
set(CMAKE_CXX_FLAGS_DEBUG "/Od /MDd /Zi")
elseif(CMAKE_COMPILER_IS_GNUCXX) elseif(CMAKE_COMPILER_IS_GNUCXX)
# linux/gcc, bsd/gcc, windows/mingw # linux/gcc, bsd/gcc, windows/mingw
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)

2
cockatrice/src/game/cards/card_database_model.cpp
View file

@ -176,7 +176,7 @@ void CardDatabaseDisplayModel::fetchMore(const QModelIndex &index)
int CardDatabaseDisplayModel::rowCount(const QModelIndex &parent) const int CardDatabaseDisplayModel::rowCount(const QModelIndex &parent) const
{ {
return qMin(QSortFilterProxyModel::rowCount(parent), loadedRowCount); return QSortFilterProxyModel::rowCount(parent);
} }
bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const

2
vcpkg

@ -1 +1 @@
Subproject commit bb1ca2757bca8f8e372a4deb35943828e3b0d155 Subproject commit 8ec31e98fb07e3f9c2e5b6aed0737a76a693fc72