Browse Source

Use c++ xycontroller version

tags/v0.9.0
falkTX 13 years ago
parent
commit
a3d4f0e6d2
3 changed files with 6 additions and 17 deletions
  1. +6
    -7
      Makefile
  2. +0
    -10
      data/cadence_xycontroller
  3. +0
    -0
      src/old/xycontroller.py

+ 6
- 7
Makefile View File

@@ -48,7 +48,7 @@ carla: src/ui_carla.py src/ui_carla_control.py \
src/ui_inputdialog_value.py src/ui_inputdialog_value.py


tools: \ tools: \
src/ui_logs.py src/ui_render.py src/ui_xycontroller.py \
src/ui_logs.py src/ui_render.py \
src/ui_settings_app.py src/ui_settings_jack.py src/ui_settings_app.py src/ui_settings_jack.py


src/ui_cadence.py: src/ui/cadence.ui src/ui_cadence.py: src/ui/cadence.ui
@@ -141,9 +141,6 @@ src/ui_logs.py: src/ui/logs.ui
src/ui_render.py: src/ui/render.ui src/ui_render.py: src/ui/render.ui
$(PYUIC) $< -o $@ $(PYUIC) $< -o $@


src/ui_xycontroller.py: src/ui/xycontroller.ui
$(PYUIC) $< -o $@

src/ui_settings_app.py: src/ui/settings_app.ui src/ui_settings_app.py: src/ui/settings_app.ui
$(PYUIC) $< -o $@ $(PYUIC) $< -o $@


@@ -162,7 +159,7 @@ src/resources_rc.py: resources/resources.qrc


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


CPP: carla_backend carla_bridge carla_discovery jackmeter
CPP: carla_backend carla_bridge carla_discovery jackmeter xycontroller


carla_backend: carla_lilv carla_backend: carla_lilv
$(MAKE) -C c++/carla-backend $(MAKE) -C c++/carla-backend
@@ -179,6 +176,9 @@ carla_lilv:
jackmeter: jackmeter:
$(MAKE) -C c++/jackmeter $(MAKE) -C c++/jackmeter


xycontroller:
$(MAKE) -C c++/xycontroller

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


unix32: unix32:
@@ -233,7 +233,6 @@ install:
data/cadence_logs \ data/cadence_logs \
data/cadence_pulse2jack \ data/cadence_pulse2jack \
data/cadence_render \ data/cadence_render \
data/cadence_xycontroller \
data/cadence-aloop-daemon \ data/cadence-aloop-daemon \
data/catarina \ data/catarina \
data/catia \ data/catia \
@@ -247,6 +246,7 @@ install:
c++/carla-bridge/carla-bridge-vst-x11 \ c++/carla-bridge/carla-bridge-vst-x11 \
c++/carla-discovery/carla-discovery-* \ c++/carla-discovery/carla-discovery-* \
c++/jackmeter/cadence_jackmeter \ c++/jackmeter/cadence_jackmeter \
c++/xycontroller/cadence_xycontroller \
$(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(PREFIX)/bin/


# Install desktop files # Install desktop files
@@ -313,7 +313,6 @@ install:
$(DESTDIR)$(PREFIX)/bin/cadence_logs \ $(DESTDIR)$(PREFIX)/bin/cadence_logs \
$(DESTDIR)$(PREFIX)/bin/cadence_pulse2jack \ $(DESTDIR)$(PREFIX)/bin/cadence_pulse2jack \
$(DESTDIR)$(PREFIX)/bin/cadence_render \ $(DESTDIR)$(PREFIX)/bin/cadence_render \
$(DESTDIR)$(PREFIX)/bin/cadence_xycontroller \
$(DESTDIR)$(PREFIX)/bin/catarina \ $(DESTDIR)$(PREFIX)/bin/catarina \
$(DESTDIR)$(PREFIX)/bin/catia \ $(DESTDIR)$(PREFIX)/bin/catia \
$(DESTDIR)$(PREFIX)/bin/claudia \ $(DESTDIR)$(PREFIX)/bin/claudia \


+ 0
- 10
data/cadence_xycontroller View File

@@ -1,10 +0,0 @@
#!/bin/bash

if [ -f /usr/bin/python3 ]; then
PYTHON=/usr/bin/python3
else
PYTHON=python
fi

INSTALL_PREFIX="X-PREFIX-X"
exec $PYTHON $INSTALL_PREFIX/share/cadence/src/xycontroller.py "$@"

src/xycontroller.py → src/old/xycontroller.py View File


Loading…
Cancel
Save