@@ -18,14 +18,14 @@ ifeq ($(CONFIG),Debug)
1818 TARGET_ARCH := -march=native
1919 endif
2020
21- CPPFLAGS := $(DEPFLAGS ) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
21+ CPPFLAGS := $(DEPFLAGS ) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
2222 CFLAGS += $(CPPFLAGS ) $(TARGET_ARCH ) -g -ggdb -O3 -rdynamic -g -pg -std=c++0x
2323 CXXFLAGS += $(CFLAGS )
24- LDFLAGS += $(TARGET_ARCH ) -L$(BINDIR ) -L$(LIBDIR ) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC
24+ LDFLAGS += $(TARGET_ARCH ) -L$(BINDIR ) -L$(LIBDIR ) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -rdynamic - fPIC
2525 LDDEPS :=
26- RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
26+ RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
2727 TARGET := open-ephys
28- BLDCMD = $(CXX ) -o $(OUTDIR ) /$(TARGET ) $(OBJECTS ) $(LDFLAGS ) $(RESOURCES ) $(TARGET_ARCH ) -rdynamic -fPIC -ldl
28+ BLDCMD = $(CXX ) -o $(OUTDIR ) /$(TARGET ) $(OBJECTS ) $(LDFLAGS ) $(RESOURCES ) $(TARGET_ARCH )
2929 CLEANCMD = rm -rf $(OUTDIR ) /$(TARGET ) $(OBJDIR )
3030endif
3131
@@ -39,14 +39,14 @@ ifeq ($(CONFIG),Release)
3939 TARGET_ARCH := -march=native
4040 endif
4141
42- CPPFLAGS := $(DEPFLAGS ) -D "LINUX=1" -D "NDEBUG=1" -D "ZEROMQ" -D " JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
42+ CPPFLAGS := $(DEPFLAGS ) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
4343 CFLAGS += $(CPPFLAGS ) $(TARGET_ARCH ) -O3 -rdynamic -g -pg -std=c++0x
4444 CXXFLAGS += $(CFLAGS )
45- LDFLAGS += $(TARGET_ARCH ) -L$(BINDIR ) -L$(LIBDIR ) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC
45+ LDFLAGS += $(TARGET_ARCH ) -L$(BINDIR ) -L$(LIBDIR ) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -rdynamic - fPIC
4646 LDDEPS :=
47- RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "ZEROMQ" -D " JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
47+ RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
4848 TARGET := open-ephys-release
49- BLDCMD = $(CXX ) -o $(OUTDIR ) /$(TARGET ) $(OBJECTS ) $(LDFLAGS ) $(RESOURCES ) $(TARGET_ARCH ) -rdynamic -fPIC -ldl
49+ BLDCMD = $(CXX ) -o $(OUTDIR ) /$(TARGET ) $(OBJECTS ) $(LDFLAGS ) $(RESOURCES ) $(TARGET_ARCH )
5050 CLEANCMD = rm -rf $(OUTDIR ) /$(TARGET ) $(OBJDIR )
5151endif
5252
@@ -55,13 +55,6 @@ OBJECTS := \
5555 $(OBJDIR)/AccessClass_de9602d5.o \
5656 $(OBJDIR)/PracticalSocket_2574ecc8.o \
5757 $(OBJDIR)/AudioComponent_521bd9c9.o \
58- $(OBJDIR)/ProcessorManager_2aa7db2a.o \
59- $(OBJDIR)/PluginManager_f764c180.o \
60- $(OBJDIR)/AudioEditor_3931be27.o \
61- $(OBJDIR)/AudioNode_3db3557c.o \
62- $(OBJDIR)/Channel_5cb2d4d2.o \
63- $(OBJDIR)/DataBuffer_6ae4f549.o \
64- $(OBJDIR)/DataThread_b2a47a13.o \
6558 $(OBJDIR)/Bessel_7e54cb27.o \
6659 $(OBJDIR)/Biquad_622c856b.o \
6760 $(OBJDIR)/Butterworth_6aca939b.o \
@@ -79,6 +72,14 @@ OBJECTS := \
7972 $(OBJDIR)/RBJ_6081b347.o \
8073 $(OBJDIR)/RootFinder_11229605.o \
8174 $(OBJDIR)/State_5d41ca1e.o \
75+ $(OBJDIR)/ofSerial_c3b0a9e1.o \
76+ $(OBJDIR)/ProcessorManager_2aa7db2a.o \
77+ $(OBJDIR)/PluginManager_f764c180.o \
78+ $(OBJDIR)/AudioEditor_3931be27.o \
79+ $(OBJDIR)/AudioNode_3db3557c.o \
80+ $(OBJDIR)/Channel_5cb2d4d2.o \
81+ $(OBJDIR)/DataBuffer_6ae4f549.o \
82+ $(OBJDIR)/DataThread_b2a47a13.o \
8283 $(OBJDIR)/ChannelSelector_c1430874.o \
8384 $(OBJDIR)/ElectrodeButtons_a6064cc.o \
8485 $(OBJDIR)/GenericEditor_becb2ad6.o \
@@ -174,41 +175,6 @@ $(OBJDIR)/AudioComponent_521bd9c9.o: ../../Source/Audio/AudioComponent.cpp
174175 @echo " Compiling AudioComponent.cpp"
175176 @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
176177
177- $(OBJDIR ) /ProcessorManager_2aa7db2a.o : ../../Source/Processors/ProcessorManager/ProcessorManager.cpp
178- -@mkdir -p $(OBJDIR )
179- @echo " Compiling ProcessorManager.cpp"
180- @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
181-
182- $(OBJDIR ) /PluginManager_f764c180.o : ../../Source/Processors/PluginManager/PluginManager.cpp
183- -@mkdir -p $(OBJDIR )
184- @echo " Compiling PluginManager.cpp"
185- @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
186-
187- $(OBJDIR ) /AudioEditor_3931be27.o : ../../Source/Processors/AudioNode/AudioEditor.cpp
188- -@mkdir -p $(OBJDIR )
189- @echo " Compiling AudioEditor.cpp"
190- @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
191-
192- $(OBJDIR ) /AudioNode_3db3557c.o : ../../Source/Processors/AudioNode/AudioNode.cpp
193- -@mkdir -p $(OBJDIR )
194- @echo " Compiling AudioNode.cpp"
195- @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
196-
197- $(OBJDIR ) /Channel_5cb2d4d2.o : ../../Source/Processors/Channel/Channel.cpp
198- -@mkdir -p $(OBJDIR )
199- @echo " Compiling Channel.cpp"
200- @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
201-
202- $(OBJDIR ) /DataBuffer_6ae4f549.o : ../../Source/Processors/DataThreads/DataBuffer.cpp
203- -@mkdir -p $(OBJDIR )
204- @echo " Compiling DataBuffer.cpp"
205- @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
206-
207- $(OBJDIR ) /DataThread_b2a47a13.o : ../../Source/Processors/DataThreads/DataThread.cpp
208- -@mkdir -p $(OBJDIR )
209- @echo " Compiling DataThread.cpp"
210- @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
211-
212178$(OBJDIR ) /Bessel_7e54cb27.o : ../../Source/Processors/Dsp/Bessel.cpp
213179 -@mkdir -p $(OBJDIR )
214180 @echo " Compiling Bessel.cpp"
@@ -294,6 +260,46 @@ $(OBJDIR)/State_5d41ca1e.o: ../../Source/Processors/Dsp/State.cpp
294260 @echo " Compiling State.cpp"
295261 @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
296262
263+ $(OBJDIR ) /ofSerial_c3b0a9e1.o : ../../Source/Processors/Serial/ofSerial.cpp
264+ -@mkdir -p $(OBJDIR )
265+ @echo " Compiling ofSerial.cpp"
266+ @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
267+
268+ $(OBJDIR ) /ProcessorManager_2aa7db2a.o : ../../Source/Processors/ProcessorManager/ProcessorManager.cpp
269+ -@mkdir -p $(OBJDIR )
270+ @echo " Compiling ProcessorManager.cpp"
271+ @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
272+
273+ $(OBJDIR ) /PluginManager_f764c180.o : ../../Source/Processors/PluginManager/PluginManager.cpp
274+ -@mkdir -p $(OBJDIR )
275+ @echo " Compiling PluginManager.cpp"
276+ @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
277+
278+ $(OBJDIR ) /AudioEditor_3931be27.o : ../../Source/Processors/AudioNode/AudioEditor.cpp
279+ -@mkdir -p $(OBJDIR )
280+ @echo " Compiling AudioEditor.cpp"
281+ @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
282+
283+ $(OBJDIR ) /AudioNode_3db3557c.o : ../../Source/Processors/AudioNode/AudioNode.cpp
284+ -@mkdir -p $(OBJDIR )
285+ @echo " Compiling AudioNode.cpp"
286+ @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
287+
288+ $(OBJDIR ) /Channel_5cb2d4d2.o : ../../Source/Processors/Channel/Channel.cpp
289+ -@mkdir -p $(OBJDIR )
290+ @echo " Compiling Channel.cpp"
291+ @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
292+
293+ $(OBJDIR ) /DataBuffer_6ae4f549.o : ../../Source/Processors/DataThreads/DataBuffer.cpp
294+ -@mkdir -p $(OBJDIR )
295+ @echo " Compiling DataBuffer.cpp"
296+ @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
297+
298+ $(OBJDIR ) /DataThread_b2a47a13.o : ../../Source/Processors/DataThreads/DataThread.cpp
299+ -@mkdir -p $(OBJDIR )
300+ @echo " Compiling DataThread.cpp"
301+ @$(CXX ) $(CXXFLAGS ) -o " $@ " -c " $<"
302+
297303$(OBJDIR ) /ChannelSelector_c1430874.o : ../../Source/Processors/Editors/ChannelSelector.cpp
298304 -@mkdir -p $(OBJDIR )
299305 @echo " Compiling ChannelSelector.cpp"
0 commit comments