More cross compiling fixes.
This commit is contained in:
+4
-4
@@ -320,7 +320,9 @@ win32 {
|
|||||||
-lpokerth_protocol \
|
-lpokerth_protocol \
|
||||||
-lSDL_mixer \
|
-lSDL_mixer \
|
||||||
-lSDL \
|
-lSDL \
|
||||||
-lSDLmain
|
-lSDLmain \
|
||||||
|
-lcurl \
|
||||||
|
-lz
|
||||||
debug:LIBPATH += rebug/lib
|
debug:LIBPATH += rebug/lib
|
||||||
release:LIBPATH += release/lib
|
release:LIBPATH += release/lib
|
||||||
pkth_win64 {
|
pkth_win64 {
|
||||||
@@ -329,10 +331,8 @@ win32 {
|
|||||||
!pkth_win64 {
|
!pkth_win64 {
|
||||||
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn
|
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -lgpg-error -lgsasl -lidn
|
||||||
}
|
}
|
||||||
LIBS += -lcurl
|
|
||||||
LIBS += -lz
|
|
||||||
win32-g++-cross {
|
win32-g++-cross {
|
||||||
LIBS += -lntlm -lidn -lmikmod
|
LIBS += -lntlm -lmikmod -lddraw -ldxguid -lsmpeg -lvorbisfile -lvorbis -logg
|
||||||
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
|
||||||
|
|||||||
+19
-17
@@ -121,34 +121,36 @@ win32 {
|
|||||||
|
|
||||||
LIBPATH += ../boost/stage/lib ../GnuTLS/lib ../openssl/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 \
|
||||||
|
-lcurl \
|
||||||
|
-lz
|
||||||
|
|
||||||
debug:LIBPATH += Debug/lib
|
debug:LIBPATH += Debug/lib
|
||||||
release:LIBPATH += Release/lib
|
release:LIBPATH += Release/lib
|
||||||
|
|
||||||
win32-msvc2008 {
|
pkth_win64 {
|
||||||
LIBS += -llibgnutls-openssl-26 \
|
LIBS += -lcrypto -lssl -llibeay32 -lssleay32 -lgsasl
|
||||||
-llibgcrypt-11 \
|
}
|
||||||
-llibgsasl-7 \
|
!pkth_win64 {
|
||||||
-llibcurl
|
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error -lgsasl -lidn
|
||||||
|
}
|
||||||
|
win32-g++-cross {
|
||||||
|
LIBS += -lntlm
|
||||||
|
LIBS += -lboost_thread_win32-mt
|
||||||
|
LIBS += -lboost_filesystem-mt
|
||||||
|
LIBS += -lboost_regex-mt
|
||||||
|
LIBS += -lboost_iostreams-mt
|
||||||
|
LIBS += -lboost_system-mt
|
||||||
}
|
}
|
||||||
|
|
||||||
win32-g++ {
|
win32-g++ {
|
||||||
pkth_win64 {
|
|
||||||
LIBS += -lcrypto -lssl -llibeay32 -lssleay32 -lgsasl
|
|
||||||
}
|
|
||||||
!pkth_win64 {
|
|
||||||
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error -lgsasl -lidn
|
|
||||||
}
|
|
||||||
LIBS += -lcurl
|
|
||||||
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
|
||||||
LIBS += -lboost_regex-mgw45-mt-1_44
|
LIBS += -lboost_regex-mgw45-mt-1_44
|
||||||
LIBS += -lboost_system-mgw45-mt-1_44.dll
|
|
||||||
LIBS += -lboost_iostreams-mgw45-mt-1_44.dll
|
LIBS += -lboost_iostreams-mgw45-mt-1_44.dll
|
||||||
LIBS += -lboost_zlib-mgw45-mt-1_44.dll
|
LIBS += -lboost_zlib-mgw45-mt-1_44.dll
|
||||||
LIBS += -lboost_program_options-mgw45-mt-1_44.dll
|
LIBS += -lboost_system-mgw45-mt-1_44.dll
|
||||||
}
|
}
|
||||||
|
|
||||||
LIBS += -lgdi32 \
|
LIBS += -lgdi32 \
|
||||||
|
|||||||
Reference in New Issue
Block a user