Use boost 1.36.0 on windows.

This commit is contained in:
lotodore
2008-09-02 19:20:15 +00:00
parent d3ecee9bd1
commit 4e72da5a24
3 changed files with 14 additions and 14 deletions
@@ -175,18 +175,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_35_0.7z -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/boost/boost-jam-3.1.16-1-ntx86.zip
%PKTH_OldDir%\third_party_apps\curl -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/boost/boost_1_36_0.7z -O http://%SOURCEFORGE_MIRROR%.sourceforge.net/sourceforge/boost/boost-jam-3.1.16-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_35_0.7z
%PKTH_OldDir%\third_party_apps\7za x -y boost_1_36_0.7z
%PKTH_OldDir%\third_party_apps\7za x -y boost-jam-3.1.16-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.16-1-ntx86\bjam.exe mingw\bin\bjam.exe
move boost-jam-3.1.16-1-ntx86\LICENSE_1_0.txt mingw\bin\bjam_LICENSE_1_0.txt
rd boost-jam-3.1.16-1-ntx86
ren boost_1_35_0 boost
ren boost_1_36_0 boost
)
echo.
echo Compiling boost
+5 -5
View File
@@ -287,11 +287,11 @@ win32{
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error
LIBS += -lcurl
LIBS += -lz
LIBS += -llibboost_thread-mgw34-mt-1_35
LIBS += -llibboost_filesystem-mgw34-mt-1_35
LIBS += -llibboost_system-mgw34-mt-1_35
LIBS += -llibboost_iostreams-mgw34-mt-1_35
LIBS += -llibboost_zlib-mgw34-mt-1_35
LIBS += -llibboost_thread-mgw34-mt-1_36
LIBS += -llibboost_filesystem-mgw34-mt-1_36
LIBS += -llibboost_system-mgw34-mt-1_36
LIBS += -llibboost_iostreams-mgw34-mt-1_36
LIBS += -llibboost_zlib-mgw34-mt-1_36
}
LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lsdl -lsdlmain -lsdl_mixer -lwldap32
+6 -6
View File
@@ -134,12 +134,12 @@ win32 {
LIBS += -lgnutls-openssl -lgnutls -lgcrypt -ltasn1 -lgpg-error
LIBS += -lcurl
LIBS += -lz
LIBS += -llibboost_thread-mgw34-mt-1_35
LIBS += -llibboost_filesystem-mgw34-mt-1_35
LIBS += -llibboost_system-mgw34-mt-1_35
LIBS += -llibboost_iostreams-mgw34-mt-1_35
LIBS += -llibboost_zlib-mgw34-mt-1_35
LIBS += -llibboost_program_options-mgw34-mt-1_35
LIBS += -llibboost_thread-mgw34-mt-1_36
LIBS += -llibboost_filesystem-mgw34-mt-1_36
LIBS += -llibboost_system-mgw34-mt-1_36
LIBS += -llibboost_iostreams-mgw34-mt-1_36
LIBS += -llibboost_zlib-mgw34-mt-1_36
LIBS += -llibboost_program_options-mgw34-mt-1_36
}
LIBS += -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lole32 -luuid -luser32 -lmsimg32 -lshell32 -lkernel32 -lws2_32 -ladvapi32 -lwldap32