From 4264f62e2a9a31887f8615a6b90c88a15e893906 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 14 Mar 2013 15:49:05 +0000 Subject: [PATCH] Build zyn code individually --- source/backend/native/Makefile | 56 ++++++++++++++++++- .../native/zynaddsubfx/Misc/Stereo.cpp | 2 + .../backend/native/zynaddsubfx/Misc/Stereo.h | 2 +- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/source/backend/native/Makefile b/source/backend/native/Makefile index 7afe99df3..60512cc2e 100644 --- a/source/backend/native/Makefile +++ b/source/backend/native/Makefile @@ -50,8 +50,57 @@ endif # ZynAddSubFX ifeq ($(HAVE_ZYN_DEPS),true) OBJS += \ - zynaddsubfx.cpp.o \ - zynaddsubfx-src.cpp.o + zynaddsubfx.cpp.o +# zynaddsubfx-src.cpp.o + +OBJS += \ + zynaddsubfx/DSP/AnalogFilter.cpp.o \ + zynaddsubfx/DSP/FFTwrapper.cpp.o \ + zynaddsubfx/DSP/Filter.cpp.o \ + zynaddsubfx/DSP/FormantFilter.cpp.o \ + zynaddsubfx/DSP/SVFilter.cpp.o \ + zynaddsubfx/DSP/Unison.cpp.o \ + zynaddsubfx/Effects/Alienwah.cpp.o \ + zynaddsubfx/Effects/Chorus.cpp.o \ + zynaddsubfx/Effects/Distorsion.cpp.o \ + zynaddsubfx/Effects/DynamicFilter.cpp.o \ + zynaddsubfx/Effects/Echo.cpp.o \ + zynaddsubfx/Effects/Effect.cpp.o \ + zynaddsubfx/Effects/EffectLFO.cpp.o \ + zynaddsubfx/Effects/EffectMgr.cpp.o \ + zynaddsubfx/Effects/EQ.cpp.o \ + zynaddsubfx/Effects/Phaser.cpp.o \ + zynaddsubfx/Effects/Reverb.cpp.o \ + zynaddsubfx/Misc/Bank.cpp.o \ + zynaddsubfx/Misc/Config.cpp.o \ + zynaddsubfx/Misc/Dump.cpp.o \ + zynaddsubfx/Misc/Master.cpp.o \ + zynaddsubfx/Misc/Microtonal.cpp.o \ + zynaddsubfx/Misc/Part.cpp.o \ + zynaddsubfx/Misc/Recorder.cpp.o \ + zynaddsubfx/Misc/Stereo.cpp.o \ + zynaddsubfx/Misc/Util.cpp.o \ + zynaddsubfx/Misc/WavFile.cpp.o \ + zynaddsubfx/Misc/WaveShapeSmps.cpp.o \ + zynaddsubfx/Misc/XMLwrapper.cpp.o \ + zynaddsubfx/Params/ADnoteParameters.cpp.o \ + zynaddsubfx/Params/Controller.cpp.o \ + zynaddsubfx/Params/EnvelopeParams.cpp.o \ + zynaddsubfx/Params/FilterParams.cpp.o \ + zynaddsubfx/Params/LFOParams.cpp.o \ + zynaddsubfx/Params/PADnoteParameters.cpp.o \ + zynaddsubfx/Params/Presets.cpp.o \ + zynaddsubfx/Params/PresetsArray.cpp.o \ + zynaddsubfx/Params/PresetsStore.cpp.o \ + zynaddsubfx/Params/SUBnoteParameters.cpp.o \ + zynaddsubfx/Synth/ADnote.cpp.o \ + zynaddsubfx/Synth/Envelope.cpp.o \ + zynaddsubfx/Synth/LFO.cpp.o \ + zynaddsubfx/Synth/OscilGen.cpp.o \ + zynaddsubfx/Synth/PADnote.cpp.o \ + zynaddsubfx/Synth/Resonance.cpp.o \ + zynaddsubfx/Synth/SUBnote.cpp.o \ + zynaddsubfx/Synth/SynthNote.cpp.o endif SHARED = ../libcarla_native.so @@ -108,6 +157,9 @@ zynaddsubfx.cpp.o: zynaddsubfx.cpp zynaddsubfx-src.cpp.o: zynaddsubfx-src.cpp $(CXX) $< $(ZYN_CXX_FLAGS) -c -o $@ +zynaddsubfx/%.cpp.o: zynaddsubfx/%.cpp + $(CXX) $< $(ZYN_CXX_FLAGS) -c -o $@ + # -------------------------------------------------------------- moc_DistrhoUINotes.cpp: notes/DistrhoUINotes.hpp diff --git a/source/backend/native/zynaddsubfx/Misc/Stereo.cpp b/source/backend/native/zynaddsubfx/Misc/Stereo.cpp index ac2f31727..f96a1dc07 100644 --- a/source/backend/native/zynaddsubfx/Misc/Stereo.cpp +++ b/source/backend/native/zynaddsubfx/Misc/Stereo.cpp @@ -19,6 +19,8 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "Stereo.h" + template Stereo::Stereo(const T &left, const T &right) :l(left), r(right) diff --git a/source/backend/native/zynaddsubfx/Misc/Stereo.h b/source/backend/native/zynaddsubfx/Misc/Stereo.h index 516d31870..996d19a02 100644 --- a/source/backend/native/zynaddsubfx/Misc/Stereo.h +++ b/source/backend/native/zynaddsubfx/Misc/Stereo.h @@ -36,5 +36,5 @@ struct Stereo { //data T l, r; }; -#include "Stereo.cpp" + #endif