diff --git a/docs/win32_build_scripts/pokerth_download_libs.cmd b/docs/win32_build_scripts/pokerth_download_libs.cmd index 819f30cd..98547570 100644 --- a/docs/win32_build_scripts/pokerth_download_libs.cmd +++ b/docs/win32_build_scripts/pokerth_download_libs.cmd @@ -214,18 +214,18 @@ cd /d %PKTH_BaseDir% if not exist %PKTH_BaseDir%\boost. ( echo. echo Downloading boost and bjam -%PKTH_OldDir%\third_party_apps\wget http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/boost/boost_1_43_0.7z http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/boost/boost-jam-3.1.17-1-ntx86.zip +%PKTH_OldDir%\third_party_apps\wget http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/boost/boost_1_44_0.7z http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/boost/boost-jam-3.1.17-1-ntx86.zip if not errorlevel 0 goto downloadFailed echo. echo Unpacking boost and bjam -%PKTH_OldDir%\third_party_apps\7za x -y boost_1_43_0.7z +%PKTH_OldDir%\third_party_apps\7za x -y boost_1_44_0.7z %PKTH_OldDir%\third_party_apps\7za x -y boost-jam-3.1.17-1-ntx86.zip REM Wait 5 seconds for the file cache, else ren might fail. @ping 127.0.0.1 -n 5 -w 1000 > nul move boost-jam-3.1.17-1-ntx86\bjam.exe mingw\bin\bjam.exe move boost-jam-3.1.17-1-ntx86\LICENSE_1_0.txt mingw\bin\bjam_LICENSE_1_0.txt rd boost-jam-3.1.17-1-ntx86 -ren boost_1_43_0 boost +ren boost_1_44_0 boost ) echo. echo Compiling boost diff --git a/pokerth_game.pro b/pokerth_game.pro index cd068c37..dab2cbf8 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -329,12 +329,12 @@ win32 { -lidn LIBS += -lcurl LIBS += -lz - LIBS += -lboost_thread-mgw45-mt-1_43 - LIBS += -lboost_filesystem-mgw45-mt-1_43 - LIBS += -lboost_regex-mgw45-mt-1_43 - LIBS += -lboost_system-mgw45-mt-1_43 - LIBS += -lboost_iostreams-mgw45-mt-1_43 - LIBS += -lboost_zlib-mgw45-mt-1_43 + LIBS += -lboost_thread-mgw45-mt-1_44 + LIBS += -lboost_filesystem-mgw45-mt-1_44 + LIBS += -lboost_regex-mgw45-mt-1_44 + LIBS += -lboost_system-mgw45-mt-1_44 + LIBS += -lboost_iostreams-mgw45-mt-1_44 + LIBS += -lboost_zlib-mgw45-mt-1_44 } LIBS += -lgdi32 \ -lcomdlg32 \ diff --git a/pokerth_server.pro b/pokerth_server.pro index 818576b7..50f1be91 100644 --- a/pokerth_server.pro +++ b/pokerth_server.pro @@ -137,13 +137,13 @@ win32 { LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error -lgsasl -lidn LIBS += -lcurl LIBS += -lz - LIBS += -lboost_thread-mgw45-mt-1_43 - LIBS += -lboost_filesystem-mgw45-mt-1_43 - LIBS += -lboost_regex-mgw45-mt-1_43 - LIBS += -lboost_system-mgw45-mt-1_43 - LIBS += -lboost_iostreams-mgw45-mt-1_43 - LIBS += -lboost_zlib-mgw45-mt-1_43 - LIBS += -lboost_program_options-mgw45-mt-1_43 + LIBS += -lboost_thread-mgw45-mt-1_44 + LIBS += -lboost_filesystem-mgw45-mt-1_44 + LIBS += -lboost_regex-mgw45-mt-1_44 + LIBS += -lboost_system-mgw45-mt-1_44 + LIBS += -lboost_iostreams-mgw45-mt-1_44 + LIBS += -lboost_zlib-mgw45-mt-1_44 + LIBS += -lboost_program_options-mgw45-mt-1_44 } LIBS += -lgdi32 \ diff --git a/src/net/common/socket_startup.cpp b/src/net/common/socket_startup.cpp index 78caa17a..417fd859 100644 --- a/src/net/common/socket_startup.cpp +++ b/src/net/common/socket_startup.cpp @@ -92,8 +92,11 @@ socket_has_sctp() if (test == boost::asio::detail::invalid_socket) return false; - boost::system::error_code ec; - boost::asio::detail::socket_ops::close(test, ec); +#ifdef _WIN32 + closesocket(test); +#else + close(test); +#endif return true; #else return false; @@ -107,8 +110,11 @@ socket_has_ipv6() if (test == boost::asio::detail::invalid_socket) return false; - boost::system::error_code ec; - boost::asio::detail::socket_ops::close(test, ec); +#ifdef _WIN32 + closesocket(test); +#else + close(test); +#endif return true; } @@ -123,8 +129,11 @@ socket_has_dual_stack() int ipv6only = 0; if (setsockopt(test, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&ipv6only, sizeof(ipv6only)) == 0) retVal = true; - boost::system::error_code ec; - boost::asio::detail::socket_ops::close(test, ec); + #ifdef _WIN32 + closesocket(test); + #else + close(test); + #endif } return retVal; } diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 23856913..ab11931c 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -68,9 +68,6 @@ #include Q_IMPORT_PLUGIN(qjpeg) Q_IMPORT_PLUGIN(qgif) -#ifdef __GNUC__ -extern "C" void tss_cleanup_implemented() {} -#endif #endif using namespace std;