Skip to content

Commit bc8d51e

Browse files
stgatesstgates
committed
Working around Visual Studio Android not including -funwind-tables when -fexceptions is present.
1 parent b757c94 commit bc8d51e

File tree

15 files changed

+59
-19
lines changed

15 files changed

+59
-19
lines changed

‎Release/src/build/package_info.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<ClCompile>
2828
<AdditionalOptions Condition="'$(PlatformToolset)'=='v140'">/d2notypeopt %(AdditionalOptions)</AdditionalOptions>
2929
<PreprocessorDefinitions Condition="'$(PlatformToolset)' == 'v120_xp'">CPPREST_TARGET_XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
30+
<!-- Workaround Visual Studio Android bug missing -funwind-tables if -fexceptions is specified. -->
31+
<AdditionalOptions Condition="'$(PlatformToolset)' == 'Clang_3_4'">-funwind-tables %(AdditionalOptions)</AdditionalOptions>
3032
</ClCompile>
3133
<Link>
3234
<LibraryDependencies Condition="'$(PlatformToolset)' == 'Clang_3_4'">m;%(LibraryDependencies)</LibraryDependencies>

‎Release/src/build/vs14.android/casablanca140.android.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
<CppLanguageStandard>c++11</CppLanguageStandard>
7474
<RuntimeTypeInfo>true</RuntimeTypeInfo>
7575
<TreatWarningAsError>true</TreatWarningAsError>
76+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
7677
</ClCompile>
7778
</ItemDefinitionGroup>
7879
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -83,6 +84,7 @@
8384
<ExceptionHandling>Enabled</ExceptionHandling>
8485
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8586
<TreatWarningAsError>true</TreatWarningAsError>
87+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
8688
</ClCompile>
8789
</ItemDefinitionGroup>
8890
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -93,6 +95,7 @@
9395
<ExceptionHandling>Enabled</ExceptionHandling>
9496
<RuntimeTypeInfo>true</RuntimeTypeInfo>
9597
<TreatWarningAsError>true</TreatWarningAsError>
98+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
9699
</ClCompile>
97100
</ItemDefinitionGroup>
98101
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -103,6 +106,7 @@
103106
<ExceptionHandling>Enabled</ExceptionHandling>
104107
<RuntimeTypeInfo>true</RuntimeTypeInfo>
105108
<TreatWarningAsError>true</TreatWarningAsError>
109+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
106110
</ClCompile>
107111
</ItemDefinitionGroup>
108112
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">

‎Release/tests/common/TestRunner/vs14.android/TestRunner.android.NativeActivity/TestRunner.android.NativeActivity.vcxproj

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|ARM">
@@ -72,7 +72,8 @@
7272
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" />
7373
<ItemDefinitionGroup>
7474
<ClCompile>
75-
<WarningLevel></WarningLevel>
75+
<WarningLevel>
76+
</WarningLevel>
7677
</ClCompile>
7778
</ItemDefinitionGroup>
7879
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -84,6 +85,7 @@
8485
<RuntimeTypeInfo>true</RuntimeTypeInfo>
8586
<CppLanguageStandard>c++11</CppLanguageStandard>
8687
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
8789
</ClCompile>
8890
<Link>
8991
<LibraryDependencies>%(LibraryDependencies);GLESv1_CM;EGL;m</LibraryDependencies>
@@ -98,6 +100,7 @@
98100
<RuntimeTypeInfo>true</RuntimeTypeInfo>
99101
<CppLanguageStandard>c++11</CppLanguageStandard>
100102
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
103+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
101104
</ClCompile>
102105
<Link>
103106
<LibraryDependencies>%(LibraryDependencies);GLESv1_CM;EGL;m</LibraryDependencies>
@@ -112,6 +115,7 @@
112115
<RuntimeTypeInfo>true</RuntimeTypeInfo>
113116
<CppLanguageStandard>c++11</CppLanguageStandard>
114117
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
118+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
115119
</ClCompile>
116120
<Link>
117121
<LibraryDependencies>%(LibraryDependencies);GLESv1_CM;EGL;m</LibraryDependencies>
@@ -126,6 +130,7 @@
126130
<RuntimeTypeInfo>true</RuntimeTypeInfo>
127131
<CppLanguageStandard>c++11</CppLanguageStandard>
128132
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
133+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
129134
</ClCompile>
130135
<Link>
131136
<LibraryDependencies>%(LibraryDependencies);GLESv1_CM;EGL;m</LibraryDependencies>
@@ -274,4 +279,4 @@
274279
<Error Condition="!Exists('$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\openssl-android.1.0.1.0\build\native\openssl-android.targets'))" />
275280
<Error Condition="!Exists('$(PackagesRoot)\boost_random-android.1.55.0.0\build\native\boost_random-android.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesRoot)\boost_random-android.1.55.0.0\build\native\boost_random-android.targets'))" />
276281
</Target>
277-
</Project>
282+
</Project>

‎Release/tests/common/UnitTestpp/vs14.android/UnitTestpp140.android.vcxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
<CppLanguageStandard>c++11</CppLanguageStandard>
143143
<RuntimeTypeInfo>true</RuntimeTypeInfo>
144144
<TreatWarningAsError>true</TreatWarningAsError>
145+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
145146
</ClCompile>
146147
</ItemDefinitionGroup>
147148
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -152,6 +153,7 @@
152153
<ExceptionHandling>Enabled</ExceptionHandling>
153154
<RuntimeTypeInfo>true</RuntimeTypeInfo>
154155
<TreatWarningAsError>true</TreatWarningAsError>
156+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
155157
</ClCompile>
156158
</ItemDefinitionGroup>
157159
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -162,6 +164,7 @@
162164
<ExceptionHandling>Enabled</ExceptionHandling>
163165
<RuntimeTypeInfo>true</RuntimeTypeInfo>
164166
<TreatWarningAsError>true</TreatWarningAsError>
167+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
165168
</ClCompile>
166169
</ItemDefinitionGroup>
167170
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -172,6 +175,7 @@
172175
<ExceptionHandling>Enabled</ExceptionHandling>
173176
<RuntimeTypeInfo>true</RuntimeTypeInfo>
174177
<TreatWarningAsError>true</TreatWarningAsError>
178+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
175179
</ClCompile>
176180
</ItemDefinitionGroup>
177181
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -180,8 +184,6 @@
180184
<PropertyGroup>
181185
<TargetName>UnitTestpp140.android</TargetName>
182186
</PropertyGroup>
183-
184-
185187
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
186188
<ImportGroup Label="ExtensionTargets">
187189
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />

‎Release/tests/functional/http/client/vs14.android/HttpClient140_test.android.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
<CppLanguageStandard>c++11</CppLanguageStandard>
112112
<RuntimeTypeInfo>true</RuntimeTypeInfo>
113113
<TreatWarningAsError>true</TreatWarningAsError>
114+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
114115
</ClCompile>
115116
</ItemDefinitionGroup>
116117
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -121,6 +122,7 @@
121122
<ExceptionHandling>Enabled</ExceptionHandling>
122123
<RuntimeTypeInfo>true</RuntimeTypeInfo>
123124
<TreatWarningAsError>true</TreatWarningAsError>
125+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
124126
</ClCompile>
125127
</ItemDefinitionGroup>
126128
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -131,6 +133,7 @@
131133
<ExceptionHandling>Enabled</ExceptionHandling>
132134
<RuntimeTypeInfo>true</RuntimeTypeInfo>
133135
<TreatWarningAsError>true</TreatWarningAsError>
136+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
134137
</ClCompile>
135138
</ItemDefinitionGroup>
136139
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -141,6 +144,7 @@
141144
<ExceptionHandling>Enabled</ExceptionHandling>
142145
<RuntimeTypeInfo>true</RuntimeTypeInfo>
143146
<TreatWarningAsError>true</TreatWarningAsError>
147+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
144148
</ClCompile>
145149
</ItemDefinitionGroup>
146150
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">

‎Release/tests/functional/http/listener/vs14.android/HttpListener140_test.android.vcxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
<CppLanguageStandard>c++11</CppLanguageStandard>
104104
<RuntimeTypeInfo>true</RuntimeTypeInfo>
105105
<TreatWarningAsError>true</TreatWarningAsError>
106+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
106107
</ClCompile>
107108
</ItemDefinitionGroup>
108109
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -113,6 +114,7 @@
113114
<ExceptionHandling>Enabled</ExceptionHandling>
114115
<RuntimeTypeInfo>true</RuntimeTypeInfo>
115116
<TreatWarningAsError>true</TreatWarningAsError>
117+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
116118
</ClCompile>
117119
</ItemDefinitionGroup>
118120
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -123,6 +125,7 @@
123125
<ExceptionHandling>Enabled</ExceptionHandling>
124126
<RuntimeTypeInfo>true</RuntimeTypeInfo>
125127
<TreatWarningAsError>true</TreatWarningAsError>
128+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
126129
</ClCompile>
127130
</ItemDefinitionGroup>
128131
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -133,6 +136,7 @@
133136
<ExceptionHandling>Enabled</ExceptionHandling>
134137
<RuntimeTypeInfo>true</RuntimeTypeInfo>
135138
<TreatWarningAsError>true</TreatWarningAsError>
139+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
136140
</ClCompile>
137141
</ItemDefinitionGroup>
138142
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -141,8 +145,6 @@
141145
<PropertyGroup>
142146
<TargetName>HttpListener140_test.android</TargetName>
143147
</PropertyGroup>
144-
145-
146148
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
147149
<ImportGroup Label="ExtensionTargets">
148150
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />

‎Release/tests/functional/http/utilities/vs14.android/HttpTestUtilities140.android.vcxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<CppLanguageStandard>c++11</CppLanguageStandard>
100100
<RuntimeTypeInfo>true</RuntimeTypeInfo>
101101
<TreatWarningAsError>true</TreatWarningAsError>
102+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
102103
</ClCompile>
103104
</ItemDefinitionGroup>
104105
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -109,6 +110,7 @@
109110
<ExceptionHandling>Enabled</ExceptionHandling>
110111
<RuntimeTypeInfo>true</RuntimeTypeInfo>
111112
<TreatWarningAsError>true</TreatWarningAsError>
113+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
112114
</ClCompile>
113115
</ItemDefinitionGroup>
114116
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -119,6 +121,7 @@
119121
<ExceptionHandling>Enabled</ExceptionHandling>
120122
<RuntimeTypeInfo>true</RuntimeTypeInfo>
121123
<TreatWarningAsError>true</TreatWarningAsError>
124+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
122125
</ClCompile>
123126
</ItemDefinitionGroup>
124127
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -129,6 +132,7 @@
129132
<ExceptionHandling>Enabled</ExceptionHandling>
130133
<RuntimeTypeInfo>true</RuntimeTypeInfo>
131134
<TreatWarningAsError>true</TreatWarningAsError>
135+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
132136
</ClCompile>
133137
</ItemDefinitionGroup>
134138
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -137,8 +141,6 @@
137141
<PropertyGroup>
138142
<TargetName>HttpTestUtilities140.android</TargetName>
139143
</PropertyGroup>
140-
141-
142144
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
143145
<ImportGroup Label="ExtensionTargets">
144146
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />

‎Release/tests/functional/json/vs14.android/JSON140_test.android.vcxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<CppLanguageStandard>c++11</CppLanguageStandard>
9898
<RuntimeTypeInfo>true</RuntimeTypeInfo>
9999
<TreatWarningAsError>true</TreatWarningAsError>
100+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
100101
</ClCompile>
101102
</ItemDefinitionGroup>
102103
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -107,6 +108,7 @@
107108
<ExceptionHandling>Enabled</ExceptionHandling>
108109
<RuntimeTypeInfo>true</RuntimeTypeInfo>
109110
<TreatWarningAsError>true</TreatWarningAsError>
111+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
110112
</ClCompile>
111113
</ItemDefinitionGroup>
112114
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -117,6 +119,7 @@
117119
<ExceptionHandling>Enabled</ExceptionHandling>
118120
<RuntimeTypeInfo>true</RuntimeTypeInfo>
119121
<TreatWarningAsError>true</TreatWarningAsError>
122+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
120123
</ClCompile>
121124
</ItemDefinitionGroup>
122125
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -127,6 +130,7 @@
127130
<ExceptionHandling>Enabled</ExceptionHandling>
128131
<RuntimeTypeInfo>true</RuntimeTypeInfo>
129132
<TreatWarningAsError>true</TreatWarningAsError>
133+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
130134
</ClCompile>
131135
</ItemDefinitionGroup>
132136
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -135,8 +139,6 @@
135139
<PropertyGroup>
136140
<TargetName>JSON140_test.android</TargetName>
137141
</PropertyGroup>
138-
139-
140142
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
141143
<ImportGroup Label="ExtensionTargets">
142144
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />

‎Release/tests/functional/pplx/pplx_test/vs14.android/pplx140_test.android.vcxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
<CppLanguageStandard>c++11</CppLanguageStandard>
9393
<RuntimeTypeInfo>true</RuntimeTypeInfo>
9494
<TreatWarningAsError>true</TreatWarningAsError>
95+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
9596
</ClCompile>
9697
</ItemDefinitionGroup>
9798
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -102,6 +103,7 @@
102103
<ExceptionHandling>Enabled</ExceptionHandling>
103104
<RuntimeTypeInfo>true</RuntimeTypeInfo>
104105
<TreatWarningAsError>true</TreatWarningAsError>
106+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
105107
</ClCompile>
106108
</ItemDefinitionGroup>
107109
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -112,6 +114,7 @@
112114
<ExceptionHandling>Enabled</ExceptionHandling>
113115
<RuntimeTypeInfo>true</RuntimeTypeInfo>
114116
<TreatWarningAsError>true</TreatWarningAsError>
117+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
115118
</ClCompile>
116119
</ItemDefinitionGroup>
117120
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -122,6 +125,7 @@
122125
<ExceptionHandling>Enabled</ExceptionHandling>
123126
<RuntimeTypeInfo>true</RuntimeTypeInfo>
124127
<TreatWarningAsError>true</TreatWarningAsError>
128+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
125129
</ClCompile>
126130
</ItemDefinitionGroup>
127131
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -130,8 +134,6 @@
130134
<PropertyGroup>
131135
<TargetName>pplx140_test.android</TargetName>
132136
</PropertyGroup>
133-
134-
135137
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
136138
<ImportGroup Label="ExtensionTargets">
137139
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />

‎Release/tests/functional/streams/vs14.android/streams140_test.android.vcxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<CppLanguageStandard>c++11</CppLanguageStandard>
9797
<RuntimeTypeInfo>true</RuntimeTypeInfo>
9898
<TreatWarningAsError>true</TreatWarningAsError>
99+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
99100
</ClCompile>
100101
</ItemDefinitionGroup>
101102
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -106,6 +107,7 @@
106107
<ExceptionHandling>Enabled</ExceptionHandling>
107108
<RuntimeTypeInfo>true</RuntimeTypeInfo>
108109
<TreatWarningAsError>true</TreatWarningAsError>
110+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
109111
</ClCompile>
110112
</ItemDefinitionGroup>
111113
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -116,6 +118,7 @@
116118
<ExceptionHandling>Enabled</ExceptionHandling>
117119
<RuntimeTypeInfo>true</RuntimeTypeInfo>
118120
<TreatWarningAsError>true</TreatWarningAsError>
121+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
119122
</ClCompile>
120123
</ItemDefinitionGroup>
121124
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
@@ -126,6 +129,7 @@
126129
<ExceptionHandling>Enabled</ExceptionHandling>
127130
<RuntimeTypeInfo>true</RuntimeTypeInfo>
128131
<TreatWarningAsError>true</TreatWarningAsError>
132+
<AdditionalOptions>-funwind-tables %(AdditionalOptions)</AdditionalOptions>
129133
</ClCompile>
130134
</ItemDefinitionGroup>
131135
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -134,8 +138,6 @@
134138
<PropertyGroup>
135139
<TargetName>streams140_test.android</TargetName>
136140
</PropertyGroup>
137-
138-
139141
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
140142
<ImportGroup Label="ExtensionTargets">
141143
<Import Project="$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('$(PackagesRoot)\boost.1.55.0.16\build\native\boost.targets')" />

0 commit comments

Comments
 (0)