Skip to content

Commit dd5ca5e

Browse files
ethanbbethanbb
committed
Merge branch 'development' into processorgraph-changes
2 parents 3a9c0de + 0090a6c commit dd5ca5e

145 files changed

Lines changed: 5662 additions & 23387 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Builds/Linux/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ifeq ($(CONFIG),Debug)
2121
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.4.1" -D "JUCE_APP_VERSION_HEX=0x40401" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/VST3\ SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I JuceLibraryCode/
2222
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -rdynamic -fvisibility=hidden
2323
CXXFLAGS += $(CFLAGS) -std=c++11
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 -ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN'
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 -ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN/shared'
2525

2626
TARGET := open-ephys
2727
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
@@ -41,7 +41,7 @@ ifeq ($(CONFIG),Release)
4141
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.4.1" -D "JUCE_APP_VERSION_HEX=0x40401" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/VST3\ SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I JuceLibraryCode/
4242
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -rdynamic -fvisibility=hidden
4343
CXXFLAGS += $(CFLAGS) -std=c++11
44-
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'
44+
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/shared'
4545

4646
TARGET := open-ephys-release
4747
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)

‎Builds/Linux/Makefile.plugins‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ifeq ($(CONFIG),Debug)
1616
LIBDIR := $(CURDIR)/build/intermediate/Debug
1717
OBJDIR := $(CURDIR)/build/intermediate/plugins/Debug
1818
OUTDIR := $(CURDIR)/build/plugins
19+
SHAREDDIR := $(CURDIR)/build/shared
1920

2021
ifeq ($(TARGET_ARCH),)
2122
TARGET_ARCH := -march=native
@@ -24,7 +25,7 @@ ifeq ($(CONFIG),Debug)
2425
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
2526
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -std=c++11 -fPIC -rdynamic
2627
CXXFLAGS += $(CFLAGS)
27-
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 -rdynamic -Wl,-rpath,'$$$$ORIGIN/..'
28+
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L$(SHAREDDIR) -L/usr/X11R6/lib/ -L/usr/local/include -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC -rdynamic -Wl,-rpath,'$$$$ORIGIN/../shared'
2829
LDDEPS :=
2930
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../Source/Plugins/Headers
3031

@@ -36,6 +37,7 @@ ifeq ($(CONFIG),Release)
3637
LIBDIR := $(CURDIR)/build/intermediate/Release
3738
OBJDIR := $(CURDIR)/build/intermediate/plugins/Release
3839
OUTDIR := $(CURDIR)/build/plugins
40+
SHAREDDIR := $(CURDIR)/build/shared
3941

4042
ifeq ($(TARGET_ARCH),)
4143
TARGET_ARCH := -march=native
@@ -44,7 +46,7 @@ ifeq ($(CONFIG),Release)
4446
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
4547
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 -fPIC -rdynamic
4648
CXXFLAGS += $(CFLAGS)
47-
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 -rdynamic -Wl,-rpath,'$$$$ORIGIN/..'
49+
LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L$(SHAREDDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt -pg -ldl -lXext -lGLU -fPIC -rdynamic -Wl,-rpath,'$$$$ORIGIN/../shared'
4850
LDDEPS1 :=
4951
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2" -D "JUCE_APP_VERSION_HEX=0x402" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../Source/Plugins/Headers
5052

@@ -71,7 +73,7 @@ PLUGINNAME=$(shell echo $@ | rev | cut -d'/' -f-1 | rev)
7173

7274
# if there are a .jucer file in the plugin folder - try to find Makefile in the Source/ folder
7375
$(SUBDIRS): CXXFLAGS += -D "OEPLUGIN" -I $(CURDIR)/../../Source/Plugins/CommonLibs
74-
$(COMMONDIRS): OUTDIR := $(BINDIR)
76+
$(COMMONDIRS): OUTDIR := $(BINDIR)/shared
7577
$(COMMONDIRS): LIB_PREFIX := lib
7678
$(SUBDIRS) $(COMMONDIRS):
7779
@if [ -f $@/*.jucer ] && ([ -f $@/Source/Makefile ]); then \

Builds/Linux/build/libokFrontPanel.so renamed to Builds/Linux/build/shared/libokFrontPanel.so

File renamed without changes.

‎Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Builds/MacOSX/OpenEphys.xcworkspace/xcshareddata/xcschemes/All.xcscheme‎

Lines changed: 15 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "0720"
4-
version = "1.8">
4+
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -67,20 +67,6 @@
6767
ReferencedContainer = "container:Plugins/BasicSpikeDisplay/BasicSpikeDisplay.xcodeproj">
6868
</BuildableReference>
6969
</BuildActionEntry>
70-
<BuildActionEntry
71-
buildForTesting = "YES"
72-
buildForRunning = "YES"
73-
buildForProfiling = "YES"
74-
buildForArchiving = "YES"
75-
buildForAnalyzing = "YES">
76-
<BuildableReference
77-
BuildableIdentifier = "primary"
78-
BlueprintIdentifier = "E1D300271DAEBBBD0050E0F8"
79-
BuildableName = "BinaryWriter.bundle"
80-
BlueprintName = "BinaryWriter"
81-
ReferencedContainer = "container:Plugins/BinaryWriter/BinaryWriter.xcodeproj">
82-
</BuildableReference>
83-
</BuildActionEntry>
8470
<BuildActionEntry
8571
buildForTesting = "YES"
8672
buildForRunning = "YES"
@@ -151,20 +137,6 @@
151137
ReferencedContainer = "container:Plugins/FilterNode/FilterNode.xcodeproj">
152138
</BuildableReference>
153139
</BuildActionEntry>
154-
<BuildActionEntry
155-
buildForTesting = "YES"
156-
buildForRunning = "YES"
157-
buildForProfiling = "YES"
158-
buildForArchiving = "YES"
159-
buildForAnalyzing = "YES">
160-
<BuildableReference
161-
BuildableIdentifier = "primary"
162-
BlueprintIdentifier = "E1F558CF1C9B23370035F88B"
163-
BuildableName = "KWIKFormat.bundle"
164-
BlueprintName = "KWIKFormat"
165-
ReferencedContainer = "container:Plugins/KWIKFormat/KWIKFormat.xcodeproj">
166-
</BuildableReference>
167-
</BuildActionEntry>
168140
<BuildActionEntry
169141
buildForTesting = "YES"
170142
buildForRunning = "YES"
@@ -179,20 +151,6 @@
179151
ReferencedContainer = "container:Plugins/LfpDisplayNode/LfpDisplayNode.xcodeproj">
180152
</BuildableReference>
181153
</BuildActionEntry>
182-
<BuildActionEntry
183-
buildForTesting = "YES"
184-
buildForRunning = "YES"
185-
buildForProfiling = "YES"
186-
buildForArchiving = "YES"
187-
buildForAnalyzing = "YES">
188-
<BuildableReference
189-
BuildableIdentifier = "primary"
190-
BlueprintIdentifier = "D3E60EE41CD19893003FDF5C"
191-
BuildableName = "LfpDisplayNodeAlpha.bundle"
192-
BlueprintName = "LfpDisplayNodeAlpha"
193-
ReferencedContainer = "container:Plugins/LfpDisplayNodeAlpha/LfpDisplayNodeAlpha.xcodeproj">
194-
</BuildableReference>
195-
</BuildActionEntry>
196154
<BuildActionEntry
197155
buildForTesting = "YES"
198156
buildForRunning = "YES"
@@ -221,20 +179,6 @@
221179
ReferencedContainer = "container:Plugins/NetworkEvents/NetworkEvents.xcodeproj">
222180
</BuildableReference>
223181
</BuildActionEntry>
224-
<BuildActionEntry
225-
buildForTesting = "YES"
226-
buildForRunning = "YES"
227-
buildForProfiling = "YES"
228-
buildForArchiving = "YES"
229-
buildForAnalyzing = "YES">
230-
<BuildableReference
231-
BuildableIdentifier = "primary"
232-
BlueprintIdentifier = "E1F91DE31DBE670500FF13EA"
233-
BuildableName = "NWBFormat.bundle"
234-
BlueprintName = "NWBFormat"
235-
ReferencedContainer = "container:Plugins/NWBFormat/NWBFormat.xcodeproj">
236-
</BuildableReference>
237-
</BuildActionEntry>
238182
<BuildActionEntry
239183
buildForTesting = "YES"
240184
buildForRunning = "YES"
@@ -347,13 +291,26 @@
347291
ReferencedContainer = "container:Plugins/IntanRecordingController/IntanRecordingController.xcodeproj">
348292
</BuildableReference>
349293
</BuildActionEntry>
294+
<BuildActionEntry
295+
buildForTesting = "YES"
296+
buildForRunning = "YES"
297+
buildForProfiling = "YES"
298+
buildForArchiving = "YES"
299+
buildForAnalyzing = "YES">
300+
<BuildableReference
301+
BuildableIdentifier = "primary"
302+
BlueprintIdentifier = "E1D300271DAEBBBD0050E0F8"
303+
BuildableName = "BinaryFormat.bundle"
304+
BlueprintName = "BinaryFormat"
305+
ReferencedContainer = "container:Plugins/BinaryFormat/BinaryFormat.xcodeproj">
306+
</BuildableReference>
307+
</BuildActionEntry>
350308
</BuildActionEntries>
351309
</BuildAction>
352310
<TestAction
353311
buildConfiguration = "Debug"
354312
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
355313
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
356-
language = ""
357314
shouldUseLaunchSchemeArgsEnv = "YES">
358315
<Testables>
359316
</Testables>

0 commit comments

Comments
 (0)