sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New external dependency: tinyxml.

Browse Source
This commit is contained in:
lotodore
2011-02-08 14:40:14 +00:00
parent dd1f46177c
commit 48f87f0dd8
6 changed files with 28 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
INSTALL
+3 -2
View File
@@ -4,17 +4,18 @@ Requirements
To compile PokerTH you need following libs: To compile PokerTH you need following libs:
Linux: Linux:
- Qt version >= 4.4.3, 4.5.1 recommended --> http://qtsoftware.com/ - Qt version >= 4.4.3, 4.7.1 recommended --> http://qtsoftware.com/
- zlib version 1.2.3 --> http://www.zlib.net/ - zlib version 1.2.3 --> http://www.zlib.net/
- libcurl version >= 7.16 --> http://curl.haxx.se/ - libcurl version >= 7.16 --> http://curl.haxx.se/
- gnutls (e.g. version 2.2.2) --> http://www.gnu.org/software/gnutls/ - gnutls (e.g. version 2.2.2) --> http://www.gnu.org/software/gnutls/
- libboost_thread, libboost_filesystem, libboost_datetime, libboost_program_options, - libboost_thread, libboost_filesystem, libboost_datetime, libboost_program_options,
libboost_iostreams, libboost_asio, libboost_regex libboost_iostreams, libboost_asio, libboost_regex
(version >= 1.36, 1.38.0 recommended) --> http://www.boost.org/ (version >= 1.36, 1.45.0 recommended) --> http://www.boost.org/
NOTE: Please do not use boost 1.39.0 for the dedicated server, due to bug NOTE: Please do not use boost 1.39.0 for the dedicated server, due to bug
https://svn.boost.org/trac/boost/ticket/3095 https://svn.boost.org/trac/boost/ticket/3095
- libSDL_mixer, libSDL --> http://www.libsdl.org/ - libSDL_mixer, libSDL --> http://www.libsdl.org/
- libSQLite >= 3.0 --> http://sqlite.org/ - libSQLite >= 3.0 --> http://sqlite.org/
- libtinyxml > 2.0 --> http://www.sourceforge.net/projects/tinyxml
NOTE: PokerTH might compile with libboost < 1.36 but occasional crashes will occur! NOTE: PokerTH might compile with libboost < 1.36 but occasional crashes will occur!
chatcleaner.pro
+4 -9
View File
@@ -8,16 +8,15 @@ QMAKE_CXXFLAGS += -std=gnu++0x
TARGET = chatcleaner TARGET = chatcleaner
CONFIG += console CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle
DEFINES += TIXML_USE_STL
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
TEMPLATE = app TEMPLATE = app
INCLUDEPATH += src/ \ INCLUDEPATH += src/ \
src/third_party/tinyxml \
src/chatcleaner/ \ src/chatcleaner/ \
src/third_party/asn1/ \ src/third_party/asn1/ \
src/net/ src/net/
DEPENDPATH += src/ \ DEPENDPATH += src/ \
src/third_party/tinyxml \
src/chatcleaner/ \ src/chatcleaner/ \
src/third_party/asn1/ \ src/third_party/asn1/ \
src/net/ src/net/
@@ -27,10 +26,6 @@ SOURCES += chatcleaner.cpp \
badwordcheck.cpp \ badwordcheck.cpp \
textfloodcheck.cpp \ textfloodcheck.cpp \
cleanerconfig.cpp \ cleanerconfig.cpp \
tinystr.cpp \
tinyxml.cpp \
tinyxmlerror.cpp \
tinyxmlparser.cpp \
capsfloodcheck.cpp \ capsfloodcheck.cpp \
letterrepeatingcheck.cpp \ letterrepeatingcheck.cpp \
urlcheck.cpp urlcheck.cpp
@@ -39,14 +34,14 @@ HEADERS += cleanerserver.h \
badwordcheck.h \ badwordcheck.h \
textfloodcheck.h \ textfloodcheck.h \
cleanerconfig.h \ cleanerconfig.h \
tinyxml.h \
tinystr.h \
capsfloodcheck.h \ capsfloodcheck.h \
letterrepeatingcheck.h \ letterrepeatingcheck.h \
urlcheck.h urlcheck.h
LIBPATH += lib LIBPATH += lib
LIBS += -lpokerth_lib \ LIBS += -lpokerth_lib \
-lpokerth_protocol -lpokerth_protocol \
-ltinyxml
win32 { win32 {
LIBPATH += ../boost/stage/lib LIBPATH += ../boost/stage/lib
INCLUDEPATH += ../boost/ INCLUDEPATH += ../boost/
pokerth_db.pro
+1 -1
View File
@@ -12,7 +12,7 @@ UI_DIR = uics
TARGET = lib/pokerth_db TARGET = lib/pokerth_db
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
DEFINES += ENABLE_IPV6 DEFINES += ENABLE_IPV6 TIXML_USE_STL
QT -= core gui QT -= core gui
QMAKE_CXXFLAGS += -std=gnu++0x QMAKE_CXXFLAGS += -std=gnu++0x
#PRECOMPILED_HEADER = src/pch_lib.h #PRECOMPILED_HEADER = src/pch_lib.h
pokerth_game.pro
+14 -20
View File
@@ -19,7 +19,7 @@ QMAKE_CXXFLAGS += -std=gnu++0x
UI_DIR = uics UI_DIR = uics
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
DEFINES += ENABLE_IPV6 DEFINES += ENABLE_IPV6 TIXML_USE_STL
DEFINES += PREFIX=\"$${PREFIX}\" DEFINES += PREFIX=\"$${PREFIX}\"
TARGET = pokerth TARGET = pokerth
@@ -33,7 +33,6 @@ INCLUDEPATH += . \
src/engine/local_engine \ src/engine/local_engine \
src/engine/network_engine \ src/engine/network_engine \
src/config \ src/config \
src/third_party/tinyxml \
src/third_party/asn1 \ src/third_party/asn1 \
src/gui/qt \ src/gui/qt \
src/gui/qt/connecttoserverdialog \ src/gui/qt/connecttoserverdialog \
@@ -44,7 +43,7 @@ INCLUDEPATH += . \
src/gui/qt/qttools/qthelper \ src/gui/qt/qttools/qthelper \
src/gui/qt/gametable \ src/gui/qt/gametable \
src/gui/qt/gametable/startsplash \ src/gui/qt/gametable/startsplash \
src/gui/qt/gametable/log \ src/gui/qt/gametable/log \
src/gui/qt/aboutpokerth \ src/gui/qt/aboutpokerth \
src/gui/qt/createnetworkgamedialog \ src/gui/qt/createnetworkgamedialog \
src/gui/qt/createinternetgamedialog \ src/gui/qt/createinternetgamedialog \
@@ -71,7 +70,6 @@ DEPENDPATH += . \
src/gui \ src/gui \
src/net \ src/net \
src/core/common \ src/core/common \
src/third_party/tinyxml \
src/engine/local_engine \ src/engine/local_engine \
src/engine/network_engine \ src/engine/network_engine \
src/gui/qt \ src/gui/qt \
@@ -80,7 +78,7 @@ DEPENDPATH += . \
src/gui/qt/chattools \ src/gui/qt/chattools \
src/gui/qt/gametable \ src/gui/qt/gametable \
src/gui/qt/gametable/startsplash \ src/gui/qt/gametable/startsplash \
src/gui/qt/gametable/log \ src/gui/qt/gametable/log \
src/gui/qt/aboutpokerth \ src/gui/qt/aboutpokerth \
src/gui/qt/connecttoserverdialog \ src/gui/qt/connecttoserverdialog \
src/gui/qt/createinternetgamedialog \ src/gui/qt/createinternetgamedialog \
@@ -131,8 +129,6 @@ HEADERS += src/game.h \
src/net/socket_msg.h \ src/net/socket_msg.h \
src/net/socket_startup.h \ src/net/socket_startup.h \
src/net/net_helper.h \ src/net/net_helper.h \
src/third_party/tinyxml/tinystr.h \
src/third_party/tinyxml/tinyxml.h \
src/engine/local_engine/cardsvalue.h \ src/engine/local_engine/cardsvalue.h \
src/engine/local_engine/localboard.h \ src/engine/local_engine/localboard.h \
src/engine/local_engine/localenginefactory.h \ src/engine/local_engine/localenginefactory.h \
@@ -199,7 +195,7 @@ HEADERS += src/game.h \
src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.h \ src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.h \
src/engine/local_engine/replay.h \ src/engine/local_engine/replay.h \
src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.h \ src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.h \
src/gui/qt/gametable/myslider.h src/gui/qt/gametable/myslider.h
FORMS += src/gui/qt/gametable.ui \ FORMS += src/gui/qt/gametable.ui \
src/gui/qt/aboutpokerth.ui \ src/gui/qt/aboutpokerth.ui \
src/gui/qt/connecttoserverdialog.ui \ src/gui/qt/connecttoserverdialog.ui \
@@ -233,7 +229,7 @@ SOURCES += src/pokerth.cpp \
src/gui/qt/gametable/myrighttabwidget.cpp \ src/gui/qt/gametable/myrighttabwidget.cpp \
src/gui/qt/gametable/mylefttabwidget.cpp \ src/gui/qt/gametable/mylefttabwidget.cpp \
src/gui/qt/gametable/startsplash/startsplash.cpp \ src/gui/qt/gametable/startsplash/startsplash.cpp \
src/gui/qt/gametable/log/guilog.cpp \ src/gui/qt/gametable/log/guilog.cpp \
src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp \ src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp \
src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp \ src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp \
src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp \ src/gui/qt/createnetworkgamedialog/createnetworkgamedialogimpl.cpp \
@@ -267,7 +263,7 @@ SOURCES += src/pokerth.cpp \
src/gui/qt/gamelobbydialog/mygamelistsortfilterproxymodel.cpp \ src/gui/qt/gamelobbydialog/mygamelistsortfilterproxymodel.cpp \
src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp \ src/gui/qt/internetgamelogindialog/internetgamelogindialogimpl.cpp \
src/engine/local_engine/replay.cpp \ src/engine/local_engine/replay.cpp \
src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp
TRANSLATIONS = ts/pokerth_af.ts \ TRANSLATIONS = ts/pokerth_af.ts \
ts/pokerth_bg.ts \ ts/pokerth_bg.ts \
ts/pokerth_zhcn.ts \ ts/pokerth_zhcn.ts \
@@ -325,15 +321,11 @@ win32 {
LIBS += -lSDL_mixer \ LIBS += -lSDL_mixer \
-lSDL \ -lSDL \
-lSDLmain \ -lSDLmain \
-lz -ltinyxml \
-lz \
-lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn
debug:LIBPATH += debug/lib debug:LIBPATH += debug/lib
release:LIBPATH += release/lib release:LIBPATH += release/lib
pkth_win64 {
LIBS += -lcrypto -lssl -llibeay32 -lssleay32 -lgsasl
}
!pkth_win64 {
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn
}
win32-g++-cross { win32-g++-cross {
LIBS += -lsqlite3 LIBS += -lsqlite3
LIBS += -lntlm -lmikmod -lddraw -ldxguid -lsmpeg -lvorbisfile -lvorbis -logg LIBS += -lntlm -lmikmod -lddraw -ldxguid -lsmpeg -lvorbisfile -lvorbis -logg
@@ -447,10 +439,11 @@ unix:!mac {
UNAME = $$system(uname -s) UNAME = $$system(uname -s)
BSD = $$find(UNAME, "BSD") BSD = $$find(UNAME, "BSD")
kFreeBSD = $$find(UNAME, "kFreeBSD") kFreeBSD = $$find(UNAME, "kFreeBSD")
LIBS += -lsqlite3 LIBS += -lsqlite3 \
-ltinyxml
LIBS += $$BOOST_LIBS LIBS += $$BOOST_LIBS
LIBS += -lSDL \ LIBS += -lSDL \
-lSDL_mixer \ -lSDL_mixer \
-lgsasl -lgsasl
!isEmpty( BSD ):isEmpty( kFreeBSD ):LIBS += -lcrypto !isEmpty( BSD ):isEmpty( kFreeBSD ):LIBS += -lcrypto
else:LIBS += -lgnutls-openssl \ else:LIBS += -lgnutls-openssl \
@@ -512,6 +505,7 @@ mac {
LIBS += -lcrypto \ LIBS += -lcrypto \
-lssl \ -lssl \
-lsqlite3 \ -lsqlite3 \
-ltinyxml \
-lz \ -lz \
-framework \ -framework \
Carbon Carbon
pokerth_lib.pro
+1 -9
View File
@@ -12,7 +12,7 @@ UI_DIR = uics
TARGET = lib/pokerth_lib TARGET = lib/pokerth_lib
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
DEFINES += ENABLE_IPV6 DEFINES += ENABLE_IPV6 TIXML_USE_STL
QT -= core gui QT -= core gui
QMAKE_CXXFLAGS += -std=gnu++0x QMAKE_CXXFLAGS += -std=gnu++0x
#PRECOMPILED_HEADER = src/pch_lib.h #PRECOMPILED_HEADER = src/pch_lib.h
@@ -27,7 +27,6 @@ INCLUDEPATH += . \
src/engine/local_engine \ src/engine/local_engine \
src/engine/network_engine \ src/engine/network_engine \
src/config \ src/config \
src/third_party/tinyxml \
src/third_party/libircclient/include \ src/third_party/libircclient/include \
src/third_party/asn1 \ src/third_party/asn1 \
src/core src/core
@@ -42,7 +41,6 @@ DEPENDPATH += . \
src/gui/generic \ src/gui/generic \
src/net \ src/net \
src/core/common \ src/core/common \
src/third_party/tinyxml \
src/third_party/libircclient \ src/third_party/libircclient \
src/third_party/libircclient/src \ src/third_party/libircclient/src \
src/third_party/libircclient/include \ src/third_party/libircclient/include \
@@ -108,8 +106,6 @@ HEADERS += \
src/net/downloadhelper.h \ src/net/downloadhelper.h \
src/net/encodedpacket.h \ src/net/encodedpacket.h \
src/net/internalchatcleanerpacket.h \ src/net/internalchatcleanerpacket.h \
src/third_party/tinyxml/tinystr.h \
src/third_party/tinyxml/tinyxml.h \
src/third_party/libircclient/include/libircclient.h \ src/third_party/libircclient/include/libircclient.h \
src/third_party/libircclient/include/config.h \ src/third_party/libircclient/include/config.h \
src/engine/local_engine/cardsvalue.h \ src/engine/local_engine/cardsvalue.h \
@@ -155,10 +151,6 @@ SOURCES += \
src/core/common/crypthelper.cpp \ src/core/common/crypthelper.cpp \
src/core/common/avatarmanager.cpp \ src/core/common/avatarmanager.cpp \
src/core/common/pokerthexception.cpp \ src/core/common/pokerthexception.cpp \
src/third_party/tinyxml/tinystr.cpp \
src/third_party/tinyxml/tinyxml.cpp \
src/third_party/tinyxml/tinyxmlerror.cpp \
src/third_party/tinyxml/tinyxmlparser.cpp \
src/third_party/libircclient/src/libircclient.c \ src/third_party/libircclient/src/libircclient.c \
src/engine/local_engine/cardsvalue.cpp \ src/engine/local_engine/cardsvalue.cpp \
src/engine/local_engine/localboard.cpp \ src/engine/local_engine/localboard.cpp \
pokerth_server.pro
+5 -12
View File
@@ -14,7 +14,7 @@ TARGET = bin/pokerth_server
MOC_DIR = mocs MOC_DIR = mocs
OBJECTS_DIR = obj OBJECTS_DIR = obj
DEFINES += POKERTH_DEDICATED_SERVER DEFINES += POKERTH_DEDICATED_SERVER
DEFINES += ENABLE_IPV6 DEFINES += ENABLE_IPV6 TIXML_USE_STL
DEFINES += PREFIX=\"$${PREFIX}\" DEFINES += PREFIX=\"$${PREFIX}\"
QT -= core gui QT -= core gui
QMAKE_CXXFLAGS += -std=gnu++0x QMAKE_CXXFLAGS += -std=gnu++0x
@@ -31,7 +31,6 @@ INCLUDEPATH += . \
src/engine/local_engine \ src/engine/local_engine \
src/engine/network_engine \ src/engine/network_engine \
src/config \ src/config \
src/third_party/tinyxml \
src/third_party/asn1 \ src/third_party/asn1 \
src/core \ src/core \
@@ -45,7 +44,6 @@ DEPENDPATH += . \
src/gui/generic \ src/gui/generic \
src/net \ src/net \
src/core/common \ src/core/common \
src/third_party/tinyxml \
src/engine/local_engine \ src/engine/local_engine \
src/engine/network_engine \ src/engine/network_engine \
src/net/common \ src/net/common \
@@ -78,8 +76,6 @@ HEADERS += \
src/net/socket_msg.h \ src/net/socket_msg.h \
src/net/socket_startup.h \ src/net/socket_startup.h \
src/net/net_helper.h \ src/net/net_helper.h \
src/third_party/tinyxml/tinystr.h \
src/third_party/tinyxml/tinyxml.h \
src/core/pokerthexception.h \ src/core/pokerthexception.h \
src/core/convhelper.h \ src/core/convhelper.h \
src/core/loghelper.h \ src/core/loghelper.h \
@@ -130,12 +126,7 @@ win32 {
debug:LIBPATH += debug/lib debug:LIBPATH += debug/lib
release:LIBPATH += release/lib release:LIBPATH += release/lib
pkth_win64 { LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn -ltinyxml
LIBS += -lcrypto -lssl -llibeay32 -lssleay32 -lgsasl
}
!pkth_win64 {
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn
}
win32-g++-cross { win32-g++-cross {
LIBS += -lsqlite3 LIBS += -lsqlite3
LIBS += -lntlm LIBS += -lntlm
@@ -272,7 +263,8 @@ unix : !mac {
kFreeBSD = $$find(UNAME, "kFreeBSD") kFreeBSD = $$find(UNAME, "kFreeBSD")
LIBS += $$BOOST_LIBS LIBS += $$BOOST_LIBS
LIBS += -lsqlite3 LIBS += -lsqlite3 \
-ltinyxml
LIBS += -lgsasl LIBS += -lgsasl
!isEmpty( BSD ): isEmpty( kFreeBSD ){ !isEmpty( BSD ): isEmpty( kFreeBSD ){
LIBS += -lcrypto -liconv LIBS += -lcrypto -liconv
@@ -316,6 +308,7 @@ mac {
# libraries installed on every mac # libraries installed on every mac
LIBS += -lsqlite3 LIBS += -lsqlite3
LIBS += -ltinyxml
LIBS += -lcrypto -lssl -lz -liconv LIBS += -lcrypto -lssl -lz -liconv
# set the application icon # set the application icon
RC_FILE = pokerth.icns RC_FILE = pokerth.icns