Skip to content

Commit 56bf5c9

Browse files
aacuevasaacuevas
committed
Update build projects
1 parent 7e02674 commit 56bf5c9

7 files changed

Lines changed: 1021 additions & 1065 deletions

File tree

‎Builds/Linux/Makefile‎

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ifeq ($(CONFIG),Debug)
2323
CXXFLAGS += $(CFLAGS) -std=c++11
2424
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN'
2525

26-
TARGET := open-ephys
26+
TARGET := open-ephys.so
2727
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
2828
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
2929
endif
@@ -43,7 +43,7 @@ ifeq ($(CONFIG),Release)
4343
CXXFLAGS += $(CFLAGS) -std=c++11
4444
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN'
4545

46-
TARGET := open-ephys-release
46+
TARGET := open-ephys-release.so
4747
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
4848
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
4949
endif
@@ -79,12 +79,6 @@ OBJECTS := \
7979
$(OBJDIR)/AudioNode_3db3557c.o \
8080
$(OBJDIR)/InfoObjects_ccadf9d5.o \
8181
$(OBJDIR)/MetaData_93b6c72a.o \
82-
$(OBJDIR)/RHD2000Editor_54b4b441.o \
83-
$(OBJDIR)/RHD2000Thread_6ad80a5e.o \
84-
$(OBJDIR)/okFrontPanelDLL_18d33583.o \
85-
$(OBJDIR)/rhd2000datablock_e1a710b.o \
86-
$(OBJDIR)/rhd2000evalboard_7ca0f632.o \
87-
$(OBJDIR)/rhd2000registers_6b59b998.o \
8882
$(OBJDIR)/DataBuffer_6ae4f549.o \
8983
$(OBJDIR)/DataThread_b2a47a13.o \
9084
$(OBJDIR)/ChannelSelector_c1430874.o \
@@ -322,36 +316,6 @@ $(OBJDIR)/MetaData_93b6c72a.o: ../../Source/Processors/Channel/MetaData.cpp
322316
@echo "Compiling MetaData.cpp"
323317
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
324318

325-
$(OBJDIR)/RHD2000Editor_54b4b441.o: ../../Source/Processors/DataThreads/RhythmNode/RHD2000Editor.cpp
326-
-@mkdir -p $(OBJDIR)
327-
@echo "Compiling RHD2000Editor.cpp"
328-
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
329-
330-
$(OBJDIR)/RHD2000Thread_6ad80a5e.o: ../../Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp
331-
-@mkdir -p $(OBJDIR)
332-
@echo "Compiling RHD2000Thread.cpp"
333-
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
334-
335-
$(OBJDIR)/okFrontPanelDLL_18d33583.o: ../../Source/Processors/DataThreads/RhythmNode/rhythm-api/okFrontPanelDLL.cpp
336-
-@mkdir -p $(OBJDIR)
337-
@echo "Compiling okFrontPanelDLL.cpp"
338-
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
339-
340-
$(OBJDIR)/rhd2000datablock_e1a710b.o: ../../Source/Processors/DataThreads/RhythmNode/rhythm-api/rhd2000datablock.cpp
341-
-@mkdir -p $(OBJDIR)
342-
@echo "Compiling rhd2000datablock.cpp"
343-
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
344-
345-
$(OBJDIR)/rhd2000evalboard_7ca0f632.o: ../../Source/Processors/DataThreads/RhythmNode/rhythm-api/rhd2000evalboard.cpp
346-
-@mkdir -p $(OBJDIR)
347-
@echo "Compiling rhd2000evalboard.cpp"
348-
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
349-
350-
$(OBJDIR)/rhd2000registers_6b59b998.o: ../../Source/Processors/DataThreads/RhythmNode/rhythm-api/rhd2000registers.cpp
351-
-@mkdir -p $(OBJDIR)
352-
@echo "Compiling rhd2000registers.cpp"
353-
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
354-
355319
$(OBJDIR)/DataBuffer_6ae4f549.o: ../../Source/Processors/DataThreads/DataBuffer.cpp
356320
-@mkdir -p $(OBJDIR)
357321
@echo "Compiling DataBuffer.cpp"

‎Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 40 deletions
Large diffs are not rendered by default.

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,6 @@
285285
<ClCompile Include="..\..\Source\Processors\AudioNode\AudioNode.cpp"/>
286286
<ClCompile Include="..\..\Source\Processors\Channel\InfoObjects.cpp"/>
287287
<ClCompile Include="..\..\Source\Processors\Channel\MetaData.cpp"/>
288-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Editor.cpp"/>
289-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Thread.cpp"/>
290-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\okFrontPanelDLL.cpp"/>
291-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000datablock.cpp"/>
292-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000evalboard.cpp"/>
293-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.cpp"/>
294288
<ClCompile Include="..\..\Source\Processors\DataThreads\DataBuffer.cpp"/>
295289
<ClCompile Include="..\..\Source\Processors\DataThreads\DataThread.cpp"/>
296290
<ClCompile Include="..\..\Source\Processors\Editors\ChannelSelector.cpp"/>
@@ -1954,12 +1948,6 @@
19541948
<ClInclude Include="..\..\Source\Processors\AudioNode\AudioNode.h"/>
19551949
<ClInclude Include="..\..\Source\Processors\Channel\InfoObjects.h"/>
19561950
<ClInclude Include="..\..\Source\Processors\Channel\MetaData.h"/>
1957-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Editor.h"/>
1958-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Thread.h"/>
1959-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\okFrontPanelDLL.h"/>
1960-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000datablock.h"/>
1961-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000evalboard.h"/>
1962-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.h"/>
19631951
<ClInclude Include="..\..\Source\Processors\DataThreads\DataBuffer.h"/>
19641952
<ClInclude Include="..\..\Source\Processors\DataThreads\DataThread.h"/>
19651953
<ClInclude Include="..\..\Source\Processors\Editors\ChannelSelector.h"/>

‎Builds/VisualStudio2012/open-ephys.vcxproj.filters‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@
5959
<Filter Include="open-ephys\Source\Processors\DataThreads">
6060
<UniqueIdentifier>{AA123918-8642-2612-7B72-C63DA032271B}</UniqueIdentifier>
6161
</Filter>
62-
<Filter Include="open-ephys\Source\Processors\DataThreads\RhythmNode">
63-
<UniqueIdentifier>{ACBDC612-339C-4E74-75BC-3E75843FD61D}</UniqueIdentifier>
64-
</Filter>
65-
<Filter Include="open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api">
66-
<UniqueIdentifier>{2107D2E9-A134-3C5F-3DD6-867FA7172E43}</UniqueIdentifier>
67-
</Filter>
6862
<Filter Include="open-ephys\Source\Processors\Editors">
6963
<UniqueIdentifier>{E65874A6-23B2-9D76-B12A-15730E2192BC}</UniqueIdentifier>
7064
</Filter>
@@ -562,24 +556,6 @@
562556
<ClCompile Include="..\..\Source\Processors\Channel\MetaData.cpp">
563557
<Filter>open-ephys\Source\Processors\Channel</Filter>
564558
</ClCompile>
565-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Editor.cpp">
566-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode</Filter>
567-
</ClCompile>
568-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Thread.cpp">
569-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode</Filter>
570-
</ClCompile>
571-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\okFrontPanelDLL.cpp">
572-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
573-
</ClCompile>
574-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000datablock.cpp">
575-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
576-
</ClCompile>
577-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000evalboard.cpp">
578-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
579-
</ClCompile>
580-
<ClCompile Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.cpp">
581-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
582-
</ClCompile>
583559
<ClCompile Include="..\..\Source\Processors\DataThreads\DataBuffer.cpp">
584560
<Filter>open-ephys\Source\Processors\DataThreads</Filter>
585561
</ClCompile>
@@ -2580,24 +2556,6 @@
25802556
<ClInclude Include="..\..\Source\Processors\Channel\MetaData.h">
25812557
<Filter>open-ephys\Source\Processors\Channel</Filter>
25822558
</ClInclude>
2583-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Editor.h">
2584-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode</Filter>
2585-
</ClInclude>
2586-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\RHD2000Thread.h">
2587-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode</Filter>
2588-
</ClInclude>
2589-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\okFrontPanelDLL.h">
2590-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
2591-
</ClInclude>
2592-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000datablock.h">
2593-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
2594-
</ClInclude>
2595-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000evalboard.h">
2596-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
2597-
</ClInclude>
2598-
<ClInclude Include="..\..\Source\Processors\DataThreads\RhythmNode\rhythm-api\rhd2000registers.h">
2599-
<Filter>open-ephys\Source\Processors\DataThreads\RhythmNode\rhythm-api</Filter>
2600-
</ClInclude>
26012559
<ClInclude Include="..\..\Source\Processors\DataThreads\DataBuffer.h">
26022560
<Filter>open-ephys\Source\Processors\DataThreads</Filter>
26032561
</ClInclude>

0 commit comments

Comments
 (0)