Browse Source

Fix build

Signed-off-by: falkTX <falktx@falktx.com>
pull/1775/head
falkTX 2 years ago
parent
commit
7de2b470d0
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 4 additions and 10 deletions
  1. +3
    -3
      source/Makefile.deps.mk
  2. +1
    -4
      source/backend/engine/CarlaEngineJack.cpp
  3. +0
    -1
      source/modules/juce_gui_basics/juce_gui_basics.cpp
  4. +0
    -2
      source/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm

+ 3
- 3
source/Makefile.deps.mk View File

@@ -323,7 +323,7 @@ else ifeq ($(WINDOWS),true)
HAVE_QT = true HAVE_QT = true
endif endif


ifeq ($(HAVE_QT5),true)
ifneq (,$(findstring true,$(HAVE_QT5)$(HAVE_QT5PKG)))
HAVE_THEME = true HAVE_THEME = true
endif endif


@@ -336,7 +336,7 @@ PYUIC5 ?= $(shell which pyuic5 2>/dev/null)
ifneq ($(PYUIC5),) ifneq ($(PYUIC5),)
ifneq ($(PYRCC5),) ifneq ($(PYRCC5),)
HAVE_PYQT = true HAVE_PYQT = true
ifeq ($(HAVE_QT5),true)
ifneq (,$(findstring true,$(HAVE_QT5)$(HAVE_QT5PKG)))
HAVE_FRONTEND = true HAVE_FRONTEND = true
endif endif
endif endif
@@ -411,7 +411,7 @@ endif


ifeq ($(HAVE_FLUIDSYNTH),true) ifeq ($(HAVE_FLUIDSYNTH),true)
FLUIDSYNTH_FLAGS = $(shell $(PKG_CONFIG) --cflags fluidsynth) FLUIDSYNTH_FLAGS = $(shell $(PKG_CONFIG) --cflags fluidsynth)
FLUIDSYNTH_LIBS = $(shell $(PKG_CONFIG) --libs fluidsynth)
FLUIDSYNTH_LIBS = $(shell $(PKG_CONFIG) --libs fluidsynth) -lintl
endif endif


ifeq ($(HAVE_JACKLIB),true) ifeq ($(HAVE_JACKLIB),true)


+ 1
- 4
source/backend/engine/CarlaEngineJack.cpp View File

@@ -1790,7 +1790,7 @@ public:
void idle() noexcept override void idle() noexcept override
{ {
LinkedList<PostPonedJackEvent> events; LinkedList<PostPonedJackEvent> events;
PostPonedJackEvent nullEvent = {};
const PostPonedJackEvent nullEvent = {};


{ {
const CarlaMutexLocker cml(fPostPonedEventsMutex); const CarlaMutexLocker cml(fPostPonedEventsMutex);
@@ -1811,9 +1811,6 @@ public:
case PostPonedJackEvent::kTypeClientUnregister: case PostPonedJackEvent::kTypeClientUnregister:
handleJackClientUnregistrationCallback(ev.clientUnregister.name); handleJackClientUnregistrationCallback(ev.clientUnregister.name);
break; break;
case PostPonedJackEvent::kTypeClientUnregister:
handleJackClientUnregistrationCallback(ev.clientUnregister.name);
break;
case PostPonedJackEvent::kTypePortRegister: case PostPonedJackEvent::kTypePortRegister:
handleJackPortRegistrationCallback(ev.portRegister.fullName, handleJackPortRegistrationCallback(ev.portRegister.fullName,
ev.portRegister.shortName, ev.portRegister.shortName,


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

@@ -51,7 +51,6 @@
#if JUCE_MAC #if JUCE_MAC
#import <WebKit/WebKit.h> #import <WebKit/WebKit.h>
#import <IOKit/pwr_mgt/IOPMLib.h> #import <IOKit/pwr_mgt/IOPMLib.h>
#import <MetalKit/MetalKit.h>
#elif JUCE_IOS #elif JUCE_IOS
#if JUCE_PUSH_NOTIFICATIONS && defined (__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0 #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) @interface NSEvent (DeviceDelta)
- (float)deviceDeltaX; - (float)deviceDeltaX;
- (float)deviceDeltaY; - (float)deviceDeltaY;


Loading…
Cancel
Save