Skip to content

Commit 2e1a99c

Browse files
committed
git.rc: include winuser.h
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 #4707 Signed-off-by: Matthias Aßhauer <[email protected]>
1 parent 4b968f3 commit 2e1a99c

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

contrib/buildsystems/Generators/Vcxproj.pm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ sub createProject {
198198
<AdditionalDependencies>\$(VCPKGLibs);\$(AdditionalDependencies)</AdditionalDependencies>
199199
<AdditionalOptions>invalidcontinue.obj %(AdditionalOptions)</AdditionalOptions>
200200
<EntryPointSymbol>$entrypoint</EntryPointSymbol>
201-
<ManifestFile>$cdup\\compat\\win32\\git.manifest</ManifestFile>
202201
<SubSystem>$subsystem</SubSystem>
203202
</Link>
204203
EOM

git.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#include<winuser.h>
12
1 VERSIONINFO
23
FILEVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
34
PRODUCTVERSION MAJOR,MINOR,MICRO,PATCHLEVEL

0 commit comments

Comments
 (0)