<div dir="auto">The patch shouldn’t be touching configure only <a href="http://configure.ac">configure.ac</a>, the configure changes will get auto generated when merged.</div><div dir="auto"><br></div><div dir="auto">However this patch doesn’t fully resolve the build issues with winemac.drv.</div><div dir="auto"><br></div><div dir="auto">I’m currently unable to build with the MacOSX10.11.SDK and that’s the minimum I usually test with. Seems I’ll need to open multiple tickets so these issues can be resolved before the release.</div><div dir="auto"><br></div><div dir="auto">On Sun, Dec 12, 2021 at 2:32 AM Keno Fischer <<a href="mailto:keno@juliacomputing.com">keno@juliacomputing.com</a>> wrote:<br></div><div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;padding-left:1ex;border-left-color:rgb(204,204,204)">The build was relying on QuartzCore definitions even if<br>
Metal was not found, so move the appropriate import out<br>
of the ifdef and add the QuartzCore framework to the<br>
make line.<br>
<br>
Signed-off-by: Keno Fischer <<a href="mailto:keno@juliacomputing.com" target="_blank">keno@juliacomputing.com</a>><br>
---<br>
<br>
v2: Drop `-framework QuartzCore` from <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> as<br>
suggested by Dean Greer <<a href="mailto:gcenx83@gmail.com" target="_blank">gcenx83@gmail.com</a>>.<br>
<br>
configure | 2 +-<br>
<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 2 +-<br>
dlls/winemac.drv/Makefile.in | 2 +-<br>
dlls/winemac.drv/cocoa_window.m | 2 +-<br>
4 files changed, 4 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/configure b/configure<br>
index d57fc6cf43b..bf65b916b7d 100755<br>
--- a/configure<br>
+++ b/configure<br>
@@ -10321,7 +10321,7 @@ fi<br>
fi<br>
if test "$ac_cv_header_Metal_Metal_h" = "yes"<br>
then<br>
- METAL_LIBS="-framework Metal -framework QuartzCore"<br>
+ METAL_LIBS="-framework Metal"<br>
<br>
fi<br>
<br>
diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
index de79b47ea2a..1a36e98f3e8 100644<br>
--- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
@@ -757,7 +757,7 @@ case $host_os in<br>
fi<br>
if test "$ac_cv_header_Metal_Metal_h" = "yes"<br>
then<br>
- AC_SUBST(METAL_LIBS,"-framework Metal -framework QuartzCore")<br>
+ AC_SUBST(METAL_LIBS,"-framework Metal")<br>
fi<br>
<br>
dnl Check for MTLDevice registryID property<br>
diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in<br>
index 6329e8e76c8..fc3dddbdae7 100644<br>
--- a/dlls/winemac.drv/Makefile.in<br>
+++ b/dlls/winemac.drv/Makefile.in<br>
@@ -1,7 +1,7 @@<br>
MODULE = winemac.drv<br>
IMPORTS = uuid rpcrt4 user32 gdi32 advapi32 win32u<br>
DELAYIMPORTS = ole32 shell32 imm32<br>
-EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo $(METAL_LIBS)<br>
+EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo -framework QuartzCore $(METAL_LIBS)<br>
<br>
EXTRADLLFLAGS = -mcygwin<br>
<br>
diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m<br>
index d0672b7fb06..a18fc069604 100644<br>
--- a/dlls/winemac.drv/cocoa_window.m<br>
+++ b/dlls/winemac.drv/cocoa_window.m<br>
@@ -25,8 +25,8 @@<br>
#import <CoreVideo/CoreVideo.h><br>
#ifdef HAVE_METAL_METAL_H<br>
#import <Metal/Metal.h><br>
-#import <QuartzCore/QuartzCore.h><br>
#endif<br>
+#import <QuartzCore/QuartzCore.h><br>
<br>
#import "cocoa_window.h"<br>
<br>
-- <br>
2.25.1<br>
<br>
<br>
</blockquote></div></div>