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

Fixing issue with boost 1.44. However, Windows build using boost 1.44 is currently broken due to thread issues.

Browse Source
This commit is contained in:
lotodore
2010-08-22 10:53:27 +00:00
parent 2d3bedf5a6
commit 5f84bbc411
5 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/win32_build_scripts/pokerth_download_libs.cmd
+3 -3
View File
@@ -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
pokerth_game.pro
+6 -6
View File
@@ -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 \
pokerth_server.pro
+7 -7
View File
@@ -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 \
src/net/common/socket_startup.cpp
+15 -6
View File
@@ -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;
}
src/pokerth.cpp
-3
View File
@@ -68,9 +68,6 @@
#include <QtPlugin>
Q_IMPORT_PLUGIN(qjpeg)
Q_IMPORT_PLUGIN(qgif)
#ifdef __GNUC__
extern "C" void tss_cleanup_implemented() {}
#endif
#endif
using namespace std;