Skip to content

Commit 3d5e7d1

Browse files
jsieglejsiegle
committed
Merge branch 'development' of https://github.com/open-ephys/plugin-GUI into development
2 parents becba90 + c82fd9d commit 3d5e7d1

45 files changed

Lines changed: 1044 additions & 581 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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ 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" -D "JUCE_APP_VERSION_HEX=0x402" -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 "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/
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
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'
2525

2626
TARGET := open-ephys
2727
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
@@ -38,10 +38,10 @@ 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" -D "JUCE_APP_VERSION_HEX=0x402" -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 "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/
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
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'
4545

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

‎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</string>
21+
<string>0.4.2.1</string>
2222
<key>CFBundleVersion</key>
23-
<string>0.4.2</string>
23+
<string>0.4.2.1</string>
2424
<key>NSHumanReadableCopyright</key>
2525
<string>Open Ephys</string>
2626
<key>NSHighResolutionCapable</key>

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

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

‎Builds/MacOSX/Plugins/NWBFormat/NWBFormat.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@
239239
E1F91DEC1DBE670500FF13EA /* Release */,
240240
);
241241
defaultConfigurationIsVisible = 0;
242+
defaultConfigurationName = Release;
242243
};
243244
/* End XCConfigurationList section */
244245
};

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3358,8 +3358,8 @@
33583358
"_DEBUG=1",
33593359
"DEBUG=1",
33603360
"JUCER_XCODE_MAC_F6D2F4CF=1",
3361-
"JUCE_APP_VERSION=0.4.2",
3362-
"JUCE_APP_VERSION_HEX=0x402", );
3361+
"JUCE_APP_VERSION=0.4.2.1",
3362+
"JUCE_APP_VERSION_HEX=0x40201", );
33633363
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
33643364
HEADER_SEARCH_PATHS = ("~/SDKs/vstsdk2.4", "../../JuceLibraryCode", "../../JuceLibraryCode/modules", "JuceLibraryCode/", "$(inherited)");
33653365
INFOPLIST_FILE = Info-App.plist;
@@ -3382,8 +3382,8 @@
33823382
"_NDEBUG=1",
33833383
"NDEBUG=1",
33843384
"JUCER_XCODE_MAC_F6D2F4CF=1",
3385-
"JUCE_APP_VERSION=0.4.2",
3386-
"JUCE_APP_VERSION_HEX=0x402", );
3385+
"JUCE_APP_VERSION=0.4.2.1",
3386+
"JUCE_APP_VERSION_HEX=0x40201", );
33873387
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
33883388
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
33893389
HEADER_SEARCH_PATHS = ("~/SDKs/vstsdk2.4", "../../JuceLibraryCode", "../../JuceLibraryCode/modules", "JuceLibraryCode/", "$(inherited)");

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<Optimization>Disabled</Optimization>
8686
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
8787
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.2;JUCE_APP_VERSION_HEX=0x402;%(PreprocessorDefinitions)</PreprocessorDefinitions>
88+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.2.1;JUCE_APP_VERSION_HEX=0x40201;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8989
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
9090
<RuntimeTypeInfo>true</RuntimeTypeInfo>
9191
<PrecompiledHeader/>
@@ -130,7 +130,7 @@
130130
<ClCompile>
131131
<Optimization>Full</Optimization>
132132
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
133-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.2;JUCE_APP_VERSION_HEX=0x402;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.2.1;JUCE_APP_VERSION_HEX=0x40201;%(PreprocessorDefinitions)</PreprocessorDefinitions>
134134
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
135135
<RuntimeTypeInfo>true</RuntimeTypeInfo>
136136
<PrecompiledHeader/>
@@ -177,7 +177,7 @@
177177
<Optimization>Disabled</Optimization>
178178
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
179179
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
180-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.2;JUCE_APP_VERSION_HEX=0x402;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.2.1;JUCE_APP_VERSION_HEX=0x40201;%(PreprocessorDefinitions)</PreprocessorDefinitions>
181181
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
182182
<RuntimeTypeInfo>true</RuntimeTypeInfo>
183183
<PrecompiledHeader/>
@@ -220,7 +220,7 @@
220220
<ClCompile>
221221
<Optimization>Full</Optimization>
222222
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
223-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.2;JUCE_APP_VERSION_HEX=0x402;%(PreprocessorDefinitions)</PreprocessorDefinitions>
223+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.2.1;JUCE_APP_VERSION_HEX=0x40201;%(PreprocessorDefinitions)</PreprocessorDefinitions>
224224
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
225225
<RuntimeTypeInfo>true</RuntimeTypeInfo>
226226
<PrecompiledHeader/>

‎Builds/VisualStudio2012/resources.rc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
#include <windows.h>
88

99
VS_VERSION_INFO VERSIONINFO
10-
FILEVERSION 0,4,2,0
10+
FILEVERSION 0,4,2,1
1111
BEGIN
1212
BLOCK "StringFileInfo"
1313
BEGIN
1414
BLOCK "040904E4"
1515
BEGIN
1616
VALUE "CompanyName", "Open Ephys\0"
1717
VALUE "FileDescription", "open-ephys\0"
18-
VALUE "FileVersion", "0.4.2\0"
18+
VALUE "FileVersion", "0.4.2.1\0"
1919
VALUE "ProductName", "open-ephys\0"
20-
VALUE "ProductVersion", "0.4.2\0"
20+
VALUE "ProductVersion", "0.4.2.1\0"
2121
END
2222
END
2323

‎Builds/VisualStudio2013/Plugins/LFP_Viewer_Beta/LFP_Viewer_Beta.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<ClCompile>
7575
<WarningLevel>Level3</WarningLevel>
7676
<Optimization>Disabled</Optimization>
77-
<SDLCheck>true</SDLCheck>
77+
<SDLCheck>false</SDLCheck>
7878
</ClCompile>
7979
<Link>
8080
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -95,7 +95,7 @@
9595
<Optimization>MaxSpeed</Optimization>
9696
<FunctionLevelLinking>true</FunctionLevelLinking>
9797
<IntrinsicFunctions>true</IntrinsicFunctions>
98-
<SDLCheck>true</SDLCheck>
98+
<SDLCheck>false</SDLCheck>
9999
</ClCompile>
100100
<Link>
101101
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -109,7 +109,7 @@
109109
<Optimization>MaxSpeed</Optimization>
110110
<FunctionLevelLinking>true</FunctionLevelLinking>
111111
<IntrinsicFunctions>true</IntrinsicFunctions>
112-
<SDLCheck>true</SDLCheck>
112+
<SDLCheck>false</SDLCheck>
113113
</ClCompile>
114114
<Link>
115115
<GenerateDebugInformation>true</GenerateDebugInformation>

‎Builds/VisualStudio2013/Plugins/NetworkEvents/NetworkEvents.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<ClCompile>
7575
<WarningLevel>Level3</WarningLevel>
7676
<Optimization>Disabled</Optimization>
77-
<SDLCheck>true</SDLCheck>
77+
<SDLCheck>false</SDLCheck>
7878
<PreprocessorDefinitions>ZEROMQ;OEPLUGIN;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_API=__declspec(dllimport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7979
<AdditionalIncludeDirectories>../../../../Resources/windows-libs/ZeroMQ/include;..\..\..\..\JuceLibraryCode;..\..\..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8080
</ClCompile>
@@ -103,7 +103,7 @@
103103
<Optimization>MaxSpeed</Optimization>
104104
<FunctionLevelLinking>true</FunctionLevelLinking>
105105
<IntrinsicFunctions>true</IntrinsicFunctions>
106-
<SDLCheck>true</SDLCheck>
106+
<SDLCheck>false</SDLCheck>
107107
<PreprocessorDefinitions>ZEROMQ;OEPLUGIN;WIN32;_WINDOWS;NDEBUG;JUCE_API=__declspec(dllimport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108108
<AdditionalIncludeDirectories>../../../../Resources/windows-libs/ZeroMQ/include;..\..\..\..\JuceLibraryCode;..\..\..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
109109
</ClCompile>
@@ -121,7 +121,7 @@
121121
<Optimization>MaxSpeed</Optimization>
122122
<FunctionLevelLinking>true</FunctionLevelLinking>
123123
<IntrinsicFunctions>true</IntrinsicFunctions>
124-
<SDLCheck>true</SDLCheck>
124+
<SDLCheck>false</SDLCheck>
125125
<PreprocessorDefinitions>ZEROMQ;OEPLUGIN;WIN32;_WINDOWS;NDEBUG;JUCE_API=__declspec(dllimport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126126
<AdditionalIncludeDirectories>../../../../Resources/windows-libs/ZeroMQ/include;..\..\..\..\JuceLibraryCode;..\..\..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127127
</ClCompile>

‎Builds/VisualStudio2013/Plugins/Phase Detector/Phase Detector.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<ClCompile>
7575
<WarningLevel>Level3</WarningLevel>
7676
<Optimization>Disabled</Optimization>
77-
<SDLCheck>true</SDLCheck>
77+
<SDLCheck>false</SDLCheck>
7878
</ClCompile>
7979
<Link>
8080
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -95,7 +95,7 @@
9595
<Optimization>MaxSpeed</Optimization>
9696
<FunctionLevelLinking>true</FunctionLevelLinking>
9797
<IntrinsicFunctions>true</IntrinsicFunctions>
98-
<SDLCheck>true</SDLCheck>
98+
<SDLCheck>false</SDLCheck>
9999
</ClCompile>
100100
<Link>
101101
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -109,7 +109,7 @@
109109
<Optimization>MaxSpeed</Optimization>
110110
<FunctionLevelLinking>true</FunctionLevelLinking>
111111
<IntrinsicFunctions>true</IntrinsicFunctions>
112-
<SDLCheck>true</SDLCheck>
112+
<SDLCheck>false</SDLCheck>
113113
</ClCompile>
114114
<Link>
115115
<GenerateDebugInformation>true</GenerateDebugInformation>

0 commit comments

Comments
 (0)