From d97e3d8ef6b7b659e1039f87d7b76cec873fdbef Mon Sep 17 00:00:00 2001 From: lotodore Date: Fri, 11 Apr 2008 08:32:48 +0000 Subject: [PATCH] Now using libcurl and zlib. --- pokerth_game.pro | 10 +++++++--- pokerth_lib.pro | 3 ++- pokerth_server.pro | 1 + src/pokerth.cpp | 2 ++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pokerth_game.pro b/pokerth_game.pro index fcc460e1..8a15dc37 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -258,10 +258,11 @@ TRANSLATIONS = \ ts/pokerth_START_HERE.ts win32{ + DEFINES += CURL_STATICLIB DEPENDPATH += src/net/win32/ src/core/win32 INCLUDEPATH += ../boost/ ../SDL/include ../SDL_mixer - INCLUDEPATH += ../SDL/include/SDL ../SDL_mixer/include ../OpenSSL/include - LIBPATH += ../boost/stage/lib ../OpenSSL/lib + INCLUDEPATH += ../SDL/include/SDL ../SDL_mixer/include ../OpenSSL/include ../curl/include + LIBPATH += ../boost/stage/lib ../OpenSSL/lib ../curl/lib ../zlib LIBS += -lpokerth_lib @@ -272,6 +273,7 @@ win32{ LIBS += -llibeay32 LIBS += -lssleay32 + LIBS += -llibcurl } win32-g++{ @@ -280,12 +282,14 @@ win32{ LIBPATH += ../SDL/lib ../SDL_mixer/lib LIBS += -lcrypto LIBS += -lssl + LIBS += -lcurl + LIBS += -lz LIBS += -llibboost_thread-mgw34-mt-1_35 LIBS += -llibboost_filesystem-mgw34-mt-1_35 LIBS += -llibboost_system-mgw34-mt-1_35 } - LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lsdl -lsdlmain -lsdl_mixer + LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lsdl -lsdlmain -lsdl_mixer -lwldap32 RC_FILE = pokerth.rc } !win32{ diff --git a/pokerth_lib.pro b/pokerth_lib.pro index 13201320..03f47987 100644 --- a/pokerth_lib.pro +++ b/pokerth_lib.pro @@ -176,10 +176,11 @@ SOURCES += \ src/gui/qttoolsinterface.cpp win32{ + DEFINES += CURL_STATICLIB DEPENDPATH += src/net/win32/ src/core/win32 SOURCES += src/net/win32/socket_helper.cpp \ src/net/win32/socket_startup.cpp - INCLUDEPATH += ../boost/ ../OpenSSL/include + INCLUDEPATH += ../boost/ ../OpenSSL/include ../curl/include } !win32{ DEPENDPATH += src/net/linux/ src/core/linux diff --git a/pokerth_server.pro b/pokerth_server.pro index 38bf1e54..35cdf7ee 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -112,6 +112,7 @@ SOURCES += \ src/core/common/loghelper_server.cpp win32 { + DEFINES += CURL_STATICLIB DEPENDPATH += src/net/win32/ src/core/win32 INCLUDEPATH += ../boost/ ../OpenSSL/include diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 348de52b..c2a17740 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -33,6 +33,7 @@ #include "configfile.h" #include +#include #include #include @@ -75,6 +76,7 @@ int main( int argc, char **argv ) //_CrtSetBreakAlloc(49937); socket_startup(); + curl_global_init(CURL_GLOBAL_NOTHING); /////// can be removed for non-qt-guis //////////// QApplication a( argc, argv );