Skip to content

Commit 3c16528

Browse files
evoskuilevoskuil
authored
Merge pull request #343 from evoskuil/master
Add ARM/ARM64 support for VS builds.
2 parents 41f0dd0 + 1c9761d commit 3c16528

File tree

16 files changed

+232
-50
lines changed

16 files changed

+232
-50
lines changed

‎generate4.xml

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,16 @@
2828
<!-- https://trac.macports.org/ticket/42282 [clang, 1.55] -->
2929
<!-- https://svn.boost.org/trac/boost/ticket/8973 [gcc, 1.54] -->
3030
<!-- https://svn.boost.org/trac/boost/ticket/6851 [gcc, 1.50-1.53] -->
31-
<!-- [log rotation derivation for customization] [???? 1.56] -->
3231
<!-- [compiler failure] [vc120 1.62-1.72] -->
3332
<dependency name="boost" version="1.76.0" />
3433
<!-- boost atomic is header-only for lock-free cases. -->
35-
<!-- www.boost.org/doc/libs/1_78_0/doc/html/atomic/interface.html
36-
<dependency name="boost_atomic" m4="none" />
37-
-->
3834
<dependency name="boost_chrono" />
3935
<dependency name="boost_container" m4="none" />
40-
<!-- <dependency name="boost_date_time" /> -->
41-
<!-- <dependency name="boost_filesystem" /> -->
4236
<dependency name="boost_iostreams" />
4337
<!-- boost json is not used in the header-only configuration. -->
4438
<dependency name="boost_json" />
4539
<dependency name="boost_locale" />
4640
<dependency name="boost_program_options" />
47-
<!-- <dependency name="boost_regex" /> -->
4841
<dependency name="boost_system" />
4942
<dependency name="boost_thread" />
5043
<dependency name="boost_unit_test_framework" option="tests" />
@@ -161,13 +154,10 @@
161154
<flag substitute="icu" />
162155
<library name="boost" />
163156
<library name="boost_chrono" />
164-
<!-- <library name="boost_date_time" /> -->
165-
<!-- <library name="boost_filesystem" /> -->
166157
<library name="boost_iostreams" />
167158
<library name="boost_json" />
168159
<library name="boost_locale" />
169160
<library name="boost_program_options" />
170-
<!-- <library name="boost_regex" /> -->
171161
<library name="boost_system" />
172162
<library name="boost_thread" />
173163
<library name="pthread" />
@@ -2205,7 +2195,7 @@
22052195
<resource canonical="boost">
22062196
<package compiler="vc141" name="boost" version="1.76.0.0" />
22072197
<package compiler="vc142" name="boost" version="1.76.0.0" />
2208-
<package compiler="vc143" name="boost" version="1.78.0" />
2198+
<package compiler="vc143" name="boost" version="1.86.0" />
22092199
</resource>
22102200
<!-- boost atomic is header-only for lock-free cases. -->
22112201
<!-- www.boost.org/doc/libs/1_78_0/doc/html/atomic/interface.html -->
@@ -2216,7 +2206,7 @@
22162206
<resource canonical="boost_chrono">
22172207
<package compiler="vc141" name="boost_chrono-vc141" version="1.76.0.0" />
22182208
<package compiler="vc142" name="boost_chrono-vc142" version="1.76.0.0" />
2219-
<package compiler="vc143" name="boost_chrono-vc143" version="1.78.0" />
2209+
<package compiler="vc143" name="boost_chrono-vc143" version="1.86.0" />
22202210
</resource>
22212211
<resource canonical="boost_container">
22222212
<!-- boost container is a header-only library, except if you use -->
@@ -2225,57 +2215,47 @@
22252215
<!-- These are required by use of boost json (even as headers only). -->
22262216
<package compiler="vc141" name="boost_container-vc141" version="1.76.0.0" />
22272217
<package compiler="vc142" name="boost_container-vc142" version="1.76.0.0" />
2228-
<package compiler="vc143" name="boost_container-vc143" version="1.78.0" />
2218+
<package compiler="vc143" name="boost_container-vc143" version="1.86.0" />
22292219
</resource>
2230-
<!-- <resource canonical="boost_date_time">
2231-
<package compiler="vc141" name="boost_date_time-vc141" version="1.76.0.0" />
2232-
<package compiler="vc142" name="boost_date_time-vc142" version="1.76.0.0" />
2233-
<package compiler="vc143" name="boost_date_time-vc143" version="1.78.0" />
2234-
</resource> -->
2235-
<!-- <resource canonical="boost_filesystem">
2236-
<package compiler="vc141" name="boost_filesystem-vc141" version="1.76.0.0" />
2237-
<package compiler="vc142" name="boost_filesystem-vc142" version="1.76.0.0" />
2238-
<package compiler="vc143" name="boost_filesystem-vc143" version="1.78.0" />
2239-
</resource> -->
22402220
<resource canonical="boost_iostreams">
22412221
<package compiler="vc141" name="boost_iostreams-vc141" version="1.76.0.0" />
22422222
<package compiler="vc142" name="boost_iostreams-vc142" version="1.76.0.0" />
2243-
<package compiler="vc143" name="boost_iostreams-vc143" version="1.78.0" />
2223+
<package compiler="vc143" name="boost_iostreams-vc143" version="1.86.0" />
22442224
</resource>
22452225
<resource canonical="boost_json">
22462226
<package compiler="vc141" name="boost_json-vc141" version="1.76.0.0" />
22472227
<package compiler="vc142" name="boost_json-vc142" version="1.76.0.0" />
2248-
<package compiler="vc143" name="boost_json-vc143" version="1.78.0" />
2228+
<package compiler="vc143" name="boost_json-vc143" version="1.86.0" />
22492229
</resource>
22502230
<resource canonical="boost_locale">
22512231
<package compiler="vc141" name="boost_locale-vc141" version="1.76.0.0" />
22522232
<package compiler="vc142" name="boost_locale-vc142" version="1.76.0.0" />
2253-
<package compiler="vc143" name="boost_locale-vc143" version="1.78.0" />
2233+
<package compiler="vc143" name="boost_locale-vc143" version="1.86.0" />
22542234
</resource>
22552235
<resource canonical="boost_program_options">
22562236
<package compiler="vc141" name="boost_program_options-vc141" version="1.76.0.0" />
22572237
<package compiler="vc142" name="boost_program_options-vc142" version="1.76.0.0" />
2258-
<package compiler="vc143" name="boost_program_options-vc143" version="1.78.0" />
2238+
<package compiler="vc143" name="boost_program_options-vc143" version="1.86.0" />
22592239
</resource>
22602240
<resource canonical="boost_regex">
22612241
<package compiler="vc141" name="boost_regex-vc141" version="1.76.0.0" />
22622242
<package compiler="vc142" name="boost_regex-vc142" version="1.76.0.0" />
2263-
<package compiler="vc143" name="boost_regex-vc143" version="1.78.0" />
2243+
<package compiler="vc143" name="boost_regex-vc143" version="1.86.0" />
22642244
</resource>
22652245
<resource canonical="boost_system">
22662246
<package compiler="vc141" name="boost_system-vc141" version="1.76.0.0" />
22672247
<package compiler="vc142" name="boost_system-vc142" version="1.76.0.0" />
2268-
<package compiler="vc143" name="boost_system-vc143" version="1.78.0" />
2248+
<package compiler="vc143" name="boost_system-vc143" version="1.86.0" />
22692249
</resource>
22702250
<resource canonical="boost_thread">
22712251
<package compiler="vc141" name="boost_thread-vc141" version="1.76.0.0" />
22722252
<package compiler="vc142" name="boost_thread-vc142" version="1.76.0.0" />
2273-
<package compiler="vc143" name="boost_thread-vc143" version="1.78.0" />
2253+
<package compiler="vc143" name="boost_thread-vc143" version="1.86.0" />
22742254
</resource>
22752255
<resource canonical="boost_unit_test_framework">
22762256
<package compiler="vc141" name="boost_unit_test_framework-vc141" version="1.76.0.0" />
22772257
<package compiler="vc142" name="boost_unit_test_framework-vc142" version="1.76.0.0" />
2278-
<package compiler="vc143" name="boost_unit_test_framework-vc143" version="1.78.0" />
2258+
<package compiler="vc143" name="boost_unit_test_framework-vc143" version="1.86.0" />
22792259
</resource>
22802260
<resource canonical="secp256k1">
22812261
<!-- The vc120 secp256k1 nuget package is no longer supported -->
@@ -2388,14 +2368,6 @@
23882368
<!-- vscode -->
23892369
<template name="gsl.vscode.settings.json" />
23902370
<template name="gsl.code-workspace" />
2391-
2392-
<!-- no longer supported -->
2393-
<!-- <template name="gsl.interface.swg" /> -->
2394-
<!-- <template name="gsl.bindings.sh" /> -->
2395-
<!-- <template name="gsl.bindings.bat" /> -->
2396-
<!-- <template name="gsl.travis.yml" /> -->
2397-
<!-- <template name="gsl.build.ps1" /> -->
2398-
<!-- <template name="gsl.appveyor.yml" /> -->
23992371
</templates>
24002372

24012373
</generate>

‎props/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ There is generally no good reason to change the `.props` files as overrides are
3131

3232
Note that all `.props' files are assumed to be in a common directory, despite the repo structure.
3333

34-
The following combinations are achieved by referencing the desired build configuration (e.g. `DynamicDLL.props`) as shown above.
34+
The following combinations are achieved by referencing the desired build configuration (e.g. `DynamicDLL.props`) as shown above. The same six are also available for ARM/ARM64.
3535

3636
**Dynamic libraries linked dynamically to CRT**
3737
```

‎props/version4/base/Arm.props

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<_PropertySheetDisplayName>ARM32 Settings</_PropertySheetDisplayName>
6+
</PropertyGroup>
7+
8+
<ItemDefinitionGroup>
9+
<ClCompile>
10+
<!-- Note that WIN32 and _WIN32 are safe for ARM32 builds and ensure compatibility with
11+
Windows headers, as they imply Windows 32-bit or above. _ARM_ indicates the 32-bit ARM
12+
architecture. -->
13+
<PreprocessorDefinitions>WIN32;_WIN32;_ARM_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
14+
</ClCompile>
15+
<Link>
16+
<TargetMachine>MachineARM</TargetMachine>
17+
</Link>
18+
<Lib>
19+
<AdditionalOptions>/MACHINE:ARM %(AdditionalOptions)</AdditionalOptions>
20+
</Lib>
21+
</ItemDefinitionGroup>
22+
23+
</Project>

‎props/version4/base/Arm64.props

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<_PropertySheetDisplayName>ARM64 Settings</_PropertySheetDisplayName>
6+
</PropertyGroup>
7+
8+
<ItemDefinitionGroup>
9+
<ClCompile>
10+
<!-- Note that Win32 defines may cause WIN32 to become defined when using Windows headers,
11+
but _WIN32 implies Windows 32-bit or above. These are safe for ARM64 builds and ensure
12+
compatibility with Windows headers. _ARM64 indicates the ARM64 architecture. -->
13+
<PreprocessorDefinitions>WIN32;_WIN32;_ARM64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
14+
</ClCompile>
15+
<Link>
16+
<TargetMachine>MachineARM64</TargetMachine>
17+
</Link>
18+
<Lib>
19+
<AdditionalOptions>/MACHINE:ARM64 %(AdditionalOptions)</AdditionalOptions>
20+
</Lib>
21+
</ItemDefinitionGroup>
22+
23+
</Project>

‎props/version4/project/libbitcoin-blockchain/libbitcoin-blockchain-test/libbitcoin-blockchain-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ClCompile>
1414
<AdditionalIncludeDirectories>$(RepoRoot)include\;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1515
<EnablePREfast>false</EnablePREfast>
16-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1717
</ClCompile>
1818
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1919
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎props/version4/project/libbitcoin-client/libbitcoin-client-test/libbitcoin-client-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ClCompile>
1414
<EnablePREfast>false</EnablePREfast>
1515
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1717
</ClCompile>
1818
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1919
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎props/version4/project/libbitcoin-consensus/libbitcoin-consensus-test/libbitcoin-consensus-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<!-- 4996: (2) unchecked iterator, call to 'std::copy' with parameters that may be unsafe. -->
2323
<!-- 4100: (7) unreferenced formal parameter. -->
2424
<DisableSpecificWarnings>4018;4100;4244;4267;4715;4800;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
25-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
25+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
2626
</ClCompile>
2727
<!-- We have a problem in configuration of boost test with dynamic lib, run tests after release builds. -->
2828
<PostBuildEvent Condition="'$(DefaultLinkage)' != 'dynamic' and '$(DebugOrRelease)' == 'release'">

‎props/version4/project/libbitcoin-database/libbitcoin-database-test/libbitcoin-database-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ClCompile>
1414
<AdditionalIncludeDirectories>$(RepoRoot)include\;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1515
<EnablePREfast>false</EnablePREfast>
16-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
16+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1717
</ClCompile>
1818
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1919
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎props/version4/project/libbitcoin-explorer/libbitcoin-explorer-test/libbitcoin-explorer-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemDefinitionGroup>
1313
<ClCompile>
1414
<EnablePREfast>false</EnablePREfast>
15-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
15+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1616
</ClCompile>
1717
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1818
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎props/version4/project/libbitcoin-network/libbitcoin-network-test/libbitcoin-network-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemDefinitionGroup>
1313
<ClCompile>
1414
<EnablePREfast>false</EnablePREfast>
15-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
15+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1616
</ClCompile>
1717
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1818
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎props/version4/project/libbitcoin-node/libbitcoin-node-test/libbitcoin-node-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemDefinitionGroup>
1313
<ClCompile>
1414
<EnablePREfast>false</EnablePREfast>
15-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
15+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1616
</ClCompile>
1717
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1818
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎props/version4/project/libbitcoin-protocol/libbitcoin-protocol-test/libbitcoin-protocol-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemDefinitionGroup>
1313
<ClCompile>
1414
<EnablePREfast>false</EnablePREfast>
15-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
15+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1616
</ClCompile>
1717
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1818
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎props/version4/project/libbitcoin-server/libbitcoin-server-test/libbitcoin-server-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemDefinitionGroup>
1313
<ClCompile>
1414
<EnablePREfast>false</EnablePREfast>
15-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
15+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1616
</ClCompile>
1717
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1818
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎props/version4/project/libbitcoin-system/libbitcoin-system-test/libbitcoin-system-test.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<!--<Optimization>Disabled</Optimization>-->
2222
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
2323
<EnablePREfast>false</EnablePREfast>
24-
<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
24+
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
2525
</ClCompile>
2626
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
2727
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎templates/gsl.sln

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ EndGlobal
116116
\t\tStaticDebug|x64 = StaticDebug|x64
117117
\t\tStaticRelease|Win32 = StaticRelease|Win32
118118
\t\tStaticRelease|x64 = StaticRelease|x64
119+
\t\tStaticDebug|ARM = StaticDebug|ARM
120+
\t\tStaticDebug|ARM64 = StaticDebug|ARM64
121+
\t\tStaticRelease|ARM = StaticRelease|ARM
122+
\t\tStaticRelease|ARM64 = StaticRelease|ARM64
119123
\tEndGlobalSection
120124
.endmacro emit_presolution
121125
.
@@ -136,6 +140,14 @@ EndGlobal
136140
\t\t{$(my.uuid:upper)}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
137141
\t\t{$(my.uuid:upper)}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
138142
\t\t{$(my.uuid:upper)}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
143+
\t\t{$(my.uuid:upper)}.StaticDebug|ARM.ActiveCfg = DebugLIB|ARM
144+
\t\t{$(my.uuid:upper)}.StaticDebug|ARM.Build.0 = DebugLIB|ARM
145+
\t\t{$(my.uuid:upper)}.StaticDebug|ARM64.ActiveCfg = DebugLIB|ARM64
146+
\t\t{$(my.uuid:upper)}.StaticDebug|ARM64.Build.0 = DebugLIB|ARM64
147+
\t\t{$(my.uuid:upper)}.StaticRelease|ARM.ActiveCfg = ReleaseLIB|ARM
148+
\t\t{$(my.uuid:upper)}.StaticRelease|ARM.Build.0 = ReleaseLIB|ARM
149+
\t\t{$(my.uuid:upper)}.StaticRelease|ARM64.ActiveCfg = ReleaseLIB|ARM64
150+
\t\t{$(my.uuid:upper)}.StaticRelease|ARM64.Build.0 = ReleaseLIB|ARM64
139151
.endmacro emit_library_crossproduct
140152
.
141153
.macro emit_binary_crossproduct(uuid)
@@ -147,6 +159,14 @@ EndGlobal
147159
\t\t{$(my.uuid:upper)}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
148160
\t\t{$(my.uuid:upper)}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
149161
\t\t{$(my.uuid:upper)}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
162+
\t\t{$(my.uuid:upper)}.StaticDebug|ARM.ActiveCfg = DebugSEXE|ARM
163+
\t\t{$(my.uuid:upper)}.StaticDebug|ARM.Build.0 = DebugSEXE|ARM
164+
\t\t{$(my.uuid:upper)}.StaticDebug|ARM64.ActiveCfg = DebugSEXE|ARM64
165+
\t\t{$(my.uuid:upper)}.StaticDebug|ARM64.Build.0 = DebugSEXE|ARM64
166+
\t\t{$(my.uuid:upper)}.StaticRelease|ARM.ActiveCfg = ReleaseSEXE|ARM
167+
\t\t{$(my.uuid:upper)}.StaticRelease|ARM.Build.0 = ReleaseSEXE|ARM
168+
\t\t{$(my.uuid:upper)}.StaticRelease|ARM64.ActiveCfg = ReleaseSEXE|ARM64
169+
\t\t{$(my.uuid:upper)}.StaticRelease|ARM64.Build.0 = ReleaseSEXE|ARM64
150170
.endmacro emit_binary_crossproduct
151171
.
152172
.macro emit_solution_properties()

0 commit comments

Comments
 (0)