@@ -8,14 +8,25 @@ include dpf/Makefile.base.mk | |||||
all: dgl plugins gen | all: dgl plugins gen | ||||
# -------------------------------------------------------------- | |||||
# Check for system-wide projectM | |||||
HAVE_PROJECTM = $(shell pkg-config --exists libprojectM && echo true) | |||||
# -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
dgl: | dgl: | ||||
$(MAKE) -C dpf/dgl USE_OPENGL3=true | |||||
$(MAKE) -C dpf/dgl opengl USE_OPENGL3=true | |||||
plugins: dgl | plugins: dgl | ||||
$(MAKE) all -C plugins/ProM | $(MAKE) all -C plugins/ProM | ||||
ifneq ($(HAVE_PROJECTM),true) | |||||
resources: plugins | |||||
else | |||||
resources: | |||||
endif | |||||
ifneq ($(CROSS_COMPILING),true) | ifneq ($(CROSS_COMPILING),true) | ||||
gen: plugins dpf/utils/lv2_ttl_generator | gen: plugins dpf/utils/lv2_ttl_generator | ||||
@$(CURDIR)/dpf/utils/generate-ttl.sh | @$(CURDIR)/dpf/utils/generate-ttl.sh | ||||
@@ -1 +1 @@ | |||||
Subproject commit 9b838a67d2e07ea72c198e291f7eb654fef541fd | |||||
Subproject commit 168e8a5333c52175a7e94016b3ef994c7b253aa9 |
@@ -98,7 +98,7 @@ void DistrhoUIProM::uiReshape(uint width, uint height) | |||||
if (fPM == nullptr) | if (fPM == nullptr) | ||||
{ | { | ||||
#ifdef PROJECTM_PREFIX | |||||
#ifdef PROJECTM_DATA_DIR | |||||
fPM = new projectM(PROJECTM_DATA_DIR "/config.inp"); | fPM = new projectM(PROJECTM_DATA_DIR "/config.inp"); | ||||
#else | #else | ||||
projectM::Settings settings; | projectM::Settings settings; | ||||
@@ -167,13 +167,13 @@ bool DistrhoUIProM::onKeyboard(const KeyboardEvent& ev) | |||||
{ | { | ||||
switch (ev.key) | switch (ev.key) | ||||
{ | { | ||||
case DGL_NAMESPACE::kCharBackspace: | |||||
case DGL_NAMESPACE::kKeyBackspace: | |||||
pmKey = PROJECTM_K_BACKSPACE; | pmKey = PROJECTM_K_BACKSPACE; | ||||
break; | break; | ||||
case DGL_NAMESPACE::kCharEscape: | |||||
case DGL_NAMESPACE::kKeyEscape: | |||||
pmKey = PROJECTM_K_ESCAPE; | pmKey = PROJECTM_K_ESCAPE; | ||||
break; | break; | ||||
case DGL_NAMESPACE::kCharDelete: | |||||
case DGL_NAMESPACE::kKeyDelete: | |||||
pmKey = PROJECTM_K_DELETE; | pmKey = PROJECTM_K_DELETE; | ||||
break; | break; | ||||
} | } | ||||