cherry-pic conflict solved - Adding db backend of official server (now AGPL3).

This commit is contained in:
Lothar May
2016-10-25 20:08:09 +02:00
committed by Kai Philipp
parent 5dab4c743c
commit 8f7014af12
41 changed files with 3029 additions and 4 deletions
+1 -1
View File
@@ -601,7 +601,7 @@ mac {
OTHER_FILES += docs/infomessage-id-desc.txt
official_server {
LIBPATH += pkth_stat/daemon_lib/lib
LIBS += -lpokerth_closed \
LIBS += -lpokerth_dbofficial \
-lmysqlpp
DEFINES += POKERTH_OFFICIAL_SERVER
}