Ken Thomases : gdi32: Link against AppKit on the Mac to avoid later crash in the Mac driver.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1f2d55637399b6d2507b661d013c0bbf8a9c0d30
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f2d55637399b6d2507b661d01...

Author: Ken Thomases <ken(a)codeweavers.com>
Date:   Sun Aug  4 22:53:44 2013 -0500

gdi32: Link against AppKit on the Mac to avoid later crash in the Mac driver.

---

 configure              |    3 +++
 configure.ac           |    1 +
 dlls/gdi32/Makefile.in |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 7c9c76c..0cdfd36 100755
--- a/configure
+++ b/configure
@@ -697,6 +697,7 @@ COREAUDIO
 SECURITYLIB
 DISKARBITRATIONLIB
 LDEXECFLAGS
+APPKITLIB
 CORESERVICESLIB
 APPLICATIONSERVICESLIB
 FORCEFEEDBACKLIB
@@ -6686,6 +6687,8 @@ clean::
 
     CORESERVICESLIB="-framework CoreServices"
 
+    APPKITLIB="-framework AppKit"
+
     case $host_os in
       darwin11*)
         LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist"
diff --git a/configure.ac b/configure.ac
index 0e3df61..ca3d038 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,6 +734,7 @@ clean::
     AC_SUBST(FORCEFEEDBACKLIB,"-framework ForceFeedback -framework CoreFoundation")
     AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices")
     AC_SUBST(CORESERVICESLIB,"-framework CoreServices")
+    AC_SUBST(APPKITLIB,"-framework AppKit")
     case $host_os in
       darwin11*)
         AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist"]) ;;
diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in
index f4661da..c7953a9 100644
--- a/dlls/gdi32/Makefile.in
+++ b/dlls/gdi32/Makefile.in
@@ -3,7 +3,7 @@ MODULE    = gdi32.dll
 IMPORTLIB = gdi32
 IMPORTS   = advapi32
 EXTRAINCL = @FREETYPE_CFLAGS@ @FONTCONFIGINCL@
-EXTRALIBS = @CARBONLIB@
+EXTRALIBS = @CARBONLIB@ @APPKITLIB@
 DELAYIMPORTS = usp10
 
 C_SRCS = \