git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-02-15 17:04:54 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity

ARM64: Embed manifest properly (#4718)

Browse Source 
Teach our ARM64 based builds to embed the manifest file correctly.

This fixes #4707
This commit is contained in:
Johannes Schindelin 2023-12-07 09:00:15 +01:00
commit dfd48bec86
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/buildsystems/CMakeLists.txt
View File

@ -237,6 +237,7 @@ if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
add_compile_options(/MP /std:c11)
add_link_options(/MANIFEST:NO)
endif()
#default behaviour

1
contrib/buildsystems/Generators/Vcxproj.pm
View File

@ -198,7 +198,6 @@ sub createProject {
<AdditionalDependencies>\$(VCPKGLibs);\$(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>invalidcontinue.obj %(AdditionalOptions)</AdditionalOptions>
<EntryPointSymbol>$entrypoint</EntryPointSymbol>
<ManifestFile>$cdup\\compat\\win32\\git.manifest</ManifestFile>
<SubSystem>$subsystem</SubSystem>
</Link>
EOM

1
git.rc
View File

@ -1,3 +1,4 @@
#include<winuser.h>
1 VERSIONINFO
FILEVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
PRODUCTVERSION MAJOR,MINOR,MICRO,PATCHLEVEL