From 8a0249026287c349443ddceb7f4eb7913dae9118 Mon Sep 17 00:00:00 2001 From: lotodore Date: Sun, 22 Feb 2009 20:43:45 +0000 Subject: [PATCH] Changes for boost 1.38.0 on Windows. --- docs/win32_build_scripts/helper_src/boost.patch | 11 ----------- docs/win32_build_scripts/pokerth_download_libs.cmd | 12 +++--------- src/third_party/boost/timers/win32/tgt_device.hpp | 1 + 3 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 docs/win32_build_scripts/helper_src/boost.patch diff --git a/docs/win32_build_scripts/helper_src/boost.patch b/docs/win32_build_scripts/helper_src/boost.patch deleted file mode 100644 index 280a02cb..00000000 --- a/docs/win32_build_scripts/helper_src/boost.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost_orig\boost\date_time\tz_db_base.hpp 2008-02-27 21:00:24.000000000 +0100 -+++ boost\boost\date_time\tz_db_base.hpp 2009-02-18 20:39:09.501600000 +0100 -@@ -158,7 +158,7 @@ - typedef typename time_zone_type::base_type time_zone_base_type; - typedef typename time_zone_type::time_duration_type time_duration_type; - typedef time_zone_names_base time_zone_names; -- typedef dst_adjustment_offsets dst_adjustment_offsets; -+ typedef boost::date_time::dst_adjustment_offsets dst_adjustment_offsets; - typedef std::basic_string string_type; - - //! Constructs an empty database diff --git a/docs/win32_build_scripts/pokerth_download_libs.cmd b/docs/win32_build_scripts/pokerth_download_libs.cmd index 38456bb4..e1d833b9 100644 --- a/docs/win32_build_scripts/pokerth_download_libs.cmd +++ b/docs/win32_build_scripts/pokerth_download_libs.cmd @@ -184,24 +184,18 @@ cd /d %PKTH_BaseDir% if not exist %PKTH_BaseDir%\boost. ( echo. echo Downloading boost and bjam -%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/boost/boost_1_37_0.7z -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/boost/boost-jam-3.1.17-1-ntx86.zip +%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/boost/boost_1_38_0.7z -O 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_37_0.7z +%PKTH_OldDir%\third_party_apps\7za x -y boost_1_38_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_37_0 boost -echo. -echo Patching boost -cd boost -copy %PKTH_OldDir%\helper_src\boost.patch . -%PKTH_OldDir%\third_party_apps\pat_ch -p1 -i boost.patch -cd /d %PKTH_BaseDir% +ren boost_1_38_0 boost ) echo. echo Compiling boost diff --git a/src/third_party/boost/timers/win32/tgt_device.hpp b/src/third_party/boost/timers/win32/tgt_device.hpp index 9e70135c..777d961e 100644 --- a/src/third_party/boost/timers/win32/tgt_device.hpp +++ b/src/third_party/boost/timers/win32/tgt_device.hpp @@ -18,6 +18,7 @@ // Windows headers #define WIN32_LEAN_AND_MEAN #include +#include // Automagically link winmm.lib if we can #if (defined _MSC_VER) && (_MSC_VER >= 1200)