Keno Fischer : winemac: Unconditionally link to QuartzCore.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1f17015cea89cef3083ade0497e5eae5efdcb570
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1f17015cea89cef3083ade049...

Author: Keno Fischer 
Date:   Thu Jan  6 14:26:20 2022 +0000

winemac: Unconditionally link to QuartzCore.

This fixes non-Metal builds.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52216
Signed-off-by: Keno Fischer 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

configure                       | 2 +-
 configure.ac                    | 2 +-
 dlls/winemac.drv/Makefile.in    | 2 +-
 dlls/winemac.drv/cocoa_window.m | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 5c3536900d1..c9d4d0c04f6 100755
--- a/configure
+++ b/configure
@@ -10322,7 +10322,7 @@ fi
     fi
     if test "$ac_cv_header_Metal_Metal_h" = "yes"
     then
-        METAL_LIBS="-framework Metal -framework QuartzCore"
+        METAL_LIBS="-framework Metal"

fi

diff --git a/configure.ac b/configure.ac
index ddd45b8c241..b42cb8a5346 100644
--- a/configure.ac
+++ b/configure.ac
@@ -757,7 +757,7 @@ case $host_os in
     fi
     if test "$ac_cv_header_Metal_Metal_h" = "yes"
     then
-        AC_SUBST(METAL_LIBS,"-framework Metal -framework QuartzCore")
+        AC_SUBST(METAL_LIBS,"-framework Metal")
     fi

dnl Check for MTLDevice registryID property
diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in
index 6329e8e76c8..fc3dddbdae7 100644
--- a/dlls/winemac.drv/Makefile.in
+++ b/dlls/winemac.drv/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = winemac.drv
 IMPORTS   = uuid rpcrt4 user32 gdi32 advapi32 win32u
 DELAYIMPORTS = ole32 shell32 imm32
-EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo $(METAL_LIBS)
+EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo -framework QuartzCore $(METAL_LIBS)

EXTRADLLFLAGS = -mcygwin

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 10524e4b3a2..7708157a992 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -25,8 +25,8 @@
 #import <CoreVideo/CoreVideo.h>
 #ifdef HAVE_METAL_METAL_H
 #import <Metal/Metal.h>
-#import <QuartzCore/QuartzCore.h>
 #endif
+#import <QuartzCore/QuartzCore.h>

#import "cocoa_window.h"