Permalink
Browse files

Merge branch 'master' of https://github.com/open-ephys/GUI

Conflicts:
	Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
	JuceLibraryCode/BinaryData.cpp
	JuceLibraryCode/JuceHeader.h
  • Loading branch information...
2 parents 2dc0abb + 15582fa commit 4a4cb7ab11194ae79df4949e7532f380204d9132 @akmokhtari akmokhtari committed Nov 29, 2012
View
@@ -63,6 +63,7 @@ OBJECTS := \
$(OBJDIR)/RootFinder_239a995f.o \
$(OBJDIR)/State_22979684.o \
$(OBJDIR)/AudioComponent_521bd9c9.o \
+ $(OBJDIR)/ReferenceNode_519d3b68.o \
$(OBJDIR)/PhaseDetector_7193f7dc.o \
$(OBJDIR)/AudioResamplingNode_3dbffa2d.o \
$(OBJDIR)/Channel_33a3e5fe.o \
@@ -93,6 +94,7 @@ OBJECTS := \
$(OBJDIR)/AudioNode_94606ff3.o \
$(OBJDIR)/EventNode_95c842b7.o \
$(OBJDIR)/RecordControlEditor_244084cb.o \
+ $(OBJDIR)/ReferenceNodeEditor_19ee0fac.o \
$(OBJDIR)/ResamplingNodeEditor_f2d6f061.o \
$(OBJDIR)/FPGAOutputEditor_cfe00f8a.o \
$(OBJDIR)/ArduinoOutputEditor_1118f008.o \
@@ -259,6 +261,11 @@ $(OBJDIR)/AudioComponent_521bd9c9.o: ../../Source/Audio/AudioComponent.cpp
@echo "Compiling AudioComponent.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/ReferenceNode_519d3b68.o: ../../Source/Processors/ReferenceNode.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling ReferenceNode.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
$(OBJDIR)/PhaseDetector_7193f7dc.o: ../../Source/Processors/PhaseDetector.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling PhaseDetector.cpp"
@@ -409,6 +416,11 @@ $(OBJDIR)/RecordControlEditor_244084cb.o: ../../Source/Processors/Editors/Record
@echo "Compiling RecordControlEditor.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/ReferenceNodeEditor_19ee0fac.o: ../../Source/Processors/Editors/ReferenceNodeEditor.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling ReferenceNodeEditor.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
$(OBJDIR)/ResamplingNodeEditor_f2d6f061.o: ../../Source/Processors/Editors/ResamplingNodeEditor.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ResamplingNodeEditor.cpp"
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# install g++
+apt-get -y install build-essential
+
+# install Juce dependencies
+apt-get -y install freeglut3-dev libfreetype6-dev libxinerama-dev libxcursor-dev libasound2-dev
+
+# install GUI dependencies
+apt-get -y install libftdi-dev libftgl-dev
+

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -144,6 +144,7 @@
<ClCompile Include="..\..\Source\Dsp\RootFinder.cpp"/>
<ClCompile Include="..\..\Source\Dsp\State.cpp"/>
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\ReferenceNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\PhaseDetector.cpp"/>
<ClCompile Include="..\..\Source\Processors\AudioResamplingNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\Channel.cpp"/>
@@ -174,6 +175,7 @@
<ClCompile Include="..\..\Source\Processors\AudioNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\EventNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\RecordControlEditor.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\Editors\ReferenceNodeEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\FPGAOutputEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.cpp"/>
@@ -252,6 +254,7 @@
<ClInclude Include="..\..\Source\Dsp\Types.h"/>
<ClInclude Include="..\..\Source\Dsp\Utilities.h"/>
<ClInclude Include="..\..\Source\Audio\AudioComponent.h"/>
+ <ClInclude Include="..\..\Source\Processors\ReferenceNode.h"/>
<ClInclude Include="..\..\Source\Processors\PhaseDetector.h"/>
<ClInclude Include="..\..\Source\Processors\AudioResamplingNode.h"/>
<ClInclude Include="..\..\Source\Processors\Channel.h"/>
@@ -285,6 +288,7 @@
<ClInclude Include="..\..\Source\Processors\AudioNode.h"/>
<ClInclude Include="..\..\Source\Processors\EventNode.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\RecordControlEditor.h"/>
+ <ClInclude Include="..\..\Source\Processors\Editors\ReferenceNodeEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\FPGAOutputEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.h"/>
@@ -310,6 +310,9 @@
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp">
<Filter>open-ephys\Source\Audio</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\ReferenceNode.cpp">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClCompile>
<ClCompile Include="..\..\Source\Processors\PhaseDetector.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
@@ -400,6 +403,9 @@
<ClCompile Include="..\..\Source\Processors\Editors\RecordControlEditor.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Editors\ReferenceNodeEditor.cpp">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClCompile>
<ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
@@ -630,6 +636,9 @@
<ClInclude Include="..\..\Source\Audio\AudioComponent.h">
<Filter>open-ephys\Source\Audio</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\ReferenceNode.h">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClInclude>
<ClInclude Include="..\..\Source\Processors\PhaseDetector.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
@@ -729,6 +738,9 @@
<ClInclude Include="..\..\Source\Processors\Editors\RecordControlEditor.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Editors\ReferenceNodeEditor.h">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClInclude>
<ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
Oops, something went wrong.

0 comments on commit 4a4cb7a

Please sign in to comment.