From 3f85a1a6c67fc41de47bac1ad2ee7ca2d84f3ee3 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 25 Jan 2014 04:01:46 +0000 Subject: [PATCH] Rename carla_native module to daz, part1/2 --- source/backend/standalone/Makefile | 2 +- source/bridges/CarlaBridgePlugin.cpp | 6 +++--- source/bridges/Makefile | 2 +- source/bridges/qtcreator/carla-bridge-plugin.pro | 2 +- source/carla_shared.py | 2 +- source/modules/Makefile | 8 ++++---- source/modules/carla_native/Makefile | 16 ++++++++-------- source/plugin/Makefile | 2 +- source/tests/Makefile | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/source/backend/standalone/Makefile b/source/backend/standalone/Makefile index 5ce7403d5..d25bf13ce 100644 --- a/source/backend/standalone/Makefile +++ b/source/backend/standalone/Makefile @@ -75,7 +75,7 @@ endif # ---------------------------------------------------------------------------------------------------------------------------- # Native -STATIC_LIBS += ../../modules/carla_native.a +STATIC_LIBS += ../../modules/daz.a ifeq ($(HAVE_AF_DEPS),true) LINK_FLAGS += $(shell pkg-config --libs sndfile) diff --git a/source/bridges/CarlaBridgePlugin.cpp b/source/bridges/CarlaBridgePlugin.cpp index f1b643872..8d96a015e 100644 --- a/source/bridges/CarlaBridgePlugin.cpp +++ b/source/bridges/CarlaBridgePlugin.cpp @@ -117,10 +117,10 @@ public: if (curDir.getChildFile("resources").exists()) carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("resources").getFullPathName().toRawUTF8()); - else if (curDir.getChildFile("../../modules/carla_native/resources").exists()) - carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("../../modules/carla_native/resources").getFullPathName().toRawUTF8()); + else if (curDir.getChildFile("../../modules/daz/resources").exists()) + carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("../../modules/daz/resources").getFullPathName().toRawUTF8()); else - carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("../modules/carla_native/resources").getFullPathName().toRawUTF8()); + carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("../modules/daz/resources").getFullPathName().toRawUTF8()); #endif if (useBridge) diff --git a/source/bridges/Makefile b/source/bridges/Makefile index 11446574c..65b52488a 100644 --- a/source/bridges/Makefile +++ b/source/bridges/Makefile @@ -414,7 +414,7 @@ OBJS_NATIVE += \ ../modules/juce_events.a endif -# ../modules/carla_native.a \ +# ../modules/daz.a \ # ../modules/juce_data_structures.a \ # ../modules/juce_graphics.a \ # ../modules/juce_gui_basics.a \ diff --git a/source/bridges/qtcreator/carla-bridge-plugin.pro b/source/bridges/qtcreator/carla-bridge-plugin.pro index e1e012a59..c3e803a25 100644 --- a/source/bridges/qtcreator/carla-bridge-plugin.pro +++ b/source/bridges/qtcreator/carla-bridge-plugin.pro @@ -135,7 +135,7 @@ INCLUDEPATH = .. \ # ----------------------------------------------------------- LIBS = -ldl -lpthread -lrt -LIBS += ../../modules/carla_native.a +LIBS += ../../modules/daz.a LIBS += ../../modules/juce_audio_basics.a LIBS += ../../modules/juce_core.a LIBS += ../../modules/juce_data_structures.a diff --git a/source/carla_shared.py b/source/carla_shared.py index a14fca7d6..c2aa382e6 100644 --- a/source/carla_shared.py +++ b/source/carla_shared.py @@ -555,7 +555,7 @@ def initHost(appName, libPrefix = None, failError = True): # ------------------------------------------------------------- # Set resource path - localResources = os.path.join(libfolder, "..", "modules", "carla_native", "resources") + localResources = os.path.join(libfolder, "..", "modules", "daz", "resources") systemResources = os.path.join(libfolder, "resources") if os.path.exists(localResources): diff --git a/source/modules/Makefile b/source/modules/Makefile index 96c619f02..e10178110 100644 --- a/source/modules/Makefile +++ b/source/modules/Makefile @@ -8,8 +8,8 @@ all: # -------------------------------------------------------------- -carla_native: - $(MAKE) -C carla_native +daz: + $(MAKE) -C daz # -------------------------------------------------------------- @@ -166,7 +166,7 @@ lib%.so: clean: rm -f *.a *.def *.dll *.dylib *.so - $(MAKE) clean -C carla_native + $(MAKE) clean -C daz $(MAKE) clean -C distrho/dgl $(MAKE) clean -C jackbridge $(MAKE) clean -C juce_audio_basics @@ -188,7 +188,7 @@ clean: # -------------------------------------------------------------- .PHONY: \ - carla_native jackbridge lilv rtaudio rtmidi rtmempool stk theme \ + daz jackbridge lilv rtaudio rtmidi rtmempool stk theme \ juce_audio_basics juce_audio_devices juce_audio_formats juce_audio_processors juce_core juce_data_structures juce_events juce_graphics juce_gui_basics # -------------------------------------------------------------- diff --git a/source/modules/carla_native/Makefile b/source/modules/carla_native/Makefile index 0570445e9..ffce93eec 100644 --- a/source/modules/carla_native/Makefile +++ b/source/modules/carla_native/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/make -f -# Makefile for carla_native # -# ------------------------- # +# Makefile for daz # +# ---------------- # # Created by falkTX # @@ -187,21 +187,21 @@ endif # -------------------------------------------------------------- -all: ../carla_native.a +all: ../daz.a # -------------------------------------------------------------- -../carla_native.a: $(OBJS) +../daz.a: $(OBJS) $(RM) $@ $(AR) crs $@ $^ -../libcarla_native.dll: $(OBJS) +../libdaz.dll: $(OBJS) $(CXX) $^ -shared $(LINK_FLAGS) -o $@ -../libcarla_native.dylib: $(OBJS) +../libdaz.dylib: $(OBJS) $(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ -../libcarla_native.so: $(OBJS) +../libdaz.so: $(OBJS) $(CXX) $^ -shared $(LINK_FLAGS) -o $@ # -------------------------------------------------------------- @@ -284,7 +284,7 @@ zynaddsubfx/UI/%.h: zynaddsubfx/UI/%.fl # -------------------------------------------------------------- clean: - $(RM) $(OBJS) ../carla_native*.a ../libcarla_native.* + $(RM) $(OBJS) ../daz*.a ../libdaz.* $(RM) $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP) debug: diff --git a/source/plugin/Makefile b/source/plugin/Makefile index a96a5db06..5caa2e9d3 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile @@ -93,7 +93,7 @@ endif LIBS += ../backend/carla_engine_plugin.a LIBS += ../backend/carla_plugin.a -LIBS += ../modules/carla_native.a +LIBS += ../modules/daz.a LIBS += ../modules/jackbridge.a LIBS += ../modules/rtmempool.a diff --git a/source/tests/Makefile b/source/tests/Makefile index af9ddc355..83fb43d70 100644 --- a/source/tests/Makefile +++ b/source/tests/Makefile @@ -62,7 +62,7 @@ Engine: Engine.cpp $(CXX) $< \ ../backend/standalone/CarlaStandalone.cpp.o \ -Wl,--start-group \ - ../backend/carla_engine.a ../backend/carla_plugin.a ../modules/carla_native.a \ + ../backend/carla_engine.a ../backend/carla_plugin.a ../modules/daz.a \ ../modules/dgl.a ../modules/jackbridge.a ../modules/lilv.a ../modules/rtmempool.a ../modules/rtaudio.a ../modules/rtmidi.a \ -Wl,--end-group \ $(PEDANTIC_CXX_FLAGS) $(shell pkg-config --libs alsa libpulse-simple liblo QtCore QtXml fluidsynth linuxsampler x11 gl smf fftw3 mxml zlib ntk_images ntk) -o $@ @@ -109,11 +109,11 @@ debug: # -------------------------------------------------------------- DISTRHO: DISTRHO.cpp ../modules/distrho/*.hpp ../modules/distrho/src/*.cpp - $(CXX) $< ../modules/dgl.a $(PEDANTIC_CXX_FLAGS) -I../modules/distrho -I../modules/carla_native/nekobi $(LINK_FLAGS) $(DGL_LIBS) -lpthread -o $@ + $(CXX) $< ../modules/dgl.a $(PEDANTIC_CXX_FLAGS) -I../modules/distrho -I../modules/daz/nekobi $(LINK_FLAGS) $(DGL_LIBS) -lpthread -o $@ ./DISTRHO DISTRHO.so: DISTRHO.cpp ../modules/distrho/*.hpp ../modules/distrho/src/*.cpp - $(CXX) $< ../modules/dgl.a $(PEDANTIC_CXX_FLAGS) -I../modules/distrho -I../modules/carla_native/nekobi -DSHARED_DLL $(LINK_FLAGS) $(DGL_LIBS) -lpthread -shared -Wl,--no-undefined -o $@ + $(CXX) $< ../modules/dgl.a $(PEDANTIC_CXX_FLAGS) -I../modules/distrho -I../modules/daz/nekobi -DSHARED_DLL $(LINK_FLAGS) $(DGL_LIBS) -lpthread -shared -Wl,--no-undefined -o $@ DGL: DGL.cpp ../modules/distrho/dgl/src/Window.cpp $(CXX) $< $(PEDANTIC_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) -o $@