Skip to content

Commit 8b11ea6

Browse files
committed
update vcxproj to point to the riht place vcpkg ARM64
Signed-off-by: Ian Bearman <[email protected]>
1 parent 5f4dea1 commit 8b11ea6

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

contrib/buildsystems/Generators/Vcxproj.pm

+21-2
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,21 @@ sub createProject {
113113
<Configuration>Release</Configuration>
114114
<Platform>x64</Platform>
115115
</ProjectConfiguration>
116+
<ProjectConfiguration Include="Debug|ARM64">
117+
<Configuration>Debug</Configuration>
118+
<Platform>ARM64</Platform>
119+
</ProjectConfiguration>
120+
<ProjectConfiguration Include="Release|ARM64">
121+
<Configuration>Release</Configuration>
122+
<Platform>ARM64</Platform>
123+
</ProjectConfiguration>
116124
</ItemGroup>
117125
<PropertyGroup Label="Globals">
118126
<ProjectGuid>$uuid</ProjectGuid>
119127
<Keyword>Win32Proj</Keyword>
120128
<VCPKGArch Condition="'\$(Platform)'=='Win32'">x86-windows</VCPKGArch>
121-
<VCPKGArch Condition="'\$(Platform)'!='Win32'">x64-windows</VCPKGArch>
129+
<VCPKGArch Condition="'\$(Platform)'=='x64'">x64-windows</VCPKGArch>
130+
<VCPKGArch Condition="'\$(Platform)'=='ARM64'">arm64-windows</VCPKGArch>
122131
<VCPKGArchDirectory>$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)</VCPKGArchDirectory>
123132
<VCPKGBinDirectory Condition="'\$(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\bin</VCPKGBinDirectory>
124133
<VCPKGLibDirectory Condition="'\$(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\lib</VCPKGLibDirectory>
@@ -139,7 +148,7 @@ sub createProject {
139148
</PropertyGroup>
140149
<PropertyGroup>
141150
<ConfigurationType>$config_type</ConfigurationType>
142-
<PlatformToolset>v140</PlatformToolset>
151+
<PlatformToolset>v142</PlatformToolset>
143152
<!-- <CharacterSet>UTF-8</CharacterSet> -->
144153
<OutDir>..\\</OutDir>
145154
<!-- <IntDir>\$(ProjectDir)\$(Configuration)\\</IntDir> -->
@@ -345,8 +354,10 @@ sub createGlueProject {
345354
print F << "EOM";
346355
Global
347356
GlobalSection(SolutionConfigurationPlatforms) = preSolution
357+
Debug|ARM64 = Debug|ARM64
348358
Debug|x64 = Debug|x64
349359
Debug|x86 = Debug|x86
360+
Release|ARM64 = Release|ARM64
350361
Release|x64 = Release|x64
351362
Release|x86 = Release|x86
352363
EndGlobalSection
@@ -357,10 +368,14 @@ EOM
357368
foreach (@apps) {
358369
my $appname = $_;
359370
my $uuid = $build_structure{"APPS_${appname}_GUID"};
371+
print F "\t\t${uuid}.Debug|ARM64.ActiveCfg = Debug|ARM64\n";
372+
print F "\t\t${uuid}.Debug|ARM64.Build.0 = Debug|ARM64\n";
360373
print F "\t\t${uuid}.Debug|x64.ActiveCfg = Debug|x64\n";
361374
print F "\t\t${uuid}.Debug|x64.Build.0 = Debug|x64\n";
362375
print F "\t\t${uuid}.Debug|x86.ActiveCfg = Debug|Win32\n";
363376
print F "\t\t${uuid}.Debug|x86.Build.0 = Debug|Win32\n";
377+
print F "\t\t${uuid}.Release|ARM64.ActiveCfg = Release|ARM64\n";
378+
print F "\t\t${uuid}.Release|ARM64.Build.0 = Release|ARM64\n";
364379
print F "\t\t${uuid}.Release|x64.ActiveCfg = Release|x64\n";
365380
print F "\t\t${uuid}.Release|x64.Build.0 = Release|x64\n";
366381
print F "\t\t${uuid}.Release|x86.ActiveCfg = Release|Win32\n";
@@ -369,10 +384,14 @@ EOM
369384
foreach (@libs) {
370385
my $libname = $_;
371386
my $uuid = $build_structure{"LIBS_${libname}_GUID"};
387+
print F "\t\t${uuid}.Debug|ARM64.ActiveCfg = Debug|ARM64\n";
388+
print F "\t\t${uuid}.Debug|ARM64.Build.0 = Debug|ARM64\n";
372389
print F "\t\t${uuid}.Debug|x64.ActiveCfg = Debug|x64\n";
373390
print F "\t\t${uuid}.Debug|x64.Build.0 = Debug|x64\n";
374391
print F "\t\t${uuid}.Debug|x86.ActiveCfg = Debug|Win32\n";
375392
print F "\t\t${uuid}.Debug|x86.Build.0 = Debug|Win32\n";
393+
print F "\t\t${uuid}.Release|ARM64.ActiveCfg = Release|ARM64\n";
394+
print F "\t\t${uuid}.Release|ARM64.Build.0 = Release|ARM64\n";
376395
print F "\t\t${uuid}.Release|x64.ActiveCfg = Release|x64\n";
377396
print F "\t\t${uuid}.Release|x64.Build.0 = Release|x64\n";
378397
print F "\t\t${uuid}.Release|x86.ActiveCfg = Release|Win32\n";

0 commit comments

Comments
 (0)