brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only build EmbedWidget / MPV on X11, since it only works there

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-01-31 12:40:46 +00:00
parent c3279f8f12
commit 0fd687bbab
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/Makefile
View file

@ -202,11 +202,15 @@ ifneq ($(STATIC_BUILD),true)
PLUGIN_FILES += Cardinal/src/AudioFile.cpp PLUGIN_FILES += Cardinal/src/AudioFile.cpp
PLUGIN_FILES += Cardinal/src/Carla.cpp PLUGIN_FILES += Cardinal/src/Carla.cpp
PLUGIN_FILES += Cardinal/src/Ildaeil.cpp PLUGIN_FILES += Cardinal/src/Ildaeil.cpp
ifneq ($(HEADLESS),true)
ifeq ($(HAVE_X11),true)
PLUGIN_FILES += Cardinal/src/EmbedWidget.cpp
PLUGIN_FILES += Cardinal/src/MPV.cpp PLUGIN_FILES += Cardinal/src/MPV.cpp
endif endif
endif
endif
ifneq ($(HEADLESS),true) ifneq ($(HEADLESS),true)
PLUGIN_FILES += Cardinal/src/EmbedWidget.cpp
PLUGIN_FILES += Cardinal/src/ImGuiWidget.cpp PLUGIN_FILES += Cardinal/src/ImGuiWidget.cpp
PLUGIN_FILES += Cardinal/src/ImGuiTextEditor.cpp PLUGIN_FILES += Cardinal/src/ImGuiTextEditor.cpp
PLUGIN_FILES += $(wildcard Cardinal/src/DearImGui/*.cpp) PLUGIN_FILES += $(wildcard Cardinal/src/DearImGui/*.cpp)
@ -737,6 +741,10 @@ BASE_FLAGS += -I../dpf/distrho
BASE_FLAGS += -I../include BASE_FLAGS += -I../include
BASE_FLAGS += -I../include/neon-compat BASE_FLAGS += -I../include/neon-compat
ifeq ($(HAVE_X11),true)
BASE_FLAGS += -DHAVE_X11
endif
ifeq ($(SYSDEPS),true) ifeq ($(SYSDEPS),true)
BASE_FLAGS += -DCARDINAL_SYSDEPS BASE_FLAGS += -DCARDINAL_SYSDEPS
else else

5
plugins/plugins.cpp
View file

@ -701,11 +701,14 @@ static void initStatic__Cardinal()
p->addModel(modelAudioFile); p->addModel(modelAudioFile);
p->addModel(modelCarla); p->addModel(modelCarla);
p->addModel(modelIldaeil); p->addModel(modelIldaeil);
p->addModel(modelMPV);
#else #else
spl.removeModule("AudioFile"); spl.removeModule("AudioFile");
spl.removeModule("Carla"); spl.removeModule("Carla");
spl.removeModule("Ildaeil"); spl.removeModule("Ildaeil");
#endif
#if defined(HAVE_X11) && !defined(HEADLESS) && !defined(STATIC_BUILD)
p->addModel(modelMPV);
#else
spl.removeModule("MPV"); spl.removeModule("MPV");
#endif #endif
} }