Changes for boost 1.38.0 on Windows.
This commit is contained in:
@@ -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<char_type> time_zone_names;
|
|
||||||
- typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
|
|
||||||
+ typedef boost::date_time::dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
|
|
||||||
typedef std::basic_string<char_type> string_type;
|
|
||||||
|
|
||||||
//! Constructs an empty database
|
|
||||||
@@ -184,24 +184,18 @@ cd /d %PKTH_BaseDir%
|
|||||||
if not exist %PKTH_BaseDir%\boost. (
|
if not exist %PKTH_BaseDir%\boost. (
|
||||||
echo.
|
echo.
|
||||||
echo Downloading boost and bjam
|
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
|
if not errorlevel 0 goto downloadFailed
|
||||||
echo.
|
echo.
|
||||||
echo Unpacking boost and bjam
|
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
|
%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.
|
REM Wait 5 seconds for the file cache, else ren might fail.
|
||||||
@ping 127.0.0.1 -n 5 -w 1000 > nul
|
@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\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
|
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
|
rd boost-jam-3.1.17-1-ntx86
|
||||||
ren boost_1_37_0 boost
|
ren boost_1_38_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%
|
|
||||||
)
|
)
|
||||||
echo.
|
echo.
|
||||||
echo Compiling boost
|
echo Compiling boost
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
// Windows headers
|
// Windows headers
|
||||||
#define WIN32_LEAN_AND_MEAN
|
#define WIN32_LEAN_AND_MEAN
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
#include <mmsystem.h>
|
||||||
|
|
||||||
// Automagically link winmm.lib if we can
|
// Automagically link winmm.lib if we can
|
||||||
#if (defined _MSC_VER) && (_MSC_VER >= 1200)
|
#if (defined _MSC_VER) && (_MSC_VER >= 1200)
|
||||||
|
|||||||
Reference in New Issue
Block a user