forked from git/git
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Initial arm64 #2507
Closed
Closed
Initial arm64 #2507
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8b11ea6
update vcxproj to point to the riht place vcpkg ARM64
manbearian a37a841
update compat/bswap.h for Windows/ARM64
manbearian 9adf797
update vcpkg script to properly install ARM64 packages
manbearian 15d4dbd
allow vcpkg to automatically do the right thing for x86, x64, and ARM…
manbearian 051920a
update `vcpkg_install.bat` to support 'features'
manbearian c76b9de
properly escape '$' in perl script
manbearian File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -113,12 +113,21 @@ sub createProject { | |
<Configuration>Release</Configuration> | ||
<Platform>x64</Platform> | ||
</ProjectConfiguration> | ||
<ProjectConfiguration Include="Debug|ARM64"> | ||
<Configuration>Debug</Configuration> | ||
<Platform>ARM64</Platform> | ||
</ProjectConfiguration> | ||
<ProjectConfiguration Include="Release|ARM64"> | ||
<Configuration>Release</Configuration> | ||
<Platform>ARM64</Platform> | ||
</ProjectConfiguration> | ||
</ItemGroup> | ||
<PropertyGroup Label="Globals"> | ||
<ProjectGuid>$uuid</ProjectGuid> | ||
<Keyword>Win32Proj</Keyword> | ||
<VCPKGArch Condition="'\$(Platform)'=='Win32'">x86-windows</VCPKGArch> | ||
<VCPKGArch Condition="'\$(Platform)'!='Win32'">x64-windows</VCPKGArch> | ||
<VCPKGArch Condition="'\$(Platform)'=='x64'">x64-windows</VCPKGArch> | ||
<VCPKGArch Condition="'\$(Platform)'=='ARM64'">arm64-windows</VCPKGArch> | ||
<VCPKGArchDirectory>$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)</VCPKGArchDirectory> | ||
<VCPKGBinDirectory Condition="'\$(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\bin</VCPKGBinDirectory> | ||
<VCPKGLibDirectory Condition="'\$(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\lib</VCPKGLibDirectory> | ||
|
@@ -139,7 +148,7 @@ sub createProject { | |
</PropertyGroup> | ||
<PropertyGroup> | ||
<ConfigurationType>$config_type</ConfigurationType> | ||
<PlatformToolset>v140</PlatformToolset> | ||
<PlatformToolset>v142</PlatformToolset> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could we keep |
||
<!-- <CharacterSet>UTF-8</CharacterSet> --> | ||
<OutDir>..\\</OutDir> | ||
<!-- <IntDir>\$(ProjectDir)\$(Configuration)\\</IntDir> --> | ||
|
@@ -183,7 +192,7 @@ EOM | |
<PreBuildEvent Condition="!Exists('$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)\\include\\openssl\\ssl.h')"> | ||
<Message>Initialize VCPKG</Message> | ||
<Command>del "$cdup\\compat\\vcbuild\\vcpkg"</Command> | ||
<Command>call "$cdup\\compat\\vcbuild\\vcpkg_install.bat"</Command> | ||
<Command>call "$cdup\\compat\\vcbuild\\vcpkg_install.bat" \$(VCPKGArch)</Command> | ||
</PreBuildEvent> | ||
EOM | ||
} | ||
|
@@ -345,8 +354,10 @@ sub createGlueProject { | |
print F << "EOM"; | ||
Global | ||
GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
Debug|ARM64 = Debug|ARM64 | ||
Debug|x64 = Debug|x64 | ||
Debug|x86 = Debug|x86 | ||
Release|ARM64 = Release|ARM64 | ||
Release|x64 = Release|x64 | ||
Release|x86 = Release|x86 | ||
EndGlobalSection | ||
|
@@ -357,10 +368,14 @@ EOM | |
foreach (@apps) { | ||
my $appname = $_; | ||
my $uuid = $build_structure{"APPS_${appname}_GUID"}; | ||
print F "\t\t${uuid}.Debug|ARM64.ActiveCfg = Debug|ARM64\n"; | ||
print F "\t\t${uuid}.Debug|ARM64.Build.0 = Debug|ARM64\n"; | ||
print F "\t\t${uuid}.Debug|x64.ActiveCfg = Debug|x64\n"; | ||
print F "\t\t${uuid}.Debug|x64.Build.0 = Debug|x64\n"; | ||
print F "\t\t${uuid}.Debug|x86.ActiveCfg = Debug|Win32\n"; | ||
print F "\t\t${uuid}.Debug|x86.Build.0 = Debug|Win32\n"; | ||
print F "\t\t${uuid}.Release|ARM64.ActiveCfg = Release|ARM64\n"; | ||
print F "\t\t${uuid}.Release|ARM64.Build.0 = Release|ARM64\n"; | ||
print F "\t\t${uuid}.Release|x64.ActiveCfg = Release|x64\n"; | ||
print F "\t\t${uuid}.Release|x64.Build.0 = Release|x64\n"; | ||
print F "\t\t${uuid}.Release|x86.ActiveCfg = Release|Win32\n"; | ||
|
@@ -369,10 +384,14 @@ EOM | |
foreach (@libs) { | ||
my $libname = $_; | ||
my $uuid = $build_structure{"LIBS_${libname}_GUID"}; | ||
print F "\t\t${uuid}.Debug|ARM64.ActiveCfg = Debug|ARM64\n"; | ||
print F "\t\t${uuid}.Debug|ARM64.Build.0 = Debug|ARM64\n"; | ||
print F "\t\t${uuid}.Debug|x64.ActiveCfg = Debug|x64\n"; | ||
print F "\t\t${uuid}.Debug|x64.Build.0 = Debug|x64\n"; | ||
print F "\t\t${uuid}.Debug|x86.ActiveCfg = Debug|Win32\n"; | ||
print F "\t\t${uuid}.Debug|x86.Build.0 = Debug|Win32\n"; | ||
print F "\t\t${uuid}.Release|ARM64.ActiveCfg = Release|ARM64\n"; | ||
print F "\t\t${uuid}.Release|ARM64.Build.0 = Release|ARM64\n"; | ||
print F "\t\t${uuid}.Release|x64.ActiveCfg = Release|x64\n"; | ||
print F "\t\t${uuid}.Release|x64.Build.0 = Release|x64\n"; | ||
print F "\t\t${uuid}.Release|x86.ActiveCfg = Release|Win32\n"; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it work if we used
[core,openssl,schannel]
here?