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

Workaround for issue #282 (should be backward compatible).

Browse Source
This commit is contained in:
lotodore
2015-01-06 15:55:29 +01:00
parent 507fbae5aa
commit bace7cd987
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_server.pro
+3
View File
@@ -176,6 +176,9 @@ unix : !mac {
LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib LIBPATH += lib $${PREFIX}/lib /opt/gsasl/lib
INCLUDEPATH += $${PREFIX}/include INCLUDEPATH += $${PREFIX}/include
# see issue https://github.com/pokerth/pokerth/issues/282
INCLUDEPATH += $${PREFIX}/include/libircclient
LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS) LIB_DIRS = $${PREFIX}/lib $${PREFIX}/lib64 $$system(qmake -query QT_INSTALL_LIBS)
BOOST_FS = boost_filesystem boost_filesystem-mt BOOST_FS = boost_filesystem boost_filesystem-mt
BOOST_THREAD = boost_thread boost_thread-mt BOOST_THREAD = boost_thread boost_thread-mt
src/net/common/ircthread.cpp
+2 -2
View File
@@ -32,14 +32,14 @@
#include <net/socket_helper.h> #include <net/socket_helper.h>
#include <net/ircthread.h> #include <net/ircthread.h>
#include <net/socket_msg.h> #include <net/socket_msg.h>
#include <libircclient/libircclient.h> #include <libircclient.h>
// We need to do the following to handle different versions of libircclient. // We need to do the following to handle different versions of libircclient.
// Sadly, libircclient doesn't have actual definitions for its versions in its headers. // Sadly, libircclient doesn't have actual definitions for its versions in its headers.
// However, we can use a definition that appeared in the same version we need // However, we can use a definition that appeared in the same version we need
// to check for. Hacky, but hey, it works. // to check for. Hacky, but hey, it works.
#ifdef LIBIRC_OPTION_SSL_NO_VERIFY #ifdef LIBIRC_OPTION_SSL_NO_VERIFY
#include <libircclient/libirc_rfcnumeric.h> #include <libirc_rfcnumeric.h>
#endif #endif
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>