Browse Source

Fix build

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.5.4^0
falkTX 1 year ago
parent
commit
621841f68e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 6 additions and 5 deletions
  1. +6
    -2
      source/Makefile.deps.mk
  2. +0
    -1
      source/modules/juce_gui_basics/juce_gui_basics.cpp
  3. +0
    -2
      source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm

+ 6
- 2
source/Makefile.deps.mk View File

@@ -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



+ 0
- 1
source/modules/juce_gui_basics/juce_gui_basics.cpp View File

@@ -51,7 +51,6 @@
#if JUCE_MAC
#import <WebKit/WebKit.h>
#import <IOKit/pwr_mgt/IOPMLib.h>
#import <MetalKit/MetalKit.h>
#elif JUCE_IOS
#if JUCE_PUSH_NOTIFICATIONS && defined (__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0


+ 0
- 2
source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm View File

@@ -23,8 +23,6 @@
==============================================================================
*/
#include "juce_mac_CGMetalLayerRenderer.h"
@interface NSEvent (DeviceDelta)
- (float)deviceDeltaX;
- (float)deviceDeltaY;


Loading…
Cancel
Save