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

Switching to openssl on Windows for Windows 8 compatibility (gcrypt crashes on Win8).

Browse Source
This commit is contained in:
lotodore
2012-12-25 15:33:01 +01:00
parent 45a5c7cef8
commit 66d9ff7195
3 changed files with 82 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+4 -9
View File
@@ -323,19 +323,19 @@ LIBS += -lpokerth_lib \
win32 { win32 {
DEFINES += CURL_STATICLIB DEFINES += CURL_STATICLIB
DEFINES += _WIN32_WINNT=0x0501 DEFINES += _WIN32_WINNT=0x0501
DEFINES += HAVE_OPENSSL
DEPENDPATH += src/net/win32/ \ DEPENDPATH += src/net/win32/ \
src/core/win32 src/core/win32
INCLUDEPATH += ../boost/ \ INCLUDEPATH += ../boost/ \
../SDL/include \ ../SDL/include \
../SDL/include/SDL \ ../SDL/include/SDL \
../SDL_mixer/include \ ../SDL_mixer/include \
../GnuTLS/include \ ../openssl/include \
../gsasl/include \ ../gsasl/include \
../curl/include \ ../curl/include \
../sqlite \ ../sqlite \
../zlib ../zlib
LIBPATH += ../boost/stage/lib \ LIBPATH += ../boost/stage/lib \
../GnuTLS/lib \
../openssl/lib \ ../openssl/lib \
../gsasl/lib \ ../gsasl/lib \
../curl/lib \ ../curl/lib \
@@ -349,13 +349,8 @@ win32 {
-lSDLmain \ -lSDLmain \
-ltinyxml \ -ltinyxml \
-lz \ -lz \
-lssh2 \ -lcrypto \
-lgnutls \ -lssl \
-lnettle \
-lhogweed \
-lgmp \
-lgcrypt \
-lgpg-error \
-lgsasl \ -lgsasl \
-lidn \ -lidn \
-lintl \ -lintl \
pokerth_lib.pro
+1
View File
@@ -221,6 +221,7 @@ official_server{
win32{ win32{
DEFINES += CURL_STATICLIB DEFINES += CURL_STATICLIB
DEFINES += _WIN32_WINNT=0x0501 DEFINES += _WIN32_WINNT=0x0501
DEFINES += HAVE_OPENSSL
DEPENDPATH += src/net/win32/ src/core/win32 DEPENDPATH += src/net/win32/ src/core/win32
win32-g++ { win32-g++ {
INCLUDEPATH += ../boost/ ../GnuTLS/include ../gsasl/include ../curl/include ../zlib ../sqlite ../openssl/include INCLUDEPATH += ../boost/ ../GnuTLS/include ../gsasl/include ../curl/include ../zlib ../sqlite ../openssl/include
pokerth_server.pro
+4 -3
View File
@@ -120,17 +120,18 @@ LIBS += -lpokerth_lib \
win32 { win32 {
DEFINES += CURL_STATICLIB DEFINES += CURL_STATICLIB
DEFINES += _WIN32_WINNT=0x0501 DEFINES += _WIN32_WINNT=0x0501
DEFINES += HAVE_OPENSSL
DEPENDPATH += src/net/win32/ src/core/win32 DEPENDPATH += src/net/win32/ src/core/win32
INCLUDEPATH += ../sqlite ../boost/ ../GnuTLS/include ../gsasl/include INCLUDEPATH += ../sqlite ../boost/ ../openssl/include ../gsasl/include
SOURCES += src/core/win32/convhelper.cpp SOURCES += src/core/win32/convhelper.cpp
LIBPATH += ../boost/stage/lib ../GnuTLS/lib ../openssl/lib ../gsasl/lib ../curl/lib ../mysql/lib ../zlib LIBPATH += ../boost/stage/lib ../openssl/lib ../gsasl/lib ../curl/lib ../mysql/lib ../zlib
debug:LIBPATH += debug/lib debug:LIBPATH += debug/lib
release:LIBPATH += release/lib release:LIBPATH += release/lib
LIBS += -lssh2 -lgnutls -lnettle -lhogweed -lgmp -lgcrypt -lgpg-error -lgsasl -lidn -lintl -lprotobuf -ltinyxml -lsqlite3 -lntlm LIBS += -lcrypto -lssl -lgsasl -lidn -lintl -lprotobuf -ltinyxml -lsqlite3 -lntlm
LIBS += -lboost_thread_win32-mt LIBS += -lboost_thread_win32-mt
LIBS += -lboost_filesystem-mt LIBS += -lboost_filesystem-mt
LIBS += -lboost_regex-mt LIBS += -lboost_regex-mt