AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix-win11-sdk-3' into 'gtk-3-24'

Browse Source 
Fix building against the Windows 11 SDK (GTK+-3.x)

See merge request GNOME/gtk!4062
This commit is contained in:
Matthias Clasen 2021-10-28 16:47:15 +00:00
commit 660cbee51e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/Makefile.am
View File

@ -44,7 +44,6 @@ gtk-win32-res.o : gtk-win32.rc libgtk3.manifest
$(WINDRES) gtk-win32.rc $@
gtk-win32.rc: gtk-win32.rc.body
echo "#include <winuser.h>" >>$@
cat $< >>$@
echo "ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk3.manifest" >>$@

1
gtk/gen-rc.py
View File

@ -11,7 +11,6 @@ old_msvc = sys.argv[3]
with open(out_file, 'w', encoding='utf-8') as o:
if old_msvc is not None and old_msvc == "1":
o.write("#define ISOLATION_AWARE_ENABLED 1\n")
o.write('#include <winuser.h>\n')
with open(in_file, 'r', encoding='utf-8') as f:
for line in f:

5
gtk/generate-uac-manifest.py
View File

@ -24,7 +24,7 @@ def main():
help='require admin access to application')
parser.add_argument('--input-resource-file', dest='resource',
default=None,
help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included winuser.h in it')
help='existing .rc file to embed UAC manifest (do not generate a new .rc file), must have included windows.h in it')
parser.add_argument('--output-dir', dest='outdir',
default=None,
help='directory to output resulting files')
@ -92,7 +92,8 @@ def write_rc_file(name, resource, outdir):
if resource is None:
outfile = open(output_file_base_name + '.rc', 'w+')
outfile.write('#include <winuser.h>')
outfile.write('#define WIN32_LEAN_AND_MEAN\n')
outfile.write('#include <windows.h>\n')
else:
if resource != output_file_base_name + '.rc':
outfile = open(output_file_base_name + '.rc', 'w+')

3
gtk/gtk-win32.rc.body.in
View File

@ -1,4 +1,5 @@
#include <winver.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0