[PATCH] darwin: Fix non-Metal build

[Keno Fischer]

On Sat, Dec 11, 2021 at 9:02 AM Dean Greer <gcenx83 at gmail.com> wrote:
>
> You also need to edit configure.ac to to account for this change to $(METAL_LIBS) else when metal is detected quartzcore will be added again.

The duplicate `-framework` shouldn't cause any issues, but I'll send a
v2 that removes this in configure.ac, since this is only used here, so
we might as well be clean.

> What SDK was used for this compile that failed?

This was using https://binarybuilder.org/ which currently does not
provide a Metal toolchain.

> On Sat, Dec 11, 2021 at 4:22 AM Keno Fischer <keno at juliacomputing.com> wrote:
>>
>> 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>
>> ---
>>  dlls/winemac.drv/Makefile.in    | 2 +-
>>  dlls/winemac.drv/cocoa_window.m | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> 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
>>
>>