From 81a99719ddef00deb448d1cb6e71626eb4476b34 Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Thu, 3 May 2018 21:22:58 +0200 Subject: [PATCH] Updates dependencies for Windows build. Uses newer Windows SDK, Boost 1.67, OpenSSL 1.0.2o and CuRL 7.59.0. --- .party | 18 +++++++++--------- apps/freelan/freelan.vcxproj | 2 +- libs/asiotap/libasiotap.vcxproj | 4 ++-- .../tap_adapter/tap-setup/tap-setup.vcxproj | 4 ++-- libs/cryptoplus/libcryptoplus.vcxproj | 4 ++-- libs/executeplus/libexecuteplus.vcxproj | 4 ++-- libs/freelan/libfreelan.vcxproj | 2 +- libs/fscp/libfscp.vcxproj | 2 +- libs/iconvplus/libiconvplus.vcxproj | 4 ++-- libs/kfather/libkfather.vcxproj | 4 ++-- libs/miniupnpcplus/libminiupnpcplus.vcxproj | 2 +- libs/mongooseplus/libmongooseplus.vcxproj | 4 ++-- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.party b/.party index 4d934563..91cf6882 100644 --- a/.party +++ b/.party @@ -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=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'msbuild libiconv.sln /p:Platformtoolset=v141 /p:WindowsTargetPlatformVersion=10.0.16299.0 /p:Configuration=ReleaseStatic /p:Platform="x64"', + r'msbuild libiconv.sln /p:Platformtoolset=v141 /p:WindowsTargetPlatformVersion=10.0.16299.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', @@ -39,8 +39,8 @@ Attendee('iconv').get_build('msvc-x64').commands = [ # boost Attendee('boost', filter=~f('linux')) -Attendee('boost').add_source('http://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.tar.bz2/download', filter=~f('windows'), mimetype='application/x-bzip2') -Attendee('boost').add_source('http://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.zip/download', filter='windows', mimetype='application/zip') +Attendee('boost').add_source('http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.tar.bz2/download', filter=~f('windows'), mimetype='application/x-bzip2') +Attendee('boost').add_source('http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.zip/download', filter='windows', mimetype='application/zip') Attendee('boost').add_build('osx', environment='system', filter='darwin') Attendee('boost').get_build('osx').commands = [ @@ -70,7 +70,7 @@ Attendee('boost').get_build('msvc-x64').commands = [ # OpenSSL Attendee('openssl', filter=~f('linux')) -Attendee('openssl').add_source('http://www.openssl.org/source/openssl-1.0.2n.tar.gz') +Attendee('openssl').add_source('http://www.openssl.org/source/openssl-1.0.2o.tar.gz') Attendee('openssl').add_build('osx', environment='system', filter='darwin') Attendee('openssl').get_build('osx').commands = [ @@ -120,8 +120,8 @@ Attendee('openssl').get_build('msvc-x64-debug').commands = [ # cURL Attendee('curl', filter=~f('linux')) -Attendee('curl').add_source('http://curl.askapache.com/download/curl-7.57.0.zip', filter='windows', mimetype='application/zip') -Attendee('curl').add_source('http://curl.askapache.com/download/curl-7.57.0.tar.bz2', filter=~f('windows'), mimetype='application/x-bzip2') +Attendee('curl').add_source('http://curl.askapache.com/download/curl-7.59.0.zip', filter='windows', mimetype='application/zip') +Attendee('curl').add_source('http://curl.askapache.com/download/curl-7.59.0.tar.bz2', filter=~f('windows'), mimetype='application/x-bzip2') Attendee('curl').depends_on('openssl') @@ -168,8 +168,8 @@ Attendee('miniupnpc').get_build('msvc-x86').commands = [ ] Attendee('miniupnpc').get_build('msvc-x64').commands = [ r'"C:\Program Files\CMake\bin\cmake.exe" -DCMAKE_GENERATOR_PLATFORM=x64 ./miniupnpc/', - r'msbuild .\upnpc-static.vcxproj /p:Platformtoolset=v141 /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=Release /p:Platform="x64"', - r'msbuild .\upnpc-static.vcxproj /p:Platformtoolset=v141 /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=Debug /p:Platform="x64"', + r'msbuild .\upnpc-static.vcxproj /p:Platformtoolset=v141 /p:WindowsTargetPlatformVersion=10.0.16299.0 /p:Configuration=Release /p:Platform="x64"', + r'msbuild .\upnpc-static.vcxproj /p:Platformtoolset=v141 /p:WindowsTargetPlatformVersion=10.0.16299.0 /p:Configuration=Debug /p:Platform="x64"', r'md {{prefix}}\Release\lib || echo', r'md {{prefix}}\Release\include || echo', r'md {{prefix}}\Debug\lib || echo', diff --git a/apps/freelan/freelan.vcxproj b/apps/freelan/freelan.vcxproj index cbf37876..8631a6b5 100644 --- a/apps/freelan/freelan.vcxproj +++ b/apps/freelan/freelan.vcxproj @@ -38,7 +38,7 @@ {FCABC429-7FB2-4453-89CB-D1A59A7D59F9} Win32Proj freelan - 10.0.15063.0 + 10.0.16299.0 diff --git a/libs/asiotap/libasiotap.vcxproj b/libs/asiotap/libasiotap.vcxproj index ad26f63b..54c5c339 100644 --- a/libs/asiotap/libasiotap.vcxproj +++ b/libs/asiotap/libasiotap.vcxproj @@ -173,7 +173,7 @@ {9173624C-FFF7-4431-BB4A-FC30B13AD742} Win32Proj libasiotap - 10.0.15063.0 + 10.0.16299.0 @@ -373,4 +373,4 @@ - \ No newline at end of file + diff --git a/libs/asiotap/windows/tap_adapter/tap-setup/tap-setup.vcxproj b/libs/asiotap/windows/tap_adapter/tap-setup/tap-setup.vcxproj index f135c8c4..10b325a0 100644 --- a/libs/asiotap/windows/tap_adapter/tap-setup/tap-setup.vcxproj +++ b/libs/asiotap/windows/tap_adapter/tap-setup/tap-setup.vcxproj @@ -23,7 +23,7 @@ {2DC3A022-8C0C-4364-A1F1-F134E885AB02} Win32Proj tapsetup - 10.0.15063.0 + 10.0.16299.0 @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/libs/cryptoplus/libcryptoplus.vcxproj b/libs/cryptoplus/libcryptoplus.vcxproj index a0365108..23e0841e 100644 --- a/libs/cryptoplus/libcryptoplus.vcxproj +++ b/libs/cryptoplus/libcryptoplus.vcxproj @@ -110,7 +110,7 @@ {BABD5FDD-D2DC-44FE-B2A4-A21D3DD1F6C2} Win32Proj libcryptoplus - 10.0.15063.0 + 10.0.16299.0 @@ -300,4 +300,4 @@ - \ No newline at end of file + diff --git a/libs/executeplus/libexecuteplus.vcxproj b/libs/executeplus/libexecuteplus.vcxproj index 2b773bd8..ac78a47e 100644 --- a/libs/executeplus/libexecuteplus.vcxproj +++ b/libs/executeplus/libexecuteplus.vcxproj @@ -35,7 +35,7 @@ {67D44B66-2B37-4FEC-90AD-F3A64B5BA1F4} Win32Proj libexecuteplus - 10.0.15063.0 + 10.0.16299.0 @@ -227,4 +227,4 @@ - \ No newline at end of file + diff --git a/libs/freelan/libfreelan.vcxproj b/libs/freelan/libfreelan.vcxproj index 1e02fa3c..d82d0bf9 100644 --- a/libs/freelan/libfreelan.vcxproj +++ b/libs/freelan/libfreelan.vcxproj @@ -64,7 +64,7 @@ {3BCC24B5-D624-47BC-AFED-BF540AFA29F8} Win32Proj libfreelan - 10.0.15063.0 + 10.0.16299.0 diff --git a/libs/fscp/libfscp.vcxproj b/libs/fscp/libfscp.vcxproj index 8c6413f1..0e44356f 100644 --- a/libs/fscp/libfscp.vcxproj +++ b/libs/fscp/libfscp.vcxproj @@ -55,7 +55,7 @@ {D2906D5F-3E94-4376-814D-299B8F81E195} Win32Proj libfscp - 10.0.15063.0 + 10.0.16299.0 diff --git a/libs/iconvplus/libiconvplus.vcxproj b/libs/iconvplus/libiconvplus.vcxproj index e1377469..59e6bdf8 100644 --- a/libs/iconvplus/libiconvplus.vcxproj +++ b/libs/iconvplus/libiconvplus.vcxproj @@ -35,7 +35,7 @@ {ACD7B910-1594-4192-9AE1-E805B2F5DB59} Win32Proj libiconvplus - 10.0.15063.0 + 10.0.16299.0 @@ -247,4 +247,4 @@ - \ No newline at end of file + diff --git a/libs/kfather/libkfather.vcxproj b/libs/kfather/libkfather.vcxproj index 99f77415..6241b453 100644 --- a/libs/kfather/libkfather.vcxproj +++ b/libs/kfather/libkfather.vcxproj @@ -34,7 +34,7 @@ {FCBBDD58-4EF6-4EEF-8405-49E06F61364B} Win32Proj libkfather - 10.0.15063.0 + 10.0.16299.0 @@ -226,4 +226,4 @@ - \ No newline at end of file + diff --git a/libs/miniupnpcplus/libminiupnpcplus.vcxproj b/libs/miniupnpcplus/libminiupnpcplus.vcxproj index 9221e9f5..b0e0bef7 100644 --- a/libs/miniupnpcplus/libminiupnpcplus.vcxproj +++ b/libs/miniupnpcplus/libminiupnpcplus.vcxproj @@ -32,7 +32,7 @@ {AC73E1D7-49E7-4A12-8555-588CA931932B} Win32Proj libminiupnpcplus - 10.0.15063.0 + 10.0.16299.0 diff --git a/libs/mongooseplus/libmongooseplus.vcxproj b/libs/mongooseplus/libmongooseplus.vcxproj index d414e16f..2654979d 100644 --- a/libs/mongooseplus/libmongooseplus.vcxproj +++ b/libs/mongooseplus/libmongooseplus.vcxproj @@ -41,7 +41,7 @@ {70266482-33AC-449F-8356-0EC6FA0C1BBD} Win32Proj libmongooseplus - 10.0.15063.0 + 10.0.16299.0 @@ -257,4 +257,4 @@ - \ No newline at end of file +