[PATCH v2] darwin: Fix non-Metal build

[Keno Fischer]

The build was relying on QuartzCore definitions even if
Metal was not found, so move the appropriate import out
of the ifdef and add the QuartzCore framework to the
make line.

Signed-off-by: Keno Fischer <keno at juliacomputing.com>
---

v2: Drop `-framework QuartzCore` from configure.ac as
    suggested by Dean Greer <gcenx83 at gmail.com>.

 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 d57fc6cf43b..bf65b916b7d 100755
--- a/configure
+++ b/configure
@@ -10321,7 +10321,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 de79b47ea2a..1a36e98f3e8 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 d0672b7fb06..a18fc069604 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"
 
-- 
2.25.1