diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-31 14:29:05 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-31 14:29:05 +0100 |
| commit | 9188bc734155e14c97e24649a22213b625b9b6cf (patch) | |
| tree | 993d3951ef28137ec0284e703356e090e89b73fd /platform/macos | |
| parent | cd25e48456e58704f1450954a0c94b1e7fe079f4 (diff) | |
| parent | 4dd8f68120bc3d3be94e0556ccfef9ee4bf8311a (diff) | |
Merge pull request #67879 from bruvzg/fix_no_vlk
Fix build with Vulkan disabled and no Vulkan headers installed.
Diffstat (limited to 'platform/macos')
| -rw-r--r-- | platform/macos/detect.py | 4 | ||||
| -rw-r--r-- | platform/macos/vulkan_context_macos.h | 4 | ||||
| -rw-r--r-- | platform/macos/vulkan_context_macos.mm | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/platform/macos/detect.py b/platform/macos/detect.py index 511286d52b..e73c5322ea 100644 --- a/platform/macos/detect.py +++ b/platform/macos/detect.py @@ -223,6 +223,8 @@ def configure(env: "Environment"): "AVFoundation", "-framework", "CoreMedia", + "-framework", + "QuartzCore", ] ) env.Append(LIBS=["pthread", "z"]) @@ -236,7 +238,7 @@ def configure(env: "Environment"): if env["vulkan"]: env.Append(CPPDEFINES=["VULKAN_ENABLED"]) - env.Append(LINKFLAGS=["-framework", "Metal", "-framework", "QuartzCore", "-framework", "IOSurface"]) + env.Append(LINKFLAGS=["-framework", "Metal", "-framework", "IOSurface"]) if not env["use_volk"]: env.Append(LINKFLAGS=["-lMoltenVK"]) mvk_found = False diff --git a/platform/macos/vulkan_context_macos.h b/platform/macos/vulkan_context_macos.h index 579c42b042..2a81336994 100644 --- a/platform/macos/vulkan_context_macos.h +++ b/platform/macos/vulkan_context_macos.h @@ -31,6 +31,8 @@ #ifndef VULKAN_CONTEXT_MACOS_H #define VULKAN_CONTEXT_MACOS_H +#ifdef VULKAN_ENABLED + #include "drivers/vulkan/vulkan_context.h" #import <AppKit/AppKit.h> @@ -44,4 +46,6 @@ public: ~VulkanContextMacOS(); }; +#endif // VULKAN_ENABLED + #endif // VULKAN_CONTEXT_MACOS_H diff --git a/platform/macos/vulkan_context_macos.mm b/platform/macos/vulkan_context_macos.mm index cf317f3c68..1df6b3ed18 100644 --- a/platform/macos/vulkan_context_macos.mm +++ b/platform/macos/vulkan_context_macos.mm @@ -28,6 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#ifdef VULKAN_ENABLED #include "vulkan_context_macos.h" #ifdef USE_VOLK #include <volk.h> @@ -57,3 +58,5 @@ VulkanContextMacOS::VulkanContextMacOS() { VulkanContextMacOS::~VulkanContextMacOS() { } + +#endif // VULKAN_ENABLED |