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

decouple peglib from lib utility

Browse source
This commit is contained in:
Bruno Alexandre Rosa 2026-03-28 13:31:37 -03:00
parent 57f570852f
commit 96b978dd5b
6 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -5,5 +5,5 @@
path = doc/doxygen/theme path = doc/doxygen/theme
url = https://github.com/jothepro/doxygen-awesome-css.git url = https://github.com/jothepro/doxygen-awesome-css.git
[submodule "libcockatrice_utility/libcockatrice/utility/cpp-peglib"] [submodule "libcockatrice_utility/libcockatrice/utility/cpp-peglib"]
path = libcockatrice_utility/libcockatrice/utility/cpp-peglib path = thirdparty/cpp-peglib
url = https://github.com/yhirose/cpp-peglib url = https://github.com/yhirose/cpp-peglib

2
CMakeLists.txt
View file

@ -232,6 +232,8 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0" AND NOT EXISTS "${Protobuf_PROTOC
message(FATAL_ERROR "No protoc command found!") message(FATAL_ERROR "No protoc command found!")
endif() endif()
include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cpp-peglib)
#Find OpenSSL #Find OpenSSL
if(WIN32) if(WIN32)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)

2
cockatrice/src/filters/deck_filter_string.cpp
View file

@ -3,7 +3,7 @@
#include <QFileInfo> #include <QFileInfo>
#include <libcockatrice/card/database/card_database_manager.h> #include <libcockatrice/card/database/card_database_manager.h>
#include <libcockatrice/filters/filter_string.h> #include <libcockatrice/filters/filter_string.h>
#include <libcockatrice/utility/cpp-peglib/peglib.h> #include <peglib.h>
static peg::parser search(R"( static peg::parser search(R"(
Start <- QueryPartList Start <- QueryPartList

2
libcockatrice_filters/libcockatrice/filters/filter_string.cpp
View file

@ -5,7 +5,7 @@
#include <QRegularExpression> #include <QRegularExpression>
#include <QString> #include <QString>
#include <functional> #include <functional>
#include <libcockatrice/utility/cpp-peglib/peglib.h> #include <peglib.h>
static peg::parser search(R"( static peg::parser search(R"(
Start <- QueryPartList Start <- QueryPartList

3
libcockatrice_utility/libcockatrice/utility/expression.cpp
View file

@ -1,11 +1,10 @@
#include "expression.h" #include "expression.h"
#include "cpp-peglib/peglib.h"
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
#include <QtMath> #include <QtMath>
#include <functional> #include <functional>
#include <peglib.h>
peg::parser math(R"( peg::parser math(R"(
EXPRESSION <- P0 EXPRESSION <- P0

0
libcockatrice_utility/libcockatrice/utility/cpp-peglib → thirdparty/cpp-peglib vendored
View file