Skip to content

W
wine-cw
Commit 1f2d5563 authored by Ken Thomases's avatar Ken Thomases Committed by Alexandre Julliard
Browse files
Options

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

parent 5b1e70ce
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
configure
View file @ 1f2d5563
...@@ -697,6 +697,7 @@ COREAUDIO ...@@ -697,6 +697,7 @@ COREAUDIO
SECURITYLIB SECURITYLIB
DISKARBITRATIONLIB DISKARBITRATIONLIB
LDEXECFLAGS LDEXECFLAGS
APPKITLIB
CORESERVICESLIB CORESERVICESLIB
APPLICATIONSERVICESLIB APPLICATIONSERVICESLIB
FORCEFEEDBACKLIB FORCEFEEDBACKLIB
...@@ -6686,6 +6687,8 @@ clean:: ...@@ -6686,6 +6687,8 @@ clean::
CORESERVICESLIB="-framework CoreServices" CORESERVICESLIB="-framework CoreServices"
APPKITLIB="-framework AppKit"
case $host_os in case $host_os in
darwin11*) 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" 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"
......
configure.ac
View file @ 1f2d5563
...@@ -734,6 +734,7 @@ clean:: ...@@ -734,6 +734,7 @@ clean::
AC_SUBST(FORCEFEEDBACKLIB,"-framework ForceFeedback -framework CoreFoundation") AC_SUBST(FORCEFEEDBACKLIB,"-framework ForceFeedback -framework CoreFoundation")
AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices")
AC_SUBST(CORESERVICESLIB,"-framework CoreServices") AC_SUBST(CORESERVICESLIB,"-framework CoreServices")
AC_SUBST(APPKITLIB,"-framework AppKit")
case $host_os in case $host_os in
darwin11*) 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"]) ;; 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"]) ;;
......
dlls/gdi32/Makefile.in
View file @ 1f2d5563
...@@ -3,7 +3,7 @@ MODULE = gdi32.dll ...@@ -3,7 +3,7 @@ MODULE = gdi32.dll
IMPORTLIB = gdi32 IMPORTLIB = gdi32
IMPORTS = advapi32 IMPORTS = advapi32
EXTRAINCL = @FREETYPE_CFLAGS@ @FONTCONFIGINCL@ EXTRAINCL = @FREETYPE_CFLAGS@ @FONTCONFIGINCL@
EXTRALIBS = @CARBONLIB@ EXTRALIBS = @CARBONLIB@ @APPKITLIB@
DELAYIMPORTS = usp10 DELAYIMPORTS = usp10
C_SRCS = \ C_SRCS = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment