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
@@ -1,8 +1,17 @@
 # QMake pro-file for PokerTH

 TEMPLATE = subdirs
-SUBDIRS = pokerth_protocol.pro pokerth_db.pro pokerth_lib.pro pokerth_game.pro
-!mac:!gui_800x480:!client {
+SUBDIRS = pokerth_protocol.pro pokerth_db.pro pokerth_lib.pro
+official_server {
+    SUBDIRS += pokerth_dbofficial.pro
+}
+qml-client{
+    SUBDIRS += pokerth_qml-client.pro
+}
+!qml-client{
+    SUBDIRS += pokerth_game.pro
+}
+!mac:!gui_800x480:!client:!qml-client {
 	SUBDIRS += pokerth_server.pro chatcleaner.pro
 }
 CONFIG += ordered