Signed-off-by: falkTX <falktx@falktx.com>tags/v2.2.0-RC1
@@ -535,6 +535,8 @@ ifneq ($(CPPMODE),true) | |||||
data/carla-database \ | data/carla-database \ | ||||
data/carla-jack-multi \ | data/carla-jack-multi \ | ||||
data/carla-jack-single \ | data/carla-jack-single \ | ||||
data/carla-jack-patchbayplugin \ | |||||
data/carla-osc-gui \ | |||||
data/carla-patchbay \ | data/carla-patchbay \ | ||||
data/carla-rack \ | data/carla-rack \ | ||||
data/carla-settings \ | data/carla-settings \ | ||||
@@ -546,6 +548,8 @@ ifneq ($(CPPMODE),true) | |||||
$(DESTDIR)$(BINDIR)/carla-database \ | $(DESTDIR)$(BINDIR)/carla-database \ | ||||
$(DESTDIR)$(BINDIR)/carla-jack-multi \ | $(DESTDIR)$(BINDIR)/carla-jack-multi \ | ||||
$(DESTDIR)$(BINDIR)/carla-jack-single \ | $(DESTDIR)$(BINDIR)/carla-jack-single \ | ||||
$(DESTDIR)$(BINDIR)/carla-jack-patchbayplugin \ | |||||
$(DESTDIR)$(BINDIR)/carla-osc-gui \ | |||||
$(DESTDIR)$(BINDIR)/carla-patchbay \ | $(DESTDIR)$(BINDIR)/carla-patchbay \ | ||||
$(DESTDIR)$(BINDIR)/carla-rack \ | $(DESTDIR)$(BINDIR)/carla-rack \ | ||||
$(DESTDIR)$(BINDIR)/carla-settings | $(DESTDIR)$(BINDIR)/carla-settings | ||||
@@ -2,10 +2,11 @@ | |||||
if [ -f "$(dirname ${0})/carla-utils.pc" ]; then | if [ -f "$(dirname ${0})/carla-utils.pc" ]; then | ||||
cd "$(dirname ${0})/.." | cd "$(dirname ${0})/.." | ||||
INSTALL_LIBDIR="./bin" | |||||
export ENGINE_OPTION_PATH_BINARIES="$(pwd)/bin" | |||||
else | else | ||||
INSTALL_PREFIX="X-PREFIX-X" | INSTALL_PREFIX="X-PREFIX-X" | ||||
INSTALL_LIBDIR="${INSTALL_PREFIX}/lib/carla" | |||||
export ENGINE_OPTION_PATH_BINARIES="${INSTALL_PREFIX}/lib/carla" | |||||
export ENGINE_OPTION_PATH_RESOURCES="${INSTALL_PREFIX}/share/carla/resources" | |||||
fi | fi | ||||
exec "${INSTALL_LIBDIR}/carla-bridge-native" internal "" carlapatchbay | |||||
exec "${ENGINE_OPTION_PATH_BINARIES}/carla-bridge-native" internal "" carlapatchbay |
@@ -15,7 +15,7 @@ INSTALL_ARGS="--with-appname="${0}"" | |||||
if [ -f "$(dirname ${0})/carla-utils.pc" ]; then | if [ -f "$(dirname ${0})/carla-utils.pc" ]; then | ||||
cd "$(dirname ${0})/.." | cd "$(dirname ${0})/.." | ||||
INSTALL_PREFIX="$(pwd)" | INSTALL_PREFIX="$(pwd)" | ||||
INSTALL_FRONTENDDIR="./source/frontend" | |||||
INSTALL_FRONTENDDIR="${INSTALL_PREFIX}/source/frontend" | |||||
else | else | ||||
INSTALL_PREFIX="X-PREFIX-X" | INSTALL_PREFIX="X-PREFIX-X" | ||||
INSTALL_FRONTENDDIR="${INSTALL_PREFIX}/share/carla" | INSTALL_FRONTENDDIR="${INSTALL_PREFIX}/share/carla" | ||||
@@ -26,7 +26,7 @@ if lsof -i:21337 > /dev/null; then | |||||
echo "NOTICE: Backend already running" | echo "NOTICE: Backend already running" | ||||
else | else | ||||
echo "NOTICE: Backend not running yet, starting it now" | echo "NOTICE: Backend not running yet, starting it now" | ||||
${PYTHON} "${INSTALL_FRONTENDDIR}/carla" "${INSTALL_ARGS}" --osc-gui=21337 "$@" & | |||||
${PYTHON} "${INSTALL_FRONTENDDIR}/carla" ${INSTALL_ARGS} --osc-gui=21337 "$@" & | |||||
fi | fi | ||||
${PYTHON} "${INSTALL_FRONTENDDIR}/carla-control" "${INSTALL_ARGS}" osc.tcp://127.0.0.1:21337/Carla "$@" | |||||
exec ${PYTHON} "${INSTALL_FRONTENDDIR}/carla-control" ${INSTALL_ARGS} osc.tcp://127.0.0.1:21337/Carla "$@" |