Browse Source

Fix some compatibilities

Signed-off-by: falkTX <falktx@falktx.com>
master
falkTX 3 years ago
parent
commit
f12d6ae4c9
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 17 additions and 6 deletions
  1. +12
    -1
      Makefile
  2. +1
    -1
      dpf
  3. +4
    -4
      plugins/ProM/DistrhoUIProM.cpp

+ 12
- 1
Makefile View File

@@ -8,14 +8,25 @@ include dpf/Makefile.base.mk

all: dgl plugins gen

# --------------------------------------------------------------
# Check for system-wide projectM

HAVE_PROJECTM = $(shell pkg-config --exists libprojectM && echo true)

# --------------------------------------------------------------

dgl:
$(MAKE) -C dpf/dgl USE_OPENGL3=true
$(MAKE) -C dpf/dgl opengl USE_OPENGL3=true

plugins: dgl
$(MAKE) all -C plugins/ProM

ifneq ($(HAVE_PROJECTM),true)
resources: plugins
else
resources:
endif

ifneq ($(CROSS_COMPILING),true)
gen: plugins dpf/utils/lv2_ttl_generator
@$(CURDIR)/dpf/utils/generate-ttl.sh


+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 9b838a67d2e07ea72c198e291f7eb654fef541fd
Subproject commit 168e8a5333c52175a7e94016b3ef994c7b253aa9

+ 4
- 4
plugins/ProM/DistrhoUIProM.cpp View File

@@ -98,7 +98,7 @@ void DistrhoUIProM::uiReshape(uint width, uint height)

if (fPM == nullptr)
{
#ifdef PROJECTM_PREFIX
#ifdef PROJECTM_DATA_DIR
fPM = new projectM(PROJECTM_DATA_DIR "/config.inp");
#else
projectM::Settings settings;
@@ -167,13 +167,13 @@ bool DistrhoUIProM::onKeyboard(const KeyboardEvent& ev)
{
switch (ev.key)
{
case DGL_NAMESPACE::kCharBackspace:
case DGL_NAMESPACE::kKeyBackspace:
pmKey = PROJECTM_K_BACKSPACE;
break;
case DGL_NAMESPACE::kCharEscape:
case DGL_NAMESPACE::kKeyEscape:
pmKey = PROJECTM_K_ESCAPE;
break;
case DGL_NAMESPACE::kCharDelete:
case DGL_NAMESPACE::kKeyDelete:
pmKey = PROJECTM_K_DELETE;
break;
}


Loading…
Cancel
Save