| @@ -75,7 +75,7 @@ endif | |||||
| # ---------------------------------------------------------------------------------------------------------------------------- | # ---------------------------------------------------------------------------------------------------------------------------- | ||||
| # Native | # Native | ||||
| STATIC_LIBS += ../../modules/carla_native.a | |||||
| STATIC_LIBS += ../../modules/daz.a | |||||
| ifeq ($(HAVE_AF_DEPS),true) | ifeq ($(HAVE_AF_DEPS),true) | ||||
| LINK_FLAGS += $(shell pkg-config --libs sndfile) | LINK_FLAGS += $(shell pkg-config --libs sndfile) | ||||
| @@ -117,10 +117,10 @@ public: | |||||
| if (curDir.getChildFile("resources").exists()) | if (curDir.getChildFile("resources").exists()) | ||||
| carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("resources").getFullPathName().toRawUTF8()); | 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 | 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 | #endif | ||||
| if (useBridge) | if (useBridge) | ||||
| @@ -414,7 +414,7 @@ OBJS_NATIVE += \ | |||||
| ../modules/juce_events.a | ../modules/juce_events.a | ||||
| endif | endif | ||||
| # ../modules/carla_native.a \ | |||||
| # ../modules/daz.a \ | |||||
| # ../modules/juce_data_structures.a \ | # ../modules/juce_data_structures.a \ | ||||
| # ../modules/juce_graphics.a \ | # ../modules/juce_graphics.a \ | ||||
| # ../modules/juce_gui_basics.a \ | # ../modules/juce_gui_basics.a \ | ||||
| @@ -135,7 +135,7 @@ INCLUDEPATH = .. \ | |||||
| # ----------------------------------------------------------- | # ----------------------------------------------------------- | ||||
| LIBS = -ldl -lpthread -lrt | LIBS = -ldl -lpthread -lrt | ||||
| LIBS += ../../modules/carla_native.a | |||||
| LIBS += ../../modules/daz.a | |||||
| LIBS += ../../modules/juce_audio_basics.a | LIBS += ../../modules/juce_audio_basics.a | ||||
| LIBS += ../../modules/juce_core.a | LIBS += ../../modules/juce_core.a | ||||
| LIBS += ../../modules/juce_data_structures.a | LIBS += ../../modules/juce_data_structures.a | ||||
| @@ -555,7 +555,7 @@ def initHost(appName, libPrefix = None, failError = True): | |||||
| # ------------------------------------------------------------- | # ------------------------------------------------------------- | ||||
| # Set resource path | # 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") | systemResources = os.path.join(libfolder, "resources") | ||||
| if os.path.exists(localResources): | if os.path.exists(localResources): | ||||
| @@ -8,8 +8,8 @@ all: | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| carla_native: | |||||
| $(MAKE) -C carla_native | |||||
| daz: | |||||
| $(MAKE) -C daz | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| @@ -166,7 +166,7 @@ lib%.so: | |||||
| clean: | clean: | ||||
| rm -f *.a *.def *.dll *.dylib *.so | rm -f *.a *.def *.dll *.dylib *.so | ||||
| $(MAKE) clean -C carla_native | |||||
| $(MAKE) clean -C daz | |||||
| $(MAKE) clean -C distrho/dgl | $(MAKE) clean -C distrho/dgl | ||||
| $(MAKE) clean -C jackbridge | $(MAKE) clean -C jackbridge | ||||
| $(MAKE) clean -C juce_audio_basics | $(MAKE) clean -C juce_audio_basics | ||||
| @@ -188,7 +188,7 @@ clean: | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| .PHONY: \ | .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 | juce_audio_basics juce_audio_devices juce_audio_formats juce_audio_processors juce_core juce_data_structures juce_events juce_graphics juce_gui_basics | ||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| @@ -1,6 +1,6 @@ | |||||
| #!/usr/bin/make -f | #!/usr/bin/make -f | ||||
| # Makefile for carla_native # | |||||
| # ------------------------- # | |||||
| # Makefile for daz # | |||||
| # ---------------- # | |||||
| # Created by falkTX | # Created by falkTX | ||||
| # | # | ||||
| @@ -187,21 +187,21 @@ endif | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| all: ../carla_native.a | |||||
| all: ../daz.a | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| ../carla_native.a: $(OBJS) | |||||
| ../daz.a: $(OBJS) | |||||
| $(RM) $@ | $(RM) $@ | ||||
| $(AR) crs $@ $^ | $(AR) crs $@ $^ | ||||
| ../libcarla_native.dll: $(OBJS) | |||||
| ../libdaz.dll: $(OBJS) | |||||
| $(CXX) $^ -shared $(LINK_FLAGS) -o $@ | $(CXX) $^ -shared $(LINK_FLAGS) -o $@ | ||||
| ../libcarla_native.dylib: $(OBJS) | |||||
| ../libdaz.dylib: $(OBJS) | |||||
| $(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ | $(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ | ||||
| ../libcarla_native.so: $(OBJS) | |||||
| ../libdaz.so: $(OBJS) | |||||
| $(CXX) $^ -shared $(LINK_FLAGS) -o $@ | $(CXX) $^ -shared $(LINK_FLAGS) -o $@ | ||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| @@ -284,7 +284,7 @@ zynaddsubfx/UI/%.h: zynaddsubfx/UI/%.fl | |||||
| # -------------------------------------------------------------- | # -------------------------------------------------------------- | ||||
| clean: | clean: | ||||
| $(RM) $(OBJS) ../carla_native*.a ../libcarla_native.* | |||||
| $(RM) $(OBJS) ../daz*.a ../libdaz.* | |||||
| $(RM) $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP) | $(RM) $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP) | ||||
| debug: | debug: | ||||
| @@ -93,7 +93,7 @@ endif | |||||
| LIBS += ../backend/carla_engine_plugin.a | LIBS += ../backend/carla_engine_plugin.a | ||||
| LIBS += ../backend/carla_plugin.a | LIBS += ../backend/carla_plugin.a | ||||
| LIBS += ../modules/carla_native.a | |||||
| LIBS += ../modules/daz.a | |||||
| LIBS += ../modules/jackbridge.a | LIBS += ../modules/jackbridge.a | ||||
| LIBS += ../modules/rtmempool.a | LIBS += ../modules/rtmempool.a | ||||
| @@ -62,7 +62,7 @@ Engine: Engine.cpp | |||||
| $(CXX) $< \ | $(CXX) $< \ | ||||
| ../backend/standalone/CarlaStandalone.cpp.o \ | ../backend/standalone/CarlaStandalone.cpp.o \ | ||||
| -Wl,--start-group \ | -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 \ | ../modules/dgl.a ../modules/jackbridge.a ../modules/lilv.a ../modules/rtmempool.a ../modules/rtaudio.a ../modules/rtmidi.a \ | ||||
| -Wl,--end-group \ | -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 $@ | $(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 | 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 | ||||
| DISTRHO.so: DISTRHO.cpp ../modules/distrho/*.hpp ../modules/distrho/src/*.cpp | 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 | DGL: DGL.cpp ../modules/distrho/dgl/src/Window.cpp | ||||
| $(CXX) $< $(PEDANTIC_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) -o $@ | $(CXX) $< $(PEDANTIC_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) -o $@ | ||||