From 1f2d55637399b6d2507b661d013c0bbf8a9c0d30 Mon Sep 17 00:00:00 2001 From: Ken Thomases Date: Sun, 4 Aug 2013 22:53:44 -0500 Subject: [PATCH] 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 deletion(-) diff --git a/configure b/configure index 7c9c76c6709..0cdfd36a0aa 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 0e3df611fcd..ca3d038ea23 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 f4661dac4d9..c7953a98b8c 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 = \