Use boost 1.38 on Windows. Requires update of Windows build scripts, but these are currently broken anyway, because the new g++ 4.3.3 SJLJ TDM mingw compiler causes a crash during exception unwinding when the client is disconnected by the server. Need to switch to the Dwarf2 compiler.
This commit is contained in:
+11
-7
@@ -286,17 +286,21 @@ win32 {
|
||||
}
|
||||
|
||||
win32-g++ {
|
||||
LIBPATH += Release/lib
|
||||
#LIBPATH += Debug/lib
|
||||
debug {
|
||||
LIBPATH += Debug/lib
|
||||
}
|
||||
release {
|
||||
LIBPATH += Debug/lib
|
||||
}
|
||||
LIBPATH += ../SDL/lib ../SDL_mixer/lib
|
||||
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error
|
||||
LIBS += -lcurl
|
||||
LIBS += -lz
|
||||
LIBS += -llibboost_thread-mgw43-mt-1_37
|
||||
LIBS += -llibboost_filesystem-mgw43-mt-1_37
|
||||
LIBS += -llibboost_system-mgw43-mt-1_37
|
||||
LIBS += -llibboost_iostreams-mgw43-mt-1_37
|
||||
LIBS += -llibboost_zlib-mgw43-mt-1_37
|
||||
LIBS += -llibboost_thread-mgw43-mt-1_38
|
||||
LIBS += -llibboost_filesystem-mgw43-mt-1_38
|
||||
LIBS += -llibboost_system-mgw43-mt-1_38
|
||||
LIBS += -llibboost_iostreams-mgw43-mt-1_38
|
||||
LIBS += -llibboost_zlib-mgw43-mt-1_38
|
||||
}
|
||||
|
||||
LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lsdl -lsdlmain -lsdl_mixer -lwldap32
|
||||
|
||||
+14
-9
@@ -120,26 +120,31 @@ win32 {
|
||||
|
||||
LIBPATH += ../boost/stage/lib ../GnuTLS/lib ../curl/lib ../zlib
|
||||
|
||||
LIBPATH += Release/lib
|
||||
#LIBPATH += Debug/lib
|
||||
|
||||
LIBS += -lpokerth_lib
|
||||
|
||||
win32-msvc2005 {
|
||||
LIBPATH += Release/lib
|
||||
#LIBPATH += Debug/lib
|
||||
LIBS += -llibgnutls-openssl -llibgcrypt
|
||||
LIBS += -llibcurl
|
||||
}
|
||||
|
||||
win32-g++ {
|
||||
debug {
|
||||
LIBPATH += Debug/lib
|
||||
}
|
||||
release {
|
||||
LIBPATH += Debug/lib
|
||||
}
|
||||
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error
|
||||
LIBS += -lcurl
|
||||
LIBS += -lz
|
||||
LIBS += -llibboost_thread-mgw43-mt-1_37
|
||||
LIBS += -llibboost_filesystem-mgw43-mt-1_37
|
||||
LIBS += -llibboost_system-mgw43-mt-1_37
|
||||
LIBS += -llibboost_iostreams-mgw43-mt-1_37
|
||||
LIBS += -llibboost_zlib-mgw43-mt-1_37
|
||||
LIBS += -llibboost_program_options-mgw43-mt-1_37
|
||||
LIBS += -llibboost_thread-mgw43-mt-1_38
|
||||
LIBS += -llibboost_filesystem-mgw43-mt-1_38
|
||||
LIBS += -llibboost_system-mgw43-mt-1_38
|
||||
LIBS += -llibboost_iostreams-mgw43-mt-1_38
|
||||
LIBS += -llibboost_zlib-mgw43-mt-1_38
|
||||
LIBS += -llibboost_program_options-mgw43-mt-1_38
|
||||
}
|
||||
|
||||
LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lwldap32
|
||||
|
||||
Reference in New Issue
Block a user