Skip to content

Commit

Permalink
git.rc: include winuser.h
Browse files Browse the repository at this point in the history
winuser.h contains the definition of RT_MANIFEST that our LLVM based
toolchain needs to understand that we want to embed
compat/win32/git.manifest as an application manifest. It currently just
embeds it as additional data that Windows doesn't understand.

This also helps our GCC based toolchain understand that we only want one
copy embedded. It currently embeds one working assembly manifest and one
nearly identical, but useless copy as additional data.

This also teaches our Visual Studio based buildsystem to pick up the
manifest file from git.rc instead of having to explicitly specify it in
contrib/buildsystems/Generators/Vcxproj.pm

This fixes git-for-windows#4707

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
  • Loading branch information
rimrul committed Dec 2, 2023
1 parent 4b968f3 commit 2e1a99c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 0 additions & 1 deletion contrib/buildsystems/Generators/Vcxproj.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions git.rc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include<winuser.h>
1 VERSIONINFO
FILEVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
PRODUCTVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
Expand Down

0 comments on commit 2e1a99c

Please sign in to comment.