DPF

DISTRHO Plugin Framework
Log | Files | Refs | Submodules | README | LICENSE

commit 116451a8fc3103379cd7a1efeae1b3da457bee6d
parent 340273fac2a92fc7f68ec2aac835d5a95faf56c0
Author: Filipe Coelho <falktx@falktx.com>
Date:   Thu, 20 May 2021 19:48:06 +0100

Merge branch 'master' into develop
Diffstat:
MMakefile.base.mk | 9++++++++-
MMakefile.plugins.mk | 2+-
Mdgl/src/ImageWidgets.cpp | 3++-
3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.base.mk b/Makefile.base.mk @@ -63,6 +63,10 @@ ifneq (,$(filter arm%,$(TARGET_PROCESSOR))) CPU_ARM=true CPU_ARM_OR_AARCH64=true endif +ifneq (,$(filter arm64%,$(TARGET_PROCESSOR))) +CPU_ARM64=true +CPU_ARM_OR_AARCH64=true +endif ifneq (,$(filter aarch64%,$(TARGET_PROCESSOR))) CPU_AARCH64=true CPU_ARM_OR_AARCH64=true @@ -132,12 +136,14 @@ BASE_FLAGS = -Wall -Wextra -pipe -MD -MP BASE_OPTS = -O3 -ffast-math -fdata-sections -ffunction-sections ifeq ($(CPU_I386_OR_X86_64),true) -BASE_OPTS += -mtune=generic -msse -msse2 +BASE_OPTS += -mtune=generic -msse -msse2 -mfpmath=sse endif ifeq ($(CPU_ARM),true) +ifneq ($(CPU_ARM64),true) BASE_OPTS += -mfpu=neon-vfpv4 -mfloat-abi=hard endif +endif ifeq ($(MACOS),true) # MacOS linker flags @@ -284,6 +290,7 @@ OPENGL_LIBS = $(shell $(PKG_CONFIG) --libs gl) endif ifeq ($(MACOS),true) +OPENGL_FLAGS = -DGL_SILENCE_DEPRECATION=1 OPENGL_LIBS = -framework OpenGL endif diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk @@ -107,7 +107,7 @@ DGL_FLAGS += -DDGL_EXTERNAL HAVE_DGL = true endif -DGL_LIBS += $(DGL_SYSTEM_LIBS) +DGL_LIBS += $(DGL_SYSTEM_LIBS) -lm ifneq ($(HAVE_DGL),true) dssi_ui = diff --git a/dgl/src/ImageWidgets.cpp b/dgl/src/ImageWidgets.cpp @@ -612,8 +612,9 @@ bool ImageKnob::onScroll(const ScrollEvent& ev) if (! contains(ev.pos)) return false; + const float dir = (ev.delta.getY() > 0.f) ? 1.f : -1.f; const float d = (ev.mod & kModifierControl) ? 2000.0f : 200.0f; - float value = (fUsingLog ? _invlogscale(fValueTmp) : fValueTmp) + (float(fMaximum - fMinimum) / d * 10.f * ev.delta.getY()); + float value = (fUsingLog ? _invlogscale(fValueTmp) : fValueTmp) + (float(fMaximum - fMinimum) / d * 10.f * dir); if (fUsingLog) value = _logscale(value);