Skip to content

Commit

Permalink
Fixes to build with clang 3_8
Browse files Browse the repository at this point in the history
  • Loading branch information
kavyako committed Sep 26, 2016
1 parent edfb941 commit 26bf780
Show file tree
Hide file tree
Showing 16 changed files with 93 additions and 77 deletions.
8 changes: 4 additions & 4 deletions Release/src/build/package_info.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<package>
<metadata>
<base_id>cpprestsdk</base_id>
<version>2.7.0</version>
<version>2.9.0</version>
<authors>casablancacore</authors>
<owners>Microsoft, Visual C++</owners>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
Expand All @@ -10,7 +10,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>The C++ REST SDK is a cross-platform, modern, and asynchronous library that enables developers to access and author connected applications.</summary>
<description>The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.</description>
<releaseNotes>https://github.com/Microsoft/cpprestsdk/releases/tag/v2.7.0</releaseNotes>
<releaseNotes>https://github.com/Microsoft/cpprestsdk/releases/tag/v2.9.0</releaseNotes>
<copyright>Copyright 2015</copyright>
<tags>cpprestsdk Casablanca REST JSON HTTP URI WebSockets</tags>
</metadata>
Expand All @@ -28,10 +28,10 @@
<AdditionalOptions Condition="'$(PlatformToolset)'=='v140'">/d2notypeopt %(AdditionalOptions)</AdditionalOptions>
<PreprocessorDefinitions Condition="'$(PlatformToolset)' == 'v120_xp'">CPPREST_TARGET_XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<!-- Workaround Visual Studio Android bug missing -funwind-tables if -fexceptions is specified. -->
<AdditionalOptions Condition="'$(PlatformToolset)' == 'Clang_3_6'">-funwind-tables %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="'$(PlatformToolset)' == 'Clang_3_8'">-funwind-tables %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<LibraryDependencies Condition="'$(PlatformToolset)' == 'Clang_3_6'">m;%(LibraryDependencies)</LibraryDependencies>
<LibraryDependencies Condition="'$(PlatformToolset)' == 'Clang_3_8'">m;%(LibraryDependencies)</LibraryDependencies>
</Link>
</ItemDefinitionGroup>
</msbuild_hook>
Expand Down
12 changes: 6 additions & 6 deletions Release/src/build/vs14.android/casablanca140.android.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,25 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down Expand Up @@ -125,14 +125,14 @@
<Import Project="..\android.vcxitems" Label="Shared" Condition="Exists('..\android.vcxitems')" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" />
<Import Project="$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets" Condition="Exists('$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets')" />
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.0\build\native\openssl-android.targets'))" />
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.2.1\build\native\openssl-android.targets'))" />
<Error Condition="!Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets'))" />
</Target>
</Project>
14 changes: 7 additions & 7 deletions Release/src/build/vs14.android/packages.config
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.55.0.16" targetFramework="Native" />
<package id="boost_atomic-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_chrono-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_date_time-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_filesystem-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_system-android" version="1.55.0.1" targetFramework="native" />
<package id="boost_thread-android" version="1.55.0.1" targetFramework="native" />
<package id="openssl-android" version="1.0.2.0" targetFramework="native" />
<package id="boost_atomic-android" version="1.55.0.2" targetFramework="native" />
<package id="boost_chrono-android" version="1.55.0.2" targetFramework="native" />
<package id="boost_date_time-android" version="1.55.0.2" targetFramework="native" />
<package id="boost_filesystem-android" version="1.55.0.2" targetFramework="native" />
<package id="boost_system-android" version="1.55.0.2" targetFramework="native" />
<package id="boost_thread-android" version="1.55.0.2" targetFramework="native" />
<package id="openssl-android" version="1.0.2.1" targetFramework="native" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -103,25 +103,25 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,25 +54,25 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,25 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,25 +64,25 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,25 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,25 +58,25 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,25 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,25 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_3_6</PlatformToolset>
<PlatformToolset>Clang_3_8</PlatformToolset>
<UseOfStl>gnustl_static</UseOfStl>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Expand Down
Loading

0 comments on commit 26bf780

Please sign in to comment.