From 621841f68e5a2381ce45a76a6032e763c8c52758 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 8 Mar 2023 20:26:24 +0100 Subject: [PATCH] Fix build Signed-off-by: falkTX --- source/Makefile.deps.mk | 8 ++++++-- source/modules/juce_gui_basics/juce_gui_basics.cpp | 1 - .../native/juce_mac_NSViewComponentPeer.mm | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/Makefile.deps.mk b/source/Makefile.deps.mk index 0c64d6a8d6..c9336821f0 100644 --- a/source/Makefile.deps.mk +++ b/source/Makefile.deps.mk @@ -292,15 +292,19 @@ endif ifeq ($(HAVE_QT5),true) QT5_HOSTBINS = $(shell $(PKG_CONFIG) --variable=host_bins Qt5Core) +else ifeq ($(HAVE_QT5PKG),true) +QT5_HOSTBINS = $(shell $(PKG_CONFIG) --variable=prefix Qt5OpenGLExtensions)/bin +endif + MOC_QT5 ?= $(QT5_HOSTBINS)/moc RCC_QT5 ?= $(QT5_HOSTBINS)/rcc + ifeq (,$(wildcard $(MOC_QT5))) HAVE_QT5 = false endif ifeq (,$(wildcard $(RCC_QT5))) HAVE_QT5 = false endif -endif ifeq ($(HAVE_QT4),true) HAVE_QT = true @@ -330,7 +334,7 @@ endif PYRCC ?= $(PYRCC5) PYUIC ?= $(PYUIC5) -ifeq ($(HAVE_QT5),true) +ifneq (,$(findstring true,$(HAVE_QT5)$(HAVE_QT5PKG))) HAVE_THEME = true endif diff --git a/source/modules/juce_gui_basics/juce_gui_basics.cpp b/source/modules/juce_gui_basics/juce_gui_basics.cpp index 574229cab0..07038cfe17 100644 --- a/source/modules/juce_gui_basics/juce_gui_basics.cpp +++ b/source/modules/juce_gui_basics/juce_gui_basics.cpp @@ -51,7 +51,6 @@ #if JUCE_MAC #import #import - #import #elif JUCE_IOS #if JUCE_PUSH_NOTIFICATIONS && defined (__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 diff --git a/source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm index 8b8e65116f..5875a75a74 100644 --- a/source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm +++ b/source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm @@ -23,8 +23,6 @@ ============================================================================== */ -#include "juce_mac_CGMetalLayerRenderer.h" - @interface NSEvent (DeviceDelta) - (float)deviceDeltaX; - (float)deviceDeltaY;