mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 19:20:25 +08:00
3f56cc65d8
* Make gtk4.4 build. * Update baseline for gtk * Fix vcpkg version. * Fix vcpkg version. * [gtk] Fix macos build. * [gtk] Fix linux build. * [gtk] Add patches. * [gtk] Bump versions - again * Fix macos patch. * Bump versions. * Install xdamage. * Bump versions. * Add merged patch from upstream. * [gtk] Bump version. * Delete duplicate install of libxdamage-dev * Add comment about change being merged upstream. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
diff --git a/gtk/gtk-win32.rc.body.in b/gtk/gtk-win32.rc.body.in
|
|
index b876a6ddf51846236f2c77e4c529b0c0a84e303e..fc2dfd2ed31ed518cc8238bd5b5602cc4a343f02 100644
|
|
--- a/gtk/gtk-win32.rc.body.in
|
|
+++ b/gtk/gtk-win32.rc.body.in
|
|
@@ -1,5 +1,5 @@
|
|
-#include <winuser.h>
|
|
-#include <winver.h>
|
|
+#define WIN32_LEAN_AND_MEAN
|
|
+#include <windows.h>
|
|
|
|
GTK_ICON ICON "gtk.ico"
|
|
|
|
diff --git a/tools/generate-uac-manifest.py b/tools/generate-uac-manifest.py
|
|
index ede6ba5044c3f11112f5e8f36dea8f1aaa14a70d..62f063a8bb6d00201ca42a28eb33e560179a41f5 100644
|
|
--- a/tools/generate-uac-manifest.py
|
|
+++ b/tools/generate-uac-manifest.py
|
|
@@ -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+')
|