github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 22:23:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

More CalcManager.Android fixes

Browse source 
- target API 21 (Lollipop)
 - include math library
 - reenable error on unresolved symbols (otherwise will fail at runtime)
This commit is contained in:
David Oliver 2019-05-23 14:11:51 -04:00 • committed by Jérôme Laban
commit aad5768f6d
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/CalcManager.Android/CalcManager.Android.vcxproj
View file

@ -105,6 +105,7 @@
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
@ -115,11 +116,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
@ -135,11 +138,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>Clang_5_0</PlatformToolset> <PlatformToolset>Clang_5_0</PlatformToolset>
<AndroidAPILevel>android-21</AndroidAPILevel>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" /> <ImportGroup Label="ExtensionSettings" />
@ -171,7 +176,8 @@
<AdditionalIncludeDirectories>$(StlIncludeDirectories);$(Sysroot)\usr\include;$(Sysroot)\usr\include\$(AndroidHeaderTriple);$(VS_NdkRoot)\sources\android\support\include;$(SolutionDir).\CalcManager\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(StlIncludeDirectories);$(Sysroot)\usr\include;$(Sysroot)\usr\include\$(AndroidHeaderTriple);$(VS_NdkRoot)\sources\android\support\include;$(SolutionDir).\CalcManager\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<UnresolvedSymbolReferences>false</UnresolvedSymbolReferences> <UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
<AdditionalOptions>-lm</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -183,7 +189,8 @@
<ExceptionHandling>Enabled</ExceptionHandling> <ExceptionHandling>Enabled</ExceptionHandling>
</ClCompile> </ClCompile>
<Link> <Link>
<UnresolvedSymbolReferences>false</UnresolvedSymbolReferences> <UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
<AdditionalOptions>-lm</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
@ -195,7 +202,8 @@
<ExceptionHandling>Enabled</ExceptionHandling> <ExceptionHandling>Enabled</ExceptionHandling>
</ClCompile> </ClCompile>
<Link> <Link>
<UnresolvedSymbolReferences>false</UnresolvedSymbolReferences> <UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
<AdditionalOptions>-lm</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@ -207,7 +215,8 @@
<ExceptionHandling>Enabled</ExceptionHandling> <ExceptionHandling>Enabled</ExceptionHandling>
</ClCompile> </ClCompile>
<Link> <Link>
<UnresolvedSymbolReferences>false</UnresolvedSymbolReferences> <UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
<AdditionalOptions>-lm</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@ -219,7 +228,8 @@
<ExceptionHandling>Enabled</ExceptionHandling> <ExceptionHandling>Enabled</ExceptionHandling>
</ClCompile> </ClCompile>
<Link> <Link>
<UnresolvedSymbolReferences>false</UnresolvedSymbolReferences> <UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
<AdditionalOptions>-lm</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@ -231,7 +241,8 @@
<ExceptionHandling>Enabled</ExceptionHandling> <ExceptionHandling>Enabled</ExceptionHandling>
</ClCompile> </ClCompile>
<Link> <Link>
<UnresolvedSymbolReferences>false</UnresolvedSymbolReferences> <UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
<AdditionalOptions>-lm</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@ -243,7 +254,8 @@
<ExceptionHandling>Enabled</ExceptionHandling> <ExceptionHandling>Enabled</ExceptionHandling>
</ClCompile> </ClCompile>
<Link> <Link>
<UnresolvedSymbolReferences>false</UnresolvedSymbolReferences> <UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
<AdditionalOptions>-lm</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@ -255,7 +267,8 @@
<ExceptionHandling>Enabled</ExceptionHandling> <ExceptionHandling>Enabled</ExceptionHandling>
</ClCompile> </ClCompile>
<Link> <Link>
<UnresolvedSymbolReferences>false</UnresolvedSymbolReferences> <UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
<AdditionalOptions>-lm</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />