Skip to content

Commit c85b233

Browse files
aacuevasaacuevas
committed
Merge branch 'testing' into development
2 parents bd752ff + 0da1fa8 commit c85b233

16 files changed

Lines changed: 78 additions & 92 deletions

File tree

‎Builds/Linux/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ ifeq ($(CONFIG),Debug)
2121
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/
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

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
@@ -41,7 +41,7 @@ ifeq ($(CONFIG),Release)
4141
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/
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/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/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<ClCompile>
8585
<Optimization>Disabled</Optimization>
8686
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
87-
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87+
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8888
<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>
8989
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
9090
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -129,7 +129,7 @@
129129
</Midl>
130130
<ClCompile>
131131
<Optimization>Full</Optimization>
132-
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132+
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
133133
<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>
134134
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
135135
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -176,7 +176,7 @@
176176
<ClCompile>
177177
<Optimization>Disabled</Optimization>
178178
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
179-
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
179+
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
180180
<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>
181181
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
182182
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -219,7 +219,7 @@
219219
</Midl>
220220
<ClCompile>
221221
<Optimization>Full</Optimization>
222-
<AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
222+
<AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
223223
<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>
224224
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
225225
<RuntimeTypeInfo>true</RuntimeTypeInfo>

‎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)