From 09463546419e35e38d42a6cc331074d6e394e9d4 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 17 Apr 2016 02:19:37 +0200 Subject: [PATCH] user32-PNG_Support: Set EXTRAINCL variable in Makefile.in. --- patches/patchinstall.sh | 2 +- ...user32-Add-support-for-PNG-icons.-v4.patch | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index c67a13d2..6359248f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -6788,7 +6788,7 @@ fi # | * [#38959] Add support for loading PNG icon files # | # | Modified files: -# | * dlls/user32/cursoricon.c +# | * dlls/user32/Makefile.in, dlls/user32/cursoricon.c # | if test "$enable_user32_PNG_Support" -eq 1; then patch_apply user32-PNG_Support/0001-user32-Add-support-for-PNG-icons.-v4.patch diff --git a/patches/user32-PNG_Support/0001-user32-Add-support-for-PNG-icons.-v4.patch b/patches/user32-PNG_Support/0001-user32-Add-support-for-PNG-icons.-v4.patch index fd48bc15..fc96ab09 100644 --- a/patches/user32-PNG_Support/0001-user32-Add-support-for-PNG-icons.-v4.patch +++ b/patches/user32-PNG_Support/0001-user32-Add-support-for-PNG-icons.-v4.patch @@ -1,14 +1,27 @@ -From 58d0e4f6ca6beaa0e0e470fb288780c0001d58b3 Mon Sep 17 00:00:00 2001 +From 64afa20c1fba6856edc379c4a4cd0871b905e938 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 7 Apr 2016 21:18:44 +0800 Subject: user32: Add support for PNG icons. (v5) --- + dlls/user32/Makefile.in | 1 + dlls/user32/cursoricon.c | 339 ++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 334 insertions(+), 5 deletions(-) + 2 files changed, 335 insertions(+), 5 deletions(-) +diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in +index b5c80a8..d0381f3 100644 +--- a/dlls/user32/Makefile.in ++++ b/dlls/user32/Makefile.in +@@ -2,6 +2,7 @@ EXTRADEFS = -D_USER32_ -D_WINABLE_ + MODULE = user32.dll + IMPORTLIB = user32 + IMPORTS = gdi32 version advapi32 ++EXTRAINCL = $(PNG_CFLAGS) + DELAYIMPORTS = imm32 usp10 + + C_SRCS = \ diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c -index 4de6b28..a8cd135 100644 +index 4de6b28..4879988 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -6,6 +6,8 @@