Skip to content

Commit

Permalink
Updates dependencies for Windows build.
Browse files Browse the repository at this point in the history
Uses newer Windows SDK, Boost 1.67, OpenSSL 1.0.2o and CuRL 7.59.0.
  • Loading branch information
s-vincent committed May 3, 2018
1 parent f240e4d commit 81a9971
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 27 deletions.
18 changes: 9 additions & 9 deletions .party
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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 = [
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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')

Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion apps/freelan/freelan.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<ProjectGuid>{FCABC429-7FB2-4453-89CB-D1A59A7D59F9}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>freelan</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down
4 changes: 2 additions & 2 deletions libs/asiotap/libasiotap.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
<ProjectGuid>{9173624C-FFF7-4431-BB4A-FC30B13AD742}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libasiotap</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -373,4 +373,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions libs/asiotap/windows/tap_adapter/tap-setup/tap-setup.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<ProjectGuid>{2DC3A022-8C0C-4364-A1F1-F134E885AB02}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>tapsetup</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -156,4 +156,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions libs/cryptoplus/libcryptoplus.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<ProjectGuid>{BABD5FDD-D2DC-44FE-B2A4-A21D3DD1F6C2}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libcryptoplus</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -300,4 +300,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions libs/executeplus/libexecuteplus.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<ProjectGuid>{67D44B66-2B37-4FEC-90AD-F3A64B5BA1F4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libexecuteplus</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -227,4 +227,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion libs/freelan/libfreelan.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<ProjectGuid>{3BCC24B5-D624-47BC-AFED-BF540AFA29F8}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libfreelan</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down
2 changes: 1 addition & 1 deletion libs/fscp/libfscp.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ProjectGuid>{D2906D5F-3E94-4376-814D-299B8F81E195}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libfscp</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down
4 changes: 2 additions & 2 deletions libs/iconvplus/libiconvplus.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<ProjectGuid>{ACD7B910-1594-4192-9AE1-E805B2F5DB59}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libiconvplus</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -247,4 +247,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions libs/kfather/libkfather.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<ProjectGuid>{FCBBDD58-4EF6-4EEF-8405-49E06F61364B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libkfather</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
Expand Down Expand Up @@ -226,4 +226,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion libs/miniupnpcplus/libminiupnpcplus.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<ProjectGuid>{AC73E1D7-49E7-4A12-8555-588CA931932B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libminiupnpcplus</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down
4 changes: 2 additions & 2 deletions libs/mongooseplus/libmongooseplus.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<ProjectGuid>{70266482-33AC-449F-8356-0EC6FA0C1BBD}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>libmongooseplus</RootNamespace>
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -257,4 +257,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

0 comments on commit 81a9971

Please sign in to comment.