From 2129caa0643f3181dfe7c09a8b8b085476ea5996 Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Thu, 10 Aug 2017 08:47:00 +0200 Subject: [PATCH] Uses VS 2017 toolset for boost compilation on Windows. --- .party | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.party b/.party index 11c714bd..b208635e 100644 --- a/.party +++ b/.party @@ -11,8 +11,8 @@ Attendee('iconv', filter='msvc').add_source('folder://third-party/source/libicon Attendee('iconv').add_build('msvc-x86', environment='system', filter='msvc-x86', prefix='x86') Attendee('iconv').get_build('msvc-x86').commands = [ - r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=ReleaseStatic /p:Platform="Win32"', - r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=DebugStatic /p:Platform="Win32"', + r'msbuild libiconv.sln /p:Platformtoolset=v141 /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=ReleaseStatic /p:Platform="Win32"', + r'msbuild libiconv.sln /p:Platformtoolset=v141 /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=DebugStatic /p:Platform="Win32"', r'md {{prefix}}\Release\lib || echo', r'md {{prefix}}\Release\include || echo', r'md {{prefix}}\Debug\lib || echo', @@ -25,8 +25,8 @@ Attendee('iconv').get_build('msvc-x86').commands = [ Attendee('iconv').add_build('msvc-x64', environment='system', filter='msvc-x64', prefix='x64') Attendee('iconv').get_build('msvc-x64').commands = [ - r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=ReleaseStatic /p:Platform="x64"', - r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=DebugStatic /p:Platform="x64"', + r'msbuild libiconv.sln /p:Platformtoolset=v141 /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=ReleaseStatic /p:Platform="x64"', + r'msbuild libiconv.sln /p:Platformtoolset=v141 /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=DebugStatic /p:Platform="x64"', r'md {{prefix}}\Release\lib || echo', r'md {{prefix}}\Release\include || echo', r'md {{prefix}}\Debug\lib || echo', @@ -53,18 +53,18 @@ Attendee('boost').get_build('osx').commands = [ Attendee('boost').add_build('msvc-x86', environment='system', filter='msvc-x86', prefix='x86') Attendee('boost').get_build('msvc-x86').commands = [ r'bootstrap.bat', - r'b2 --prefix={{prefix}}\Release --layout=versioned --without-serialization toolset=msvc-12 variant=release link=static threading=multi runtime-link=shared install', + r'b2 --prefix={{prefix}}\Release --layout=versioned --without-serialization toolset=msvc-14.1 variant=release link=static threading=multi runtime-link=shared install', r'xcopy bjam.exe {{prefix}}\Release\bin\ /S /Y', - r'b2 --prefix={{prefix}}\Debug --layout=versioned --without-serialization toolset=msvc-12 variant=debug link=static threading=multi runtime-link=shared install', + r'b2 --prefix={{prefix}}\Debug --layout=versioned --without-serialization toolset=msvc-14.1 variant=debug link=static threading=multi runtime-link=shared install', r'xcopy bjam.exe {{prefix}}\Debug\bin\ /S /Y', ] Attendee('boost').add_build('msvc-x64', environment='system', filter='msvc-x64', prefix='x64') Attendee('boost').get_build('msvc-x64').commands = [ r'bootstrap.bat', - r'b2 --prefix={{prefix}}\Release --layout=versioned --without-serialization toolset=msvc-12 variant=release link=static threading=multi runtime-link=shared address-model=64 install', + r'b2 --prefix={{prefix}}\Release --layout=versioned --without-serialization toolset=msvc-14.1 variant=release link=static threading=multi runtime-link=shared address-model=64 install', r'xcopy bjam.exe {{prefix}}\Release\bin\ /S /Y', - r'b2 --prefix={{prefix}}\Debug --layout=versioned --without-serialization toolset=msvc-12 variant=debug link=static threading=multi runtime-link=shared address-model=64 install', + r'b2 --prefix={{prefix}}\Debug --layout=versioned --without-serialization toolset=msvc-14.1 variant=debug link=static threading=multi runtime-link=shared address-model=64 install', r'xcopy bjam.exe {{prefix}}\Debug\bin\ /S /Y', ]