[PATCH 0/1] MR3200: winemac.drv: Fix compile on macOS 10.14
Fixes a compilation failure on macOS ≤10.14 introduced by !3187 @huw could you verify that this fixes 10.14 builds? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3200
From: Evan Tang <etang(a)codeweavers.com> Fixes: 731f06d97f810063b7b7c613b26db32a091af8a5 --- dlls/winemac.drv/cocoa_display.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index b2608bafcd0..81c92f63448 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -268,6 +268,7 @@ static int macdrv_get_gpu_info_from_mtldevice(struct macdrv_gpu* gpu, id<MTLDevi int ret; if ((ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]))) return ret; +#if defined(MAC_OS_X_VERSION_10_15) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15 /* Apple GPUs aren't PCI devices and therefore have no device ID * Use the Metal GPUFamily as the device ID */ if (!gpu->device_id && [device respondsToSelector:@selector(supportsFamily:)] && [device supportsFamily:MTLGPUFamilyApple1]) @@ -284,6 +285,7 @@ static int macdrv_get_gpu_info_from_mtldevice(struct macdrv_gpu* gpu, id<MTLDevi } gpu->device_id = highest; } +#endif return 0; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3200
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3200
participants (3)
-
Evan Tang -
Evan Tang (@etang-cw) -
Huw Davies (@huw)