Skip to content

Commit a2f3d26

Browse files
aacuevasaacuevas
committed
Merge branch 'testing' into development
2 parents 59a9f51 + 36bf744 commit a2f3d26

42 files changed

Lines changed: 5486 additions & 6345 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.

‎.gitignore‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,36 @@ Builds/MacOSX/open-ephys.xcodeproj/*.pbxuser
120120
Builds/MacOSX/open-ephys.xcodeproj/xcuserdata
121121
Builds/MacOSX/open-ephys.xcodeproj/project.xcworkspace
122122
Builds/MacOSX/build
123-
Projucer/Builds/MacOSX/The Projucer.xcodeproj/*.mode1v3
124-
Projucer/Builds/MacOSX/The Projucer.xcodeproj/*.pbxuser
125-
Projucer/Builds/MacOSX/The Projucer.xcodeproj/xcuserdata
126-
Projucer/Builds/MacOSX/The Projucer.xcodeproj/project.xcworkspace
123+
Projucer/Builds/MacOSX/Projucer.xcodeproj/*.mode1v3
124+
Projucer/Builds/MacOSX/Projucer.xcodeproj/*.pbxuser
125+
Projucer/Builds/MacOSX/Projucer.xcodeproj/xcuserdata
126+
Projucer/Builds/MacOSX/Projucer.xcodeproj/project.xcworkspace
127127
Projucer/Builds/MacOSX/build
128128
Projucer/Builds/MacOSX/Projucer.xcodeproj/xcuserdata
129129
Projucer/Builds/MacOSX/Projucer.xcodeproj/project.xcworkspace
130130

131+
*.pbxuser
132+
!default.pbxuser
133+
*.mode1v3
134+
!default.mode1v3
135+
*.mode2v3
136+
!default.mode2v3
137+
*.perspectivev3
138+
*default.perspectivev3
139+
xcuserdata/
140+
141+
*.moved-aside
142+
*.xccheckout
143+
*.xcscmblueprint
144+
145+
*.xcodeproj/*
146+
!*.xcodeproj/project.pbxproj
147+
!*.xcodeproj/xcshareddata/
148+
!*.xcworkspace/contents.xcworkspacedata
149+
/*.gcno
150+
151+
PluginGenerator/Builds/MacOSX/OpenEphys_PluginGenerator.xcodeproj/project.xcworkspace/contents.xcworkspacedata
152+
131153
# 9. Plugin build dirs
132154
build/
133155

‎Builds/Linux/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ 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.4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/VST3\ SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I JuceLibraryCode/
21+
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.3" -D "JUCE_APP_VERSION_HEX=0x403" -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
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'
@@ -38,7 +38,7 @@ ifeq ($(CONFIG),Release)
3838
TARGET_ARCH := -march=native
3939
endif
4040

41-
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/VST3\ SDK -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules -I JuceLibraryCode/
41+
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.3" -D "JUCE_APP_VERSION_HEX=0x403" -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
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'

‎Builds/Linux/Makefile.plugins‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ifeq ($(CONFIG),Debug)
2121
TARGET_ARCH := -march=native
2222
endif
2323

24-
CPPFLAGS := $(DEPFLAGS) -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)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
24+
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
2525
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -std=c++11 -fPIC -rdynamic
2626
CXXFLAGS += $(CFLAGS)
2727
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
@@ -41,7 +41,7 @@ ifeq ($(CONFIG),Release)
4141
TARGET_ARCH := -march=native
4242
endif
4343

44-
CPPFLAGS := $(DEPFLAGS) -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)/../../JuceLibraryCode -I $(CURDIR)/../../JuceLibraryCode/modules -I $(CURDIR)/../../Source/Plugins/Headers
44+
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
4545
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 -fPIC -rdynamic
4646
CXXFLAGS += $(CFLAGS)
4747
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

‎Builds/MacOSX/Info-App.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<key>CFBundleSignature</key>
1919
<string>????</string>
2020
<key>CFBundleShortVersionString</key>
21-
<string>0.4.2.1</string>
21+
<string>0.4.3</string>
2222
<key>CFBundleVersion</key>
23-
<string>0.4.2.1</string>
23+
<string>0.4.3</string>
2424
<key>NSHumanReadableCopyright</key>
2525
<string>Open Ephys</string>
2626
<key>NSHighResolutionCapable</key>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
buildForAnalyzing = "YES">
132132
<BuildableReference
133133
BuildableIdentifier = "primary"
134-
BlueprintIdentifier = "038981D21FA2EFB500D25D7A"
134+
BlueprintIdentifier = "274EC0321FC30DB200242F92"
135135
BuildableName = "EvntTrigAvg.bundle"
136136
BlueprintName = "EvntTrigAvg"
137137
ReferencedContainer = "container:Plugins/EvntTrigAvg/EvntTrigAvg.xcodeproj">

‎Builds/MacOSX/Plugins/CommonLibs/OpenEphysHDF5/OpenEphysHDF5.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,14 @@
173173
buildSettings = {
174174
HEADER_SEARCH_PATHS = (
175175
"$(inherited)",
176-
"$(MAC_PACKAGE_DIR)/include",
177176
"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
177+
"$(MAC_PACKAGE_DIR)/include",
178178
);
179179
OTHER_LDFLAGS = (
180180
"$(inherited)",
181181
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libsz.a",
182-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libhdf5.a",
183-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libhdf5_cpp.a",
182+
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5.a",
183+
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5_cpp.a",
184184
);
185185
PRODUCT_NAME = "$(TARGET_NAME)";
186186
};
@@ -191,14 +191,14 @@
191191
buildSettings = {
192192
HEADER_SEARCH_PATHS = (
193193
"$(inherited)",
194-
"$(MAC_PACKAGE_DIR)/include",
195194
"$(MAC_PACKAGE_DIR)/lib/hdf5-18/include",
195+
"$(MAC_PACKAGE_DIR)/include",
196196
);
197197
OTHER_LDFLAGS = (
198198
"$(inherited)",
199199
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libsz.a",
200-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libhdf5.a",
201-
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/libhdf5_cpp.a",
200+
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5.a",
201+
"-Wl,-force_load,$(MAC_PACKAGE_DIR)/lib/hdf5-18/lib/libhdf5_cpp.a",
202202
);
203203
PRODUCT_NAME = "$(TARGET_NAME)";
204204
};

0 commit comments

Comments
 (0)