Now using libcurl and zlib.
This commit is contained in:
+7
-3
@@ -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{
|
||||
|
||||
+2
-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "configfile.h"
|
||||
#include <net/socket_startup.h>
|
||||
|
||||
#include <curl/curl.h>
|
||||
#include <QtGui>
|
||||
#include <QtCore>
|
||||
|
||||
@@ -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 );
|
||||
|
||||
Reference in New Issue
Block a user