From 6125f48a680853d6a203738eec4b3670fa1929d6 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 22 Jul 2021 00:35:54 +0100 Subject: [PATCH] Fix build without opengl --- .github/workflows/example-plugins.yml | 2 +- Makefile.plugins.mk | 6 +++--- cmake/DPF-plugin.cmake | 4 ++-- distrho/src/DistrhoPluginLV2.cpp | 2 +- distrho/src/DistrhoPluginLV2export.cpp | 2 +- distrho/src/DistrhoPluginVST2.cpp | 5 +++++ 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/example-plugins.yml b/.github/workflows/example-plugins.yml index bc264e67..d9610967 100644 --- a/.github/workflows/example-plugins.yml +++ b/.github/workflows/example-plugins.yml @@ -113,7 +113,7 @@ jobs: LDFLAGS: -arch x86_64 -arch arm64 -mmacosx-version-min=10.12 run: | make NOOPT=true -j $(sysctl -n hw.logicalcpu) && \ - ./dpf/utils/package-osx-bundles.sh + ./utils/package-osx-bundles.sh - name: Set sha8 id: slug run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)" diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk index 92c0c28d..cac8b517 100644 --- a/Makefile.plugins.mk +++ b/Makefile.plugins.mk @@ -140,7 +140,7 @@ endif ifeq ($(UI_TYPE),cairo) ifeq ($(HAVE_CAIRO),true) -DGL_FLAGS += -DDGL_CAIRO +DGL_FLAGS += -DDGL_CAIRO -DHAVE_DGL DGL_FLAGS += $(CAIRO_FLAGS) DGL_LIBS += $(CAIRO_LIBS) DGL_LIB = $(DPF_PATH)/build/libdgl-cairo.a @@ -152,7 +152,7 @@ endif ifeq ($(UI_TYPE),opengl) ifeq ($(HAVE_OPENGL),true) -DGL_FLAGS += -DDGL_OPENGL +DGL_FLAGS += -DDGL_OPENGL -DHAVE_DGL DGL_FLAGS += $(OPENGL_FLAGS) DGL_LIBS += $(OPENGL_LIBS) DGL_LIB = $(DPF_PATH)/build/libdgl-opengl.a @@ -164,7 +164,7 @@ endif ifeq ($(UI_TYPE),vulkan) ifeq ($(HAVE_VULKAN),true) -DGL_FLAGS += -DDGL_VULKAN +DGL_FLAGS += -DDGL_VULKAN -DHAVE_DGL DGL_FLAGS += $(VULKAN_FLAGS) DGL_LIBS += $(VULKAN_LIBS) DGL_LIB = $(DPF_PATH)/build/libdgl-vulkan.a diff --git a/cmake/DPF-plugin.cmake b/cmake/DPF-plugin.cmake index 503b79fd..7933a6c7 100644 --- a/cmake/DPF-plugin.cmake +++ b/cmake/DPF-plugin.cmake @@ -363,7 +363,7 @@ function(dpf__add_dgl_cairo) target_link_libraries(dgl-cairo PRIVATE dgl-system-libs) add_library(dgl-cairo-definitions INTERFACE) - target_compile_definitions(dgl-cairo-definitions INTERFACE "DGL_CAIRO" "HAVE_CAIRO") + target_compile_definitions(dgl-cairo-definitions INTERFACE "DGL_CAIRO" "HAVE_CAIRO" "HAVE_DGL") target_include_directories(dgl-cairo PUBLIC ${CAIRO_INCLUDE_DIRS}) if(MINGW) @@ -429,7 +429,7 @@ function(dpf__add_dgl_opengl) target_link_libraries(dgl-opengl PRIVATE dgl-system-libs) add_library(dgl-opengl-definitions INTERFACE) - target_compile_definitions(dgl-opengl-definitions INTERFACE "DGL_OPENGL" "HAVE_OPENGL") + target_compile_definitions(dgl-opengl-definitions INTERFACE "DGL_OPENGL" "HAVE_OPENGL" "HAVE_DGL") target_include_directories(dgl-opengl PUBLIC "${OPENGL_INCLUDE_DIR}") target_link_libraries(dgl-opengl PRIVATE dgl-opengl-definitions "${OPENGL_gl_LIBRARY}") diff --git a/distrho/src/DistrhoPluginLV2.cpp b/distrho/src/DistrhoPluginLV2.cpp index a43754d8..60ba73c3 100644 --- a/distrho/src/DistrhoPluginLV2.cpp +++ b/distrho/src/DistrhoPluginLV2.cpp @@ -51,7 +51,7 @@ # define DISTRHO_PLUGIN_LV2_STATE_PREFIX "urn:distrho:" #endif -#define DISTRHO_LV2_USE_EVENTS_IN (DISTRHO_PLUGIN_WANT_MIDI_INPUT || DISTRHO_PLUGIN_WANT_TIMEPOS || (DISTRHO_PLUGIN_WANT_STATE && DISTRHO_PLUGIN_HAS_UI)) +#define DISTRHO_LV2_USE_EVENTS_IN (DISTRHO_PLUGIN_WANT_MIDI_INPUT || DISTRHO_PLUGIN_WANT_TIMEPOS || (DISTRHO_PLUGIN_WANT_STATE && DISTRHO_PLUGIN_HAS_UI) || DISTRHO_PLUGIN_WANT_STATEFILES) #define DISTRHO_LV2_USE_EVENTS_OUT (DISTRHO_PLUGIN_WANT_MIDI_OUTPUT || (DISTRHO_PLUGIN_WANT_STATE && DISTRHO_PLUGIN_HAS_UI)) START_NAMESPACE_DISTRHO diff --git a/distrho/src/DistrhoPluginLV2export.cpp b/distrho/src/DistrhoPluginLV2export.cpp index 6b6961da..b5296277 100644 --- a/distrho/src/DistrhoPluginLV2export.cpp +++ b/distrho/src/DistrhoPluginLV2export.cpp @@ -74,7 +74,7 @@ # define DISTRHO_LV2_UI_TYPE "UI" #endif -#define DISTRHO_LV2_USE_EVENTS_IN (DISTRHO_PLUGIN_WANT_MIDI_INPUT || DISTRHO_PLUGIN_WANT_TIMEPOS || (DISTRHO_PLUGIN_WANT_STATE && DISTRHO_PLUGIN_HAS_UI)) +#define DISTRHO_LV2_USE_EVENTS_IN (DISTRHO_PLUGIN_WANT_MIDI_INPUT || DISTRHO_PLUGIN_WANT_TIMEPOS || (DISTRHO_PLUGIN_WANT_STATE && DISTRHO_PLUGIN_HAS_UI) || DISTRHO_PLUGIN_WANT_STATEFILES) #define DISTRHO_LV2_USE_EVENTS_OUT (DISTRHO_PLUGIN_WANT_MIDI_OUTPUT || (DISTRHO_PLUGIN_WANT_STATE && DISTRHO_PLUGIN_HAS_UI)) #define DISTRHO_BYPASS_PARAMETER_NAME "lv2_enabled" diff --git a/distrho/src/DistrhoPluginVST2.cpp b/distrho/src/DistrhoPluginVST2.cpp index 4265232e..cc5fc6ff 100644 --- a/distrho/src/DistrhoPluginVST2.cpp +++ b/distrho/src/DistrhoPluginVST2.cpp @@ -22,6 +22,11 @@ # define DISTRHO_PLUGIN_HAS_UI 0 #endif +#if DISTRHO_PLUGIN_HAS_UI && ! defined(HAVE_DGL) +# undef DISTRHO_PLUGIN_HAS_UI +# define DISTRHO_PLUGIN_HAS_UI 0 +#endif + #if DISTRHO_PLUGIN_HAS_UI # include "DistrhoUIInternal.hpp" # include "../extra/RingBuffer.hpp"