Adjust android CI
This commit is contained in:
Jérôme Laban
Родитель
c197f15d6f
Коммит
8aec3d2097
|
|
@ -27,6 +27,48 @@ jobs:
|
|||
logProjectEvents: false
|
||||
createLogFile: false
|
||||
|
||||
- task: MSBuild@1
|
||||
displayName: ARM Android build
|
||||
inputs:
|
||||
solution: src/CalcManager.Android/CalcManager.Android.vcxproj
|
||||
msbuildLocationMethod: version
|
||||
msbuildVersion: latest
|
||||
msbuildArchitecture: x86
|
||||
msbuildArguments: /r /p:Configuration=Release /p:Platform=ARM /detailedsummary
|
||||
clean: false
|
||||
maximumCpuCount: true
|
||||
restoreNugetPackages: false
|
||||
logProjectEvents: false
|
||||
createLogFile: false
|
||||
|
||||
- task: MSBuild@1
|
||||
displayName: ARM64 Android build
|
||||
inputs:
|
||||
solution: src/CalcManager.Android/CalcManager.Android.vcxproj
|
||||
msbuildLocationMethod: version
|
||||
msbuildVersion: latest
|
||||
msbuildArchitecture: x86
|
||||
msbuildArguments: /r /p:Configuration=Release /p:Platform=ARM64 /detailedsummary
|
||||
clean: false
|
||||
maximumCpuCount: true
|
||||
restoreNugetPackages: false
|
||||
logProjectEvents: false
|
||||
createLogFile: false
|
||||
|
||||
- task: MSBuild@1
|
||||
displayName: X86 Android build
|
||||
inputs:
|
||||
solution: src/CalcManager.Android/CalcManager.Android.vcxproj
|
||||
msbuildLocationMethod: version
|
||||
msbuildVersion: latest
|
||||
msbuildArchitecture: x86
|
||||
msbuildArguments: /r /p:Configuration=Release /p:Platform=x86 /detailedsummary
|
||||
clean: false
|
||||
maximumCpuCount: true
|
||||
restoreNugetPackages: false
|
||||
logProjectEvents: false
|
||||
createLogFile: false
|
||||
|
||||
- task: MSBuild@1
|
||||
inputs:
|
||||
solution: src/Calculator.sln
|
||||
|
|
|
|||
|
|
@ -35,62 +35,62 @@
|
|||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\CalcManager\CalculatorHistory.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CalculatorManager.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CCalcManager.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\calc.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\CalcInput.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\CalcUtils.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\History.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\Number.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\Rational.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\RationalMath.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\scicomm.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\scidisp.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\scifunc.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\scioper.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\sciset.cpp" />
|
||||
<ClCompile Include="..\CalcManager\ExpressionCommand.cpp" />
|
||||
<ClCompile Include="..\CalcManager\pch.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\basex.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\conv.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\exp.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\fact.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\itrans.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\itransh.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\logic.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\num.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\rat.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\support.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\trans.cpp" />
|
||||
<ClCompile Include="..\CalcManager\Ratpack\transh.cpp" />
|
||||
<ClCompile Include="../CalcManager/CalculatorHistory.cpp" />
|
||||
<ClCompile Include="../CalcManager/CalculatorManager.cpp" />
|
||||
<ClCompile Include="../CalcManager/CCalcManager.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/calc.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/CalcInput.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/CalcUtils.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/History.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/Number.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/Rational.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/RationalMath.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/scicomm.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/scidisp.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/scifunc.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/scioper.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/sciset.cpp" />
|
||||
<ClCompile Include="../CalcManager/ExpressionCommand.cpp" />
|
||||
<ClCompile Include="../CalcManager/pch.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/basex.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/conv.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/exp.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/fact.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/itrans.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/itransh.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/logic.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/num.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/rat.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/support.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/trans.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/transh.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\CalcManager\CalculatorHistory.h" />
|
||||
<ClInclude Include="..\CalcManager\CalculatorManager.h" />
|
||||
<ClInclude Include="..\CalcManager\CalculatorResource.h" />
|
||||
<ClInclude Include="..\CalcManager\CalculatorVector.h" />
|
||||
<ClInclude Include="..\CalcManager\CCalcManager.h" />
|
||||
<ClInclude Include="..\CalcManager\Command.h" />
|
||||
<ClInclude Include="..\CalcManager\compat.h" />
|
||||
<ClInclude Include="..\CalcManager\ExpressionCommand.h" />
|
||||
<ClInclude Include="..\CalcManager\ExpressionCommandInterface.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\CalcEngine.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\CalcInput.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\CalcUtils.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\CCommand.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\EngineStrings.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\History.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\ICalcDisplay.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\IHistoryDisplay.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\Number.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\RadixType.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\Rational.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\RationalMath.h" />
|
||||
<ClInclude Include="..\CalcManager\pch.h" />
|
||||
<ClInclude Include="..\CalcManager\Ratpack\CalcErr.h" />
|
||||
<ClInclude Include="..\CalcManager\Ratpack\ratconst.h" />
|
||||
<ClInclude Include="..\CalcManager\Ratpack\ratpak.h" />
|
||||
<ClInclude Include="../CalcManager/CalculatorHistory.h" />
|
||||
<ClInclude Include="../CalcManager/CalculatorManager.h" />
|
||||
<ClInclude Include="../CalcManager/CalculatorResource.h" />
|
||||
<ClInclude Include="../CalcManager/CalculatorVector.h" />
|
||||
<ClInclude Include="../CalcManager/CCalcManager.h" />
|
||||
<ClInclude Include="../CalcManager/Command.h" />
|
||||
<ClInclude Include="../CalcManager/compat.h" />
|
||||
<ClInclude Include="../CalcManager/ExpressionCommand.h" />
|
||||
<ClInclude Include="../CalcManager/ExpressionCommandInterface.h" />
|
||||
<ClInclude Include="../CalcManager/headers/CalcEngine.h" />
|
||||
<ClInclude Include="../CalcManager/headers/CalcInput.h" />
|
||||
<ClInclude Include="../CalcManager/headers/CalcUtils.h" />
|
||||
<ClInclude Include="../CalcManager/headers/CCommand.h" />
|
||||
<ClInclude Include="../CalcManager/headers/EngineStrings.h" />
|
||||
<ClInclude Include="../CalcManager/headers/History.h" />
|
||||
<ClInclude Include="../CalcManager/headers/ICalcDisplay.h" />
|
||||
<ClInclude Include="../CalcManager/headers/IHistoryDisplay.h" />
|
||||
<ClInclude Include="../CalcManager/headers/Number.h" />
|
||||
<ClInclude Include="../CalcManager/headers/RadixType.h" />
|
||||
<ClInclude Include="../CalcManager/headers/Rational.h" />
|
||||
<ClInclude Include="../CalcManager/headers/RationalMath.h" />
|
||||
<ClInclude Include="../CalcManager/pch.h" />
|
||||
<ClInclude Include="../CalcManager/Ratpack/CalcErr.h" />
|
||||
<ClInclude Include="../CalcManager/Ratpack/ratconst.h" />
|
||||
<ClInclude Include="../CalcManager/Ratpack/ratpak.h" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{08a1283c-522b-4820-8c56-361638a82e24}</ProjectGuid>
|
||||
|
|
@ -100,80 +100,92 @@
|
|||
<ApplicationType>Android</ApplicationType>
|
||||
<ApplicationTypeRevision>3.0</ApplicationTypeRevision>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<Import Project="$(VCTargetsPath)/Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_5_0</PlatformToolset>
|
||||
<AndroidAPILevel>android-21</AndroidAPILevel>
|
||||
<AndroidAPILevel>android-27</AndroidAPILevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_5_0</PlatformToolset>
|
||||
<AndroidAPILevel>android-27</AndroidAPILevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_5_0</PlatformToolset>
|
||||
<AndroidAPILevel>android-21</AndroidAPILevel>
|
||||
<AndroidAPILevel>android-27</AndroidAPILevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_5_0</PlatformToolset>
|
||||
<AndroidAPILevel>android-21</AndroidAPILevel>
|
||||
<AndroidAPILevel>android-27</AndroidAPILevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_5_0</PlatformToolset>
|
||||
<AndroidAPILevel>android-27</AndroidAPILevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_5_0</PlatformToolset>
|
||||
<AndroidAPILevel>android-27</AndroidAPILevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_5_0</PlatformToolset>
|
||||
<AndroidAPILevel>android-21</AndroidAPILevel>
|
||||
<AndroidAPILevel>android-27</AndroidAPILevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>Clang_5_0</PlatformToolset>
|
||||
<AndroidAPILevel>android-21</AndroidAPILevel>
|
||||
<AndroidAPILevel>android-27</AndroidAPILevel>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<Import Project="$(VCTargetsPath)/Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings" />
|
||||
<ImportGroup Label="Shared" />
|
||||
<ImportGroup Label="PropertySheets" />
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<OutDir>../Calculator.Droid/libs/$(Platform)/$(Configuration)/</OutDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<OutDir>../Calculator.Droid/libs/$(Platform)/$(Configuration)/</OutDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
|
||||
<OutDir>../Calculator.Droid/libs/$(Platform)/$(Configuration)/</OutDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
|
||||
<OutDir>../Calculator.Droid/libs/$(Platform)/$(Configuration)/</OutDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
<OutDir>../Calculator.Droid/libs/$(Platform)/$(Configuration)/</OutDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
|
||||
<OutDir>../Calculator.Droid/libs/$(Platform)/$(Configuration)/</OutDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<OutDir>../Calculator.Droid/libs/$(Platform)/$(Configuration)/</OutDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<OutDir>../Calculator.Droid/libs/$(Platform)/$(Configuration)/</OutDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>..\CalcManager\pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderFile>../CalcManager/pch.h</PrecompiledHeaderFile>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
<CppLanguageStandard>c++1z</CppLanguageStandard>
|
||||
<AdditionalIncludeDirectories>$(StlIncludeDirectories);$(Sysroot)\usr\include;$(Sysroot)\usr\include\$(AndroidHeaderTriple);$(VS_NdkRoot)\sources\android\support\include;$(SolutionDir).\CalcManager\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..;../CalcManager;$(StlIncludeDirectories);$(Sysroot)/usr/include;$(Sysroot)/usr/include/$(AndroidHeaderTriple);$(VS_NdkRoot)/sources/android/support/include;$(SolutionDir)./CalcManager/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>-Wno-unknown-pragmas -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
|
||||
|
|
@ -183,10 +195,11 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>..\CalcManager\pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderFile>../CalcManager/pch.h</PrecompiledHeaderFile>
|
||||
<CppLanguageStandard>c++1z</CppLanguageStandard>
|
||||
<AdditionalIncludeDirectories>$(StlIncludeDirectories);$(Sysroot)\usr\include;$(Sysroot)\usr\include\$(AndroidHeaderTriple);$(VS_NdkRoot)\sources\android\support\include;$(SolutionDir).\CalcManager\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..;../CalcManager;$(StlIncludeDirectories);$(Sysroot)/usr/include;$(Sysroot)/usr/include/$(AndroidHeaderTriple);$(VS_NdkRoot)/sources/android/support/include;$(SolutionDir)./CalcManager/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
<AdditionalOptions>-Wno-unknown-pragmas -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
|
||||
|
|
@ -196,10 +209,11 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>..\CalcManager\pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderFile>../CalcManager/pch.h</PrecompiledHeaderFile>
|
||||
<CppLanguageStandard>c++1z</CppLanguageStandard>
|
||||
<AdditionalIncludeDirectories>$(StlIncludeDirectories);$(Sysroot)\usr\include;$(Sysroot)\usr\include\$(AndroidHeaderTriple);$(VS_NdkRoot)\sources\android\support\include;$(SolutionDir).\CalcManager\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..;../CalcManager;$(StlIncludeDirectories);$(Sysroot)/usr/include;$(Sysroot)/usr/include/$(AndroidHeaderTriple);$(VS_NdkRoot)/sources/android/support/include;$(SolutionDir)./CalcManager/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
<AdditionalOptions>-Wno-unknown-pragmas -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
|
||||
|
|
@ -209,10 +223,11 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>..\CalcManager\pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderFile>../CalcManager/pch.h</PrecompiledHeaderFile>
|
||||
<CppLanguageStandard>c++1z</CppLanguageStandard>
|
||||
<AdditionalIncludeDirectories>$(StlIncludeDirectories);$(Sysroot)\usr\include;$(Sysroot)\usr\include\$(AndroidHeaderTriple);$(VS_NdkRoot)\sources\android\support\include;$(SolutionDir).\CalcManager\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..;../CalcManager;$(StlIncludeDirectories);$(Sysroot)/usr/include;$(Sysroot)/usr/include/$(AndroidHeaderTriple);$(VS_NdkRoot)/sources/android/support/include;$(SolutionDir)./CalcManager/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
<AdditionalOptions>-Wno-unknown-pragmas -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
|
||||
|
|
@ -222,10 +237,11 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>..\CalcManager\pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderFile>../CalcManager/pch.h</PrecompiledHeaderFile>
|
||||
<CppLanguageStandard>c++1z</CppLanguageStandard>
|
||||
<AdditionalIncludeDirectories>$(StlIncludeDirectories);$(Sysroot)\usr\include;$(Sysroot)\usr\include\$(AndroidHeaderTriple);$(VS_NdkRoot)\sources\android\support\include;$(SolutionDir).\CalcManager\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..;../CalcManager;$(StlIncludeDirectories);$(Sysroot)/usr/include;$(Sysroot)/usr/include/$(AndroidHeaderTriple);$(VS_NdkRoot)/sources/android/support/include;$(SolutionDir)./CalcManager/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
<AdditionalOptions>-Wno-unknown-pragmas -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
|
||||
|
|
@ -235,10 +251,11 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>..\CalcManager\pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderFile>../CalcManager/pch.h</PrecompiledHeaderFile>
|
||||
<CppLanguageStandard>c++1z</CppLanguageStandard>
|
||||
<AdditionalIncludeDirectories>$(StlIncludeDirectories);$(Sysroot)\usr\include;$(Sysroot)\usr\include\$(AndroidHeaderTriple);$(VS_NdkRoot)\sources\android\support\include;$(SolutionDir).\CalcManager\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..;../CalcManager;$(StlIncludeDirectories);$(Sysroot)/usr/include;$(Sysroot)/usr/include/$(AndroidHeaderTriple);$(VS_NdkRoot)/sources/android/support/include;$(SolutionDir)./CalcManager/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
<AdditionalOptions>-Wno-unknown-pragmas -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
|
||||
|
|
@ -248,10 +265,11 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>..\CalcManager\pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderFile>../CalcManager/pch.h</PrecompiledHeaderFile>
|
||||
<CppLanguageStandard>c++1z</CppLanguageStandard>
|
||||
<AdditionalIncludeDirectories>$(StlIncludeDirectories);$(Sysroot)\usr\include;$(Sysroot)\usr\include\$(AndroidHeaderTriple);$(VS_NdkRoot)\sources\android\support\include;$(SolutionDir).\CalcManager\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..;../CalcManager;$(StlIncludeDirectories);$(Sysroot)/usr/include;$(Sysroot)/usr/include/$(AndroidHeaderTriple);$(VS_NdkRoot)/sources/android/support/include;$(SolutionDir)./CalcManager/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
<AdditionalOptions>-Wno-unknown-pragmas -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
|
||||
|
|
@ -261,16 +279,17 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>..\CalcManager\pch.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderFile>../CalcManager/pch.h</PrecompiledHeaderFile>
|
||||
<CppLanguageStandard>c++1z</CppLanguageStandard>
|
||||
<AdditionalIncludeDirectories>$(StlIncludeDirectories);$(Sysroot)\usr\include;$(Sysroot)\usr\include\$(AndroidHeaderTriple);$(VS_NdkRoot)\sources\android\support\include;$(SolutionDir).\CalcManager\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..;../CalcManager;$(StlIncludeDirectories);$(Sysroot)/usr/include;$(Sysroot)/usr/include/$(AndroidHeaderTriple);$(VS_NdkRoot)/sources/android/support/include;$(SolutionDir)./CalcManager/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<ExceptionHandling>Enabled</ExceptionHandling>
|
||||
<AdditionalOptions>-Wno-unknown-pragmas -Wno-missing-braces %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<UnresolvedSymbolReferences>true</UnresolvedSymbolReferences>
|
||||
<AdditionalOptions>-lm</AdditionalOptions>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<Import Project="$(VCTargetsPath)/Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets" />
|
||||
</Project>
|
||||
|
|
@ -12,139 +12,61 @@
|
|||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\CalcManager\CalculatorHistory.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CalculatorManager.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CCalcManager.cpp" />
|
||||
<ClCompile Include="..\CalcManager\ExpressionCommand.cpp" />
|
||||
<ClCompile Include="..\CalcManager\pch.cpp" />
|
||||
<ClCompile Include="..\CalcManager\CEngine\calc.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\CalcInput.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\CalcUtils.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\History.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\Number.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\Rational.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\RationalMath.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\scicomm.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\scidisp.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\scifunc.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\scioper.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\CEngine\sciset.cpp">
|
||||
<Filter>CEngine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\basex.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\conv.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\exp.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\fact.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\itrans.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\itransh.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\logic.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\num.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\rat.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\support.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\trans.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\CalcManager\Ratpack\transh.cpp">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="../CalcManager/CalculatorHistory.cpp" />
|
||||
<ClCompile Include="../CalcManager/CalculatorManager.cpp" />
|
||||
<ClCompile Include="../CalcManager/CCalcManager.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/calc.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/CalcInput.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/CalcUtils.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/History.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/Number.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/Rational.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/RationalMath.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/scicomm.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/scidisp.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/scifunc.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/scioper.cpp" />
|
||||
<ClCompile Include="../CalcManager/CEngine/sciset.cpp" />
|
||||
<ClCompile Include="../CalcManager/ExpressionCommand.cpp" />
|
||||
<ClCompile Include="../CalcManager/pch.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/basex.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/conv.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/exp.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/fact.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/itrans.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/itransh.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/logic.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/num.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/rat.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/support.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/trans.cpp" />
|
||||
<ClCompile Include="../CalcManager/Ratpack/transh.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\CalcManager\CalculatorHistory.h" />
|
||||
<ClInclude Include="..\CalcManager\CalculatorManager.h" />
|
||||
<ClInclude Include="..\CalcManager\CalculatorResource.h" />
|
||||
<ClInclude Include="..\CalcManager\CalculatorVector.h" />
|
||||
<ClInclude Include="..\CalcManager\CCalcManager.h" />
|
||||
<ClInclude Include="..\CalcManager\Command.h" />
|
||||
<ClInclude Include="..\CalcManager\compat.h" />
|
||||
<ClInclude Include="..\CalcManager\ExpressionCommand.h" />
|
||||
<ClInclude Include="..\CalcManager\ExpressionCommandInterface.h" />
|
||||
<ClInclude Include="..\CalcManager\pch.h" />
|
||||
<ClInclude Include="..\CalcManager\headers\CalcEngine.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\CalcInput.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\CalcUtils.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\CCommand.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\EngineStrings.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\History.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\ICalcDisplay.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\IHistoryDisplay.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\Number.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\RadixType.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\Rational.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\headers\RationalMath.h">
|
||||
<Filter>headers</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\Ratpack\CalcErr.h">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\Ratpack\ratconst.h">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\CalcManager\Ratpack\ratpak.h">
|
||||
<Filter>RatPack</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="../CalcManager/CalculatorHistory.h" />
|
||||
<ClInclude Include="../CalcManager/CalculatorManager.h" />
|
||||
<ClInclude Include="../CalcManager/CalculatorResource.h" />
|
||||
<ClInclude Include="../CalcManager/CalculatorVector.h" />
|
||||
<ClInclude Include="../CalcManager/CCalcManager.h" />
|
||||
<ClInclude Include="../CalcManager/Command.h" />
|
||||
<ClInclude Include="../CalcManager/compat.h" />
|
||||
<ClInclude Include="../CalcManager/ExpressionCommand.h" />
|
||||
<ClInclude Include="../CalcManager/ExpressionCommandInterface.h" />
|
||||
<ClInclude Include="../CalcManager/headers/CalcEngine.h" />
|
||||
<ClInclude Include="../CalcManager/headers/CalcInput.h" />
|
||||
<ClInclude Include="../CalcManager/headers/CalcUtils.h" />
|
||||
<ClInclude Include="../CalcManager/headers/CCommand.h" />
|
||||
<ClInclude Include="../CalcManager/headers/EngineStrings.h" />
|
||||
<ClInclude Include="../CalcManager/headers/History.h" />
|
||||
<ClInclude Include="../CalcManager/headers/ICalcDisplay.h" />
|
||||
<ClInclude Include="../CalcManager/headers/IHistoryDisplay.h" />
|
||||
<ClInclude Include="../CalcManager/headers/Number.h" />
|
||||
<ClInclude Include="../CalcManager/headers/RadixType.h" />
|
||||
<ClInclude Include="../CalcManager/headers/Rational.h" />
|
||||
<ClInclude Include="../CalcManager/headers/RationalMath.h" />
|
||||
<ClInclude Include="../CalcManager/pch.h" />
|
||||
<ClInclude Include="../CalcManager/Ratpack/CalcErr.h" />
|
||||
<ClInclude Include="../CalcManager/Ratpack/ratconst.h" />
|
||||
<ClInclude Include="../CalcManager/Ratpack/ratpak.h" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -384,14 +384,14 @@ void CalculatorManager_UpdateMaxIntDigits(void* manager)
|
|||
AsManager(manager)->UpdateMaxIntDigits();
|
||||
}
|
||||
|
||||
const char* CalculatorManager_DecimalSeparator(void* manager)
|
||||
const wchar_t* CalculatorManager_DecimalSeparator(void* manager)
|
||||
{
|
||||
auto res = AsManager(manager)->DecimalSeparator();
|
||||
|
||||
std::wstring_convert<std::codecvt_utf8<wchar_t>> convert;
|
||||
auto str = convert.to_bytes(res);
|
||||
std::wstring ret;
|
||||
ret += res;
|
||||
|
||||
return str.data();
|
||||
return ToWChar(ret);
|
||||
}
|
||||
|
||||
bool CalculatorManager_RemoveHistoryItem(void* manager, int uIdx)
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ extern "C"
|
|||
DLL_EXPORT const wchar_t* CalculatorManager_GetResultForRadix(void* manager, int radix, int precision);
|
||||
DLL_EXPORT void CalculatorManager_SetPrecision(void* manager, int precision);
|
||||
DLL_EXPORT void CalculatorManager_UpdateMaxIntDigits(void* manager);
|
||||
DLL_EXPORT const char* CalculatorManager_DecimalSeparator(void* manager);
|
||||
DLL_EXPORT const wchar_t* CalculatorManager_DecimalSeparator(void* manager);
|
||||
DLL_EXPORT bool CalculatorManager_RemoveHistoryItem(void* manager, int uIdx);
|
||||
DLL_EXPORT void CalculatorManager_ClearHistory(void* manager);
|
||||
DLL_EXPORT size_t CalculatorManager_MaxHistorySize(void* manager);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
|
||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
|
||||
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
|
||||
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
|
||||
<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
|
||||
<ResourcesDirectory>..\Calculator.Shared\Strings</ResourcesDirectory>
|
||||
|
|
@ -84,15 +84,18 @@
|
|||
<ItemGroup>
|
||||
<AndroidResource Include="Resources\values\Styles.xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\CalcManager.Android\CalcManager.Android.vcxproj">
|
||||
<Project>{08a1283c-522b-4820-8c56-361638a82e24}</Project>
|
||||
<Name>CalcManager.Android</Name>
|
||||
<TargetPlatformIdentifier>Android</TargetPlatformIdentifier>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="..\Calculator.Shared\Calculator.Shared.projitems" Label="Shared" Condition="Exists('..\Calculator.Shared\Calculator.Shared.projitems')" />
|
||||
<ItemGroup>
|
||||
<AndroidNativeLibrary Include="libs\ARM\$(Configuration)\libCalcManager.so">
|
||||
<Abi>armeabi-v7a</Abi>
|
||||
</AndroidNativeLibrary>
|
||||
<AndroidNativeLibrary Include="libs\ARM64\$(Configuration)\libCalcManager.so">
|
||||
<Abi>arm64-v8a</Abi>
|
||||
</AndroidNativeLibrary>
|
||||
<AndroidNativeLibrary Include="libs\x86\$(Configuration)\libCalcManager.so">
|
||||
<Abi>x86</Abi>
|
||||
</AndroidNativeLibrary>
|
||||
</ItemGroup>
|
||||
<Import Project="..\Calculator.Shared\Calculator.Shared.projitems" Label="Shared" Condition="Exists('..\Calculator.Shared\Calculator.Shared.projitems')" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
@ -101,4 +104,4 @@
|
|||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="WindowsCalculator" android:versionCode="1" android:versionName="1.0">
|
||||
<uses-sdk android:minSdkVersion="16" />
|
||||
<application android:label="WindowsCalculator"></application>
|
||||
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
|
||||
<application android:label="WindowsCalculator"></application>
|
||||
</manifest>
|
||||
|
|
@ -73,7 +73,7 @@ namespace CalculationManager
|
|||
public static extern void CalculatorManager_UpdateMaxIntDigits(IntPtr nativeManager);
|
||||
|
||||
[DllImport(DllPath)]
|
||||
public static extern char CalculatorManager_DecimalSeparator(IntPtr nativeManager);
|
||||
public static extern IntPtr CalculatorManager_DecimalSeparator(IntPtr nativeManager);
|
||||
|
||||
[DllImport(DllPath)]
|
||||
public static extern bool CalculatorManager_RemoveHistoryItem(IntPtr nativeManager, int uIdx);
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using CalculatorApp;
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
|
||||
|
|
@ -217,7 +218,10 @@ namespace CalculationManager
|
|||
=> NativeDispatch.CalculatorManager_UpdateMaxIntDigits(_nativeManager);
|
||||
|
||||
public char DecimalSeparator()
|
||||
=> NativeDispatch.CalculatorManager_DecimalSeparator(_nativeManager);
|
||||
{
|
||||
var pString = NativeDispatch.CalculatorManager_DecimalSeparator(_nativeManager);
|
||||
return NativeDispatch.PtrToString(pString).FirstOrDefault();
|
||||
}
|
||||
|
||||
public List<HISTORYITEM> GetHistoryItems()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ namespace CalculatorApp
|
|||
public static readonly DependencyProperty IsOperatorCommandProperty =
|
||||
DependencyProperty.Register("IsOperatorCommand", typeof(bool), typeof(CalculationResult), new PropertyMetadata(false));
|
||||
|
||||
public event SelectedEventHandler Selected;
|
||||
public event SelectedEventHandler ValueSelected;
|
||||
|
||||
|
||||
private Windows.UI.Xaml.Controls.ScrollViewer m_textContainer;
|
||||
|
|
@ -532,7 +532,7 @@ namespace CalculatorApp
|
|||
|
||||
void RaiseSelectedEvent()
|
||||
{
|
||||
Selected?.Invoke(this);
|
||||
ValueSelected?.Invoke(this);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -504,7 +504,7 @@
|
|||
FlowDirection="{x:Bind LayoutDirection}"
|
||||
IsActive="{Binding Value1Active, Mode=TwoWay}"
|
||||
KeyDown="OnValueKeyDown"
|
||||
Selected="OnValueSelected"
|
||||
ValueSelected="OnValueSelected"
|
||||
TabIndex="1"/>
|
||||
<!--TODO UNO
|
||||
AutomationProperties.AutomationId="Value1"
|
||||
|
|
@ -560,7 +560,7 @@
|
|||
FlowDirection="{x:Bind LayoutDirection}"
|
||||
IsActive="{Binding Value2Active, Mode=TwoWay}"
|
||||
KeyDown="OnValueKeyDown"
|
||||
Selected="OnValueSelected"
|
||||
ValueSelected="OnValueSelected"
|
||||
TabIndex="3"/>
|
||||
<!--TODO UNO
|
||||
AutomationProperties.AutomationId="Value2"
|
||||
|
|
|
|||
|
|
@ -197,9 +197,9 @@ namespace CalculatorApp
|
|||
|
||||
// Find the delimiters.
|
||||
int firstSplitPosition = offlineStatusHyperlinkText.find(delimiter, 0);
|
||||
Debug.Assert(firstSplitPosition != "".npos());
|
||||
System.Diagnostics.Debug.Assert(firstSplitPosition != "".npos());
|
||||
int secondSplitPosition = offlineStatusHyperlinkText.find(delimiter, firstSplitPosition + 1);
|
||||
Debug.Assert(secondSplitPosition != "".npos());
|
||||
System.Diagnostics.Debug.Assert(secondSplitPosition != "".npos());
|
||||
int hyperlinkTextLength = secondSplitPosition - (firstSplitPosition + delimiterLength);
|
||||
|
||||
// Assign pieces.
|
||||
|
|
@ -281,7 +281,7 @@ namespace CalculatorApp
|
|||
}
|
||||
}
|
||||
|
||||
void OnValueSelected( object sender)
|
||||
public void OnValueSelected( object sender)
|
||||
{
|
||||
var value = (CalculationResult) sender;
|
||||
// update the font size since the font is changed to bold
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@ EndProject
|
|||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calculator.Wasm", "Calculator.Wasm\Calculator.Wasm.csproj", "{53337466-6E79-45F3-A650-1BFB93CC19B0}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CalcManager.Android", "CalcManager.Android\CalcManager.Android.vcxproj", "{08A1283C-522B-4820-8C56-361638A82E24}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{311E866D-8B93-4609-A691-265941FEE101} = {311E866D-8B93-4609-A691-265941FEE101}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
|
|
@ -179,6 +182,7 @@ Global
|
|||
{A8517645-FA26-4BBE-A931-52FCF16DB2C6}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{A8517645-FA26-4BBE-A931-52FCF16DB2C6}.Debug|x86.Deploy.0 = Debug|Any CPU
|
||||
{A8517645-FA26-4BBE-A931-52FCF16DB2C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A8517645-FA26-4BBE-A931-52FCF16DB2C6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A8517645-FA26-4BBE-A931-52FCF16DB2C6}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{A8517645-FA26-4BBE-A931-52FCF16DB2C6}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{A8517645-FA26-4BBE-A931-52FCF16DB2C6}.Release|ARM.Deploy.0 = Release|Any CPU
|
||||
|
|
@ -359,6 +363,57 @@ Global
|
|||
{53337466-6E79-45F3-A650-1BFB93CC19B0}.Release|x64.Build.0 = Release|Any CPU
|
||||
{53337466-6E79-45F3-A650-1BFB93CC19B0}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{53337466-6E79-45F3-A650-1BFB93CC19B0}.Release|x86.Build.0 = Release|Any CPU
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|Any CPU.Build.0 = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|ARM.Build.0 = Release|ARM
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|ARM64.ActiveCfg = Release|ARM64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|ARM64.Build.0 = Release|ARM64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|iPhone.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|iPhone.Build.0 = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|x64.ActiveCfg = Release|x64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|x64.Build.0 = Release|x64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|x86.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Ad-Hoc|x86.Build.0 = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|Any CPU.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|Any CPU.Build.0 = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|ARM.ActiveCfg = Release|ARM
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|ARM.Build.0 = Release|ARM
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|ARM64.ActiveCfg = Release|ARM64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|ARM64.Build.0 = Release|ARM64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|iPhone.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|iPhone.Build.0 = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|iPhoneSimulator.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|iPhoneSimulator.Build.0 = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|x64.ActiveCfg = Release|x64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|x64.Build.0 = Release|x64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|x86.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.AppStore|x86.Build.0 = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|Any CPU.Build.0 = Debug|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|ARM.ActiveCfg = Debug|ARM
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|ARM.Build.0 = Debug|ARM
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|ARM64.ActiveCfg = Debug|ARM64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|ARM64.Build.0 = Debug|ARM64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|iPhone.ActiveCfg = Debug|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|x64.Build.0 = Debug|x64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Debug|x86.Build.0 = Debug|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|ARM.ActiveCfg = Release|ARM
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|ARM.Build.0 = Release|ARM
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|ARM64.ActiveCfg = Release|ARM64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|ARM64.Build.0 = Release|ARM64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|iPhone.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|iPhoneSimulator.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|x64.ActiveCfg = Release|x64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|x64.Build.0 = Release|x64
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|x86.ActiveCfg = Release|x86
|
||||
{08A1283C-522B-4820-8C56-361638A82E24}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче