Changes for mingw-w64 build.

This commit is contained in:
lotodore
2010-10-09 08:41:52 +00:00
parent fed7fd55dd
commit b92ea1d5cb
2 changed files with 16 additions and 11 deletions
+8 -8
View File
@@ -304,6 +304,7 @@ win32 {
../zlib ../zlib
LIBPATH += ../boost/stage/lib \ LIBPATH += ../boost/stage/lib \
../GnuTLS/lib \ ../GnuTLS/lib \
../openssl/lib \
../gsasl/lib \ ../gsasl/lib \
../curl/lib \ ../curl/lib \
../SDL/lib \ ../SDL/lib \
@@ -319,14 +320,13 @@ win32 {
-llibgcrypt-11 \ -llibgcrypt-11 \
-llibgsasl-7 \ -llibgsasl-7 \
-llibcurl -llibcurl
win32-g++ { win32-g++ {
LIBS += -lgnutls-openssl \ pkth_win64 {
-lgnutls \ LIBS += -lcrypto -lssl -llibeay32 -lssleay32 -lgsasl
-lgcrypt \ }
-ltasn1 \ !pkth_win64 {
-lgpg-error \ LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error -lgsasl -lidn
-lgsasl \ }
-lidn
LIBS += -lcurl LIBS += -lcurl
LIBS += -lz LIBS += -lz
LIBS += -lboost_thread-mgw45-mt-1_44.dll LIBS += -lboost_thread-mgw45-mt-1_44.dll
+8 -3
View File
@@ -119,7 +119,7 @@ win32 {
SOURCES += src/core/win32/convhelper.cpp SOURCES += src/core/win32/convhelper.cpp
LIBPATH += ../boost/stage/lib ../GnuTLS/lib ../gsasl/lib ../curl/lib ../mysql/lib ../zlib LIBPATH += ../boost/stage/lib ../GnuTLS/lib ../openssl/lib ../gsasl/lib ../curl/lib ../mysql/lib ../zlib
LIBS += -lpokerth_lib -lpokerth_db -lpokerth_protocol LIBS += -lpokerth_lib -lpokerth_db -lpokerth_protocol
@@ -134,8 +134,13 @@ win32 {
} }
win32-g++ { win32-g++ {
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error -lgsasl -lidn pkth_win64 {
LIBS += -lcurl LIBS += -lcrypto -lssl -llibeay32 -lssleay32 -lgsasl
}
!pkth_win64 {
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error -lgsasl -lidn
}
LIBS += -lcurl
LIBS += -lz LIBS += -lz
LIBS += -lboost_thread-mgw45-mt-1_44.dll LIBS += -lboost_thread-mgw45-mt-1_44.dll
LIBS += -lboost_filesystem-mgw45-mt-1_44.dll LIBS += -lboost_filesystem-mgw45-mt-1_44.dll