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

2016-10-25 20:08:09 +02:00
parent 5dab4c743c
commit 8f7014af12
41 changed files with 3029 additions and 4 deletions
@@ -322,7 +322,7 @@ mac {

 official_server {
 	LIBPATH += pkth_stat/daemon_lib/lib
-	LIBS += -lpokerth_closed -lmysqlpp
+	LIBS += -lpokerth_dbofficial -lmysqlpp
 	DEFINES += POKERTH_OFFICIAL_SERVER
 }