diff --git a/Builds/Linux/Makefile b/Builds/Linux/Makefile index 1ae639259f1f18b1eb130ca3d6080c81bb120444..fc359c3989febbbfe8bb4531f2e778045a1f702f 100644 --- a/Builds/Linux/Makefile +++ b/Builds/Linux/Makefile @@ -21,9 +21,9 @@ ifeq ($(CONFIG),Debug) 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/ CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -rdynamic -fvisibility=hidden CXXFLAGS += $(CFLAGS) -std=c++11 - 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 + 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' - TARGET := open-ephys + TARGET := open-ephys.so BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR) endif @@ -41,7 +41,7 @@ ifeq ($(CONFIG),Release) 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/ CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -rdynamic -fvisibility=hidden CXXFLAGS += $(CFLAGS) -std=c++11 - 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 + 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' TARGET := open-ephys-release BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) diff --git a/Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata b/Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata index 0a9ef155f588a09c06f0262dbffa8d353a84a3a2..3a7b70872579064f8214d8a710b996952e8629c6 100644 --- a/Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata +++ b/Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata @@ -65,9 +65,6 @@ <FileRef location = "group:SerialInput/SerialInput.xcodeproj"> </FileRef> - <FileRef - location = "group:SpikeRaster/SpikeRaster.xcodeproj"> - </FileRef> <FileRef location = "group:SpikeSorter/SpikeSorter.xcodeproj"> </FileRef> diff --git a/Builds/MacOSX/Plugins/NWBFormat/NWBFormat.xcodeproj/project.pbxproj b/Builds/MacOSX/Plugins/NWBFormat/NWBFormat.xcodeproj/project.pbxproj index 4c60410d56661e3b3b1e64cce1b85f1d72d09936..921608e444f8a352d3b802313ca12245375d14a9 100644 --- a/Builds/MacOSX/Plugins/NWBFormat/NWBFormat.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/Plugins/NWBFormat/NWBFormat.xcodeproj/project.pbxproj @@ -239,6 +239,7 @@ E1F91DEC1DBE670500FF13EA /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/Builds/VisualStudio2012/open-ephys.vcxproj b/Builds/VisualStudio2012/open-ephys.vcxproj index 4ca750dc9a351b7f3e778e67c666f874fa10fc3c..b7a88202ad2219343da620268f70532043af098f 100644 --- a/Builds/VisualStudio2012/open-ephys.vcxproj +++ b/Builds/VisualStudio2012/open-ephys.vcxproj @@ -84,7 +84,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> @@ -129,7 +129,7 @@ </Midl> <ClCompile> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> @@ -176,7 +176,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> @@ -219,7 +219,7 @@ </Midl> <ClCompile> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> diff --git a/Builds/VisualStudio2013/Plugins/LFP_Viewer_Beta/LFP_Viewer_Beta.vcxproj b/Builds/VisualStudio2013/Plugins/LFP_Viewer_Beta/LFP_Viewer_Beta.vcxproj index 59325ff17864cec8c4c06081d723f0304c261340..94a294e10b5401f0e6edd897a7d1f9cbd3fa704a 100644 --- a/Builds/VisualStudio2013/Plugins/LFP_Viewer_Beta/LFP_Viewer_Beta.vcxproj +++ b/Builds/VisualStudio2013/Plugins/LFP_Viewer_Beta/LFP_Viewer_Beta.vcxproj @@ -74,7 +74,7 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -95,7 +95,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -109,7 +109,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/Builds/VisualStudio2013/Plugins/NetworkEvents/NetworkEvents.vcxproj b/Builds/VisualStudio2013/Plugins/NetworkEvents/NetworkEvents.vcxproj index a1fb07bd496f0fa579a22857c4b40ea9cba95681..0f02f4cb78a89cc280c7211b8c7da950c3f46573 100644 --- a/Builds/VisualStudio2013/Plugins/NetworkEvents/NetworkEvents.vcxproj +++ b/Builds/VisualStudio2013/Plugins/NetworkEvents/NetworkEvents.vcxproj @@ -74,7 +74,7 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> <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> <AdditionalIncludeDirectories>../../../../Resources/windows-libs/ZeroMQ/include;..\..\..\..\JuceLibraryCode;..\..\..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> @@ -103,7 +103,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> <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> <AdditionalIncludeDirectories>../../../../Resources/windows-libs/ZeroMQ/include;..\..\..\..\JuceLibraryCode;..\..\..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> @@ -121,7 +121,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> <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> <AdditionalIncludeDirectories>../../../../Resources/windows-libs/ZeroMQ/include;..\..\..\..\JuceLibraryCode;..\..\..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> diff --git a/Builds/VisualStudio2013/Plugins/Phase Detector/Phase Detector.vcxproj b/Builds/VisualStudio2013/Plugins/Phase Detector/Phase Detector.vcxproj index 44484ebcdba2a4fc8f1378b538c42b51be40ba24..a2f4d733c8be16cccbcc5e3872bf1ba061299f5f 100644 --- a/Builds/VisualStudio2013/Plugins/Phase Detector/Phase Detector.vcxproj +++ b/Builds/VisualStudio2013/Plugins/Phase Detector/Phase Detector.vcxproj @@ -74,7 +74,7 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -95,7 +95,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -109,7 +109,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/Builds/VisualStudio2013/Plugins/Plugins.sln b/Builds/VisualStudio2013/Plugins/Plugins.sln index 7c16119cedef602190b8a9fbfa49a24962036cc3..4f3221338df30c71d36990d5ba537256ae1b7b0d 100644 --- a/Builds/VisualStudio2013/Plugins/Plugins.sln +++ b/Builds/VisualStudio2013/Plugins/Plugins.sln @@ -44,8 +44,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BinaryWriter", "BinaryWrite EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LFP_Viewer_Beta", "LFP_Viewer_Beta\LFP_Viewer_Beta.vcxproj", "{A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpikeRaster", "SpikeRaster\SpikeRaster.vcxproj", "{D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NWBFormat", "NWBFormat\NWBFormat.vcxproj", "{270F2CBD-EE26-44CF-B53C-068CA80BFBF7}" ProjectSection(ProjectDependencies) = postProject {F250DB70-6E3E-408C-BD9E-1483D574499D} = {F250DB70-6E3E-408C-BD9E-1483D574499D} @@ -71,8 +69,8 @@ Global {41BD734E-4939-47AD-9714-9629538F7206}.Debug|Mixed Platforms.Build.0 = Release|x64 {41BD734E-4939-47AD-9714-9629538F7206}.Debug|Win32.ActiveCfg = Debug|Win32 {41BD734E-4939-47AD-9714-9629538F7206}.Debug|Win32.Build.0 = Debug|Win32 - {41BD734E-4939-47AD-9714-9629538F7206}.Debug|x64.ActiveCfg = Debug|x64 - {41BD734E-4939-47AD-9714-9629538F7206}.Debug|x64.Build.0 = Debug|x64 + {41BD734E-4939-47AD-9714-9629538F7206}.Debug|x64.ActiveCfg = Release|x64 + {41BD734E-4939-47AD-9714-9629538F7206}.Debug|x64.Build.0 = Release|x64 {41BD734E-4939-47AD-9714-9629538F7206}.Release|Mixed Platforms.ActiveCfg = Release|x64 {41BD734E-4939-47AD-9714-9629538F7206}.Release|Mixed Platforms.Build.0 = Release|x64 {41BD734E-4939-47AD-9714-9629538F7206}.Release|Win32.ActiveCfg = Release|Win32 @@ -83,8 +81,8 @@ Global {554C8744-32CD-427C-A9E5-BF9A44440CED}.Debug|Mixed Platforms.Build.0 = Release|x64 {554C8744-32CD-427C-A9E5-BF9A44440CED}.Debug|Win32.ActiveCfg = Debug|Win32 {554C8744-32CD-427C-A9E5-BF9A44440CED}.Debug|Win32.Build.0 = Debug|Win32 - {554C8744-32CD-427C-A9E5-BF9A44440CED}.Debug|x64.ActiveCfg = Debug|x64 - {554C8744-32CD-427C-A9E5-BF9A44440CED}.Debug|x64.Build.0 = Debug|x64 + {554C8744-32CD-427C-A9E5-BF9A44440CED}.Debug|x64.ActiveCfg = Release|x64 + {554C8744-32CD-427C-A9E5-BF9A44440CED}.Debug|x64.Build.0 = Release|x64 {554C8744-32CD-427C-A9E5-BF9A44440CED}.Release|Mixed Platforms.ActiveCfg = Release|x64 {554C8744-32CD-427C-A9E5-BF9A44440CED}.Release|Mixed Platforms.Build.0 = Release|x64 {554C8744-32CD-427C-A9E5-BF9A44440CED}.Release|Win32.ActiveCfg = Release|Win32 @@ -95,8 +93,8 @@ Global {7B23828E-559F-4AD2-B75D-D05786F6329C}.Debug|Mixed Platforms.Build.0 = Release|x64 {7B23828E-559F-4AD2-B75D-D05786F6329C}.Debug|Win32.ActiveCfg = Debug|Win32 {7B23828E-559F-4AD2-B75D-D05786F6329C}.Debug|Win32.Build.0 = Debug|Win32 - {7B23828E-559F-4AD2-B75D-D05786F6329C}.Debug|x64.ActiveCfg = Debug|x64 - {7B23828E-559F-4AD2-B75D-D05786F6329C}.Debug|x64.Build.0 = Debug|x64 + {7B23828E-559F-4AD2-B75D-D05786F6329C}.Debug|x64.ActiveCfg = Release|x64 + {7B23828E-559F-4AD2-B75D-D05786F6329C}.Debug|x64.Build.0 = Release|x64 {7B23828E-559F-4AD2-B75D-D05786F6329C}.Release|Mixed Platforms.ActiveCfg = Release|x64 {7B23828E-559F-4AD2-B75D-D05786F6329C}.Release|Mixed Platforms.Build.0 = Release|x64 {7B23828E-559F-4AD2-B75D-D05786F6329C}.Release|Win32.ActiveCfg = Release|Win32 @@ -107,8 +105,8 @@ Global {D5D58DAC-582B-4F39-9385-E1814D56BCA0}.Debug|Mixed Platforms.Build.0 = Release|x64 {D5D58DAC-582B-4F39-9385-E1814D56BCA0}.Debug|Win32.ActiveCfg = Debug|Win32 {D5D58DAC-582B-4F39-9385-E1814D56BCA0}.Debug|Win32.Build.0 = Debug|Win32 - {D5D58DAC-582B-4F39-9385-E1814D56BCA0}.Debug|x64.ActiveCfg = Debug|x64 - {D5D58DAC-582B-4F39-9385-E1814D56BCA0}.Debug|x64.Build.0 = Debug|x64 + {D5D58DAC-582B-4F39-9385-E1814D56BCA0}.Debug|x64.ActiveCfg = Release|x64 + {D5D58DAC-582B-4F39-9385-E1814D56BCA0}.Debug|x64.Build.0 = Release|x64 {D5D58DAC-582B-4F39-9385-E1814D56BCA0}.Release|Mixed Platforms.ActiveCfg = Release|x64 {D5D58DAC-582B-4F39-9385-E1814D56BCA0}.Release|Mixed Platforms.Build.0 = Release|x64 {D5D58DAC-582B-4F39-9385-E1814D56BCA0}.Release|Win32.ActiveCfg = Release|Win32 @@ -119,8 +117,8 @@ Global {AC9EBFBF-1599-40CF-8159-3F3AA7DCFAE9}.Debug|Mixed Platforms.Build.0 = Release|x64 {AC9EBFBF-1599-40CF-8159-3F3AA7DCFAE9}.Debug|Win32.ActiveCfg = Debug|Win32 {AC9EBFBF-1599-40CF-8159-3F3AA7DCFAE9}.Debug|Win32.Build.0 = Debug|Win32 - {AC9EBFBF-1599-40CF-8159-3F3AA7DCFAE9}.Debug|x64.ActiveCfg = Debug|x64 - {AC9EBFBF-1599-40CF-8159-3F3AA7DCFAE9}.Debug|x64.Build.0 = Debug|x64 + {AC9EBFBF-1599-40CF-8159-3F3AA7DCFAE9}.Debug|x64.ActiveCfg = Release|x64 + {AC9EBFBF-1599-40CF-8159-3F3AA7DCFAE9}.Debug|x64.Build.0 = Release|x64 {AC9EBFBF-1599-40CF-8159-3F3AA7DCFAE9}.Release|Mixed Platforms.ActiveCfg = Release|x64 {AC9EBFBF-1599-40CF-8159-3F3AA7DCFAE9}.Release|Mixed Platforms.Build.0 = Release|x64 {AC9EBFBF-1599-40CF-8159-3F3AA7DCFAE9}.Release|Win32.ActiveCfg = Release|Win32 @@ -131,8 +129,8 @@ Global {9D050DCC-52DF-429E-ABF0-EF0B64A9DA5A}.Debug|Mixed Platforms.Build.0 = Release|x64 {9D050DCC-52DF-429E-ABF0-EF0B64A9DA5A}.Debug|Win32.ActiveCfg = Debug|Win32 {9D050DCC-52DF-429E-ABF0-EF0B64A9DA5A}.Debug|Win32.Build.0 = Debug|Win32 - {9D050DCC-52DF-429E-ABF0-EF0B64A9DA5A}.Debug|x64.ActiveCfg = Debug|x64 - {9D050DCC-52DF-429E-ABF0-EF0B64A9DA5A}.Debug|x64.Build.0 = Debug|x64 + {9D050DCC-52DF-429E-ABF0-EF0B64A9DA5A}.Debug|x64.ActiveCfg = Release|x64 + {9D050DCC-52DF-429E-ABF0-EF0B64A9DA5A}.Debug|x64.Build.0 = Release|x64 {9D050DCC-52DF-429E-ABF0-EF0B64A9DA5A}.Release|Mixed Platforms.ActiveCfg = Release|x64 {9D050DCC-52DF-429E-ABF0-EF0B64A9DA5A}.Release|Mixed Platforms.Build.0 = Release|x64 {9D050DCC-52DF-429E-ABF0-EF0B64A9DA5A}.Release|Win32.ActiveCfg = Release|Win32 @@ -143,8 +141,8 @@ Global {79703461-0C53-417B-BEA2-B3903A41C123}.Debug|Mixed Platforms.Build.0 = Release|x64 {79703461-0C53-417B-BEA2-B3903A41C123}.Debug|Win32.ActiveCfg = Debug|Win32 {79703461-0C53-417B-BEA2-B3903A41C123}.Debug|Win32.Build.0 = Debug|Win32 - {79703461-0C53-417B-BEA2-B3903A41C123}.Debug|x64.ActiveCfg = Debug|x64 - {79703461-0C53-417B-BEA2-B3903A41C123}.Debug|x64.Build.0 = Debug|x64 + {79703461-0C53-417B-BEA2-B3903A41C123}.Debug|x64.ActiveCfg = Release|x64 + {79703461-0C53-417B-BEA2-B3903A41C123}.Debug|x64.Build.0 = Release|x64 {79703461-0C53-417B-BEA2-B3903A41C123}.Release|Mixed Platforms.ActiveCfg = Release|x64 {79703461-0C53-417B-BEA2-B3903A41C123}.Release|Mixed Platforms.Build.0 = Release|x64 {79703461-0C53-417B-BEA2-B3903A41C123}.Release|Win32.ActiveCfg = Release|Win32 @@ -155,8 +153,8 @@ Global {9C33B87F-24D7-4952-91C0-44759C77F491}.Debug|Mixed Platforms.Build.0 = Release|x64 {9C33B87F-24D7-4952-91C0-44759C77F491}.Debug|Win32.ActiveCfg = Debug|Win32 {9C33B87F-24D7-4952-91C0-44759C77F491}.Debug|Win32.Build.0 = Debug|Win32 - {9C33B87F-24D7-4952-91C0-44759C77F491}.Debug|x64.ActiveCfg = Debug|x64 - {9C33B87F-24D7-4952-91C0-44759C77F491}.Debug|x64.Build.0 = Debug|x64 + {9C33B87F-24D7-4952-91C0-44759C77F491}.Debug|x64.ActiveCfg = Release|x64 + {9C33B87F-24D7-4952-91C0-44759C77F491}.Debug|x64.Build.0 = Release|x64 {9C33B87F-24D7-4952-91C0-44759C77F491}.Release|Mixed Platforms.ActiveCfg = Release|x64 {9C33B87F-24D7-4952-91C0-44759C77F491}.Release|Mixed Platforms.Build.0 = Release|x64 {9C33B87F-24D7-4952-91C0-44759C77F491}.Release|Win32.ActiveCfg = Release|Win32 @@ -167,8 +165,8 @@ Global {75DEED7F-17D0-4805-9272-96288B79BA53}.Debug|Mixed Platforms.Build.0 = Release|x64 {75DEED7F-17D0-4805-9272-96288B79BA53}.Debug|Win32.ActiveCfg = Debug|Win32 {75DEED7F-17D0-4805-9272-96288B79BA53}.Debug|Win32.Build.0 = Debug|Win32 - {75DEED7F-17D0-4805-9272-96288B79BA53}.Debug|x64.ActiveCfg = Debug|x64 - {75DEED7F-17D0-4805-9272-96288B79BA53}.Debug|x64.Build.0 = Debug|x64 + {75DEED7F-17D0-4805-9272-96288B79BA53}.Debug|x64.ActiveCfg = Release|x64 + {75DEED7F-17D0-4805-9272-96288B79BA53}.Debug|x64.Build.0 = Release|x64 {75DEED7F-17D0-4805-9272-96288B79BA53}.Release|Mixed Platforms.ActiveCfg = Release|x64 {75DEED7F-17D0-4805-9272-96288B79BA53}.Release|Mixed Platforms.Build.0 = Release|x64 {75DEED7F-17D0-4805-9272-96288B79BA53}.Release|Win32.ActiveCfg = Release|Win32 @@ -179,8 +177,8 @@ Global {A29DFCB3-837D-491F-B9C4-3E0C93404128}.Debug|Mixed Platforms.Build.0 = Release|x64 {A29DFCB3-837D-491F-B9C4-3E0C93404128}.Debug|Win32.ActiveCfg = Debug|Win32 {A29DFCB3-837D-491F-B9C4-3E0C93404128}.Debug|Win32.Build.0 = Debug|Win32 - {A29DFCB3-837D-491F-B9C4-3E0C93404128}.Debug|x64.ActiveCfg = Debug|x64 - {A29DFCB3-837D-491F-B9C4-3E0C93404128}.Debug|x64.Build.0 = Debug|x64 + {A29DFCB3-837D-491F-B9C4-3E0C93404128}.Debug|x64.ActiveCfg = Release|x64 + {A29DFCB3-837D-491F-B9C4-3E0C93404128}.Debug|x64.Build.0 = Release|x64 {A29DFCB3-837D-491F-B9C4-3E0C93404128}.Release|Mixed Platforms.ActiveCfg = Release|x64 {A29DFCB3-837D-491F-B9C4-3E0C93404128}.Release|Mixed Platforms.Build.0 = Release|x64 {A29DFCB3-837D-491F-B9C4-3E0C93404128}.Release|Win32.ActiveCfg = Release|Win32 @@ -191,8 +189,8 @@ Global {88971DC8-9416-4229-AAB8-870988D9A81A}.Debug|Mixed Platforms.Build.0 = Release|x64 {88971DC8-9416-4229-AAB8-870988D9A81A}.Debug|Win32.ActiveCfg = Debug|Win32 {88971DC8-9416-4229-AAB8-870988D9A81A}.Debug|Win32.Build.0 = Debug|Win32 - {88971DC8-9416-4229-AAB8-870988D9A81A}.Debug|x64.ActiveCfg = Debug|x64 - {88971DC8-9416-4229-AAB8-870988D9A81A}.Debug|x64.Build.0 = Debug|x64 + {88971DC8-9416-4229-AAB8-870988D9A81A}.Debug|x64.ActiveCfg = Release|x64 + {88971DC8-9416-4229-AAB8-870988D9A81A}.Debug|x64.Build.0 = Release|x64 {88971DC8-9416-4229-AAB8-870988D9A81A}.Release|Mixed Platforms.ActiveCfg = Release|x64 {88971DC8-9416-4229-AAB8-870988D9A81A}.Release|Mixed Platforms.Build.0 = Release|x64 {88971DC8-9416-4229-AAB8-870988D9A81A}.Release|Win32.ActiveCfg = Release|Win32 @@ -203,8 +201,8 @@ Global {6A7972E7-89DD-45F3-BFA5-C50F9B701B7D}.Debug|Mixed Platforms.Build.0 = Release|x64 {6A7972E7-89DD-45F3-BFA5-C50F9B701B7D}.Debug|Win32.ActiveCfg = Debug|Win32 {6A7972E7-89DD-45F3-BFA5-C50F9B701B7D}.Debug|Win32.Build.0 = Debug|Win32 - {6A7972E7-89DD-45F3-BFA5-C50F9B701B7D}.Debug|x64.ActiveCfg = Debug|x64 - {6A7972E7-89DD-45F3-BFA5-C50F9B701B7D}.Debug|x64.Build.0 = Debug|x64 + {6A7972E7-89DD-45F3-BFA5-C50F9B701B7D}.Debug|x64.ActiveCfg = Release|x64 + {6A7972E7-89DD-45F3-BFA5-C50F9B701B7D}.Debug|x64.Build.0 = Release|x64 {6A7972E7-89DD-45F3-BFA5-C50F9B701B7D}.Release|Mixed Platforms.ActiveCfg = Release|x64 {6A7972E7-89DD-45F3-BFA5-C50F9B701B7D}.Release|Mixed Platforms.Build.0 = Release|x64 {6A7972E7-89DD-45F3-BFA5-C50F9B701B7D}.Release|Win32.ActiveCfg = Release|Win32 @@ -215,8 +213,8 @@ Global {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Debug|Mixed Platforms.Build.0 = Release|x64 {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Debug|Win32.ActiveCfg = Debug|Win32 {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Debug|Win32.Build.0 = Debug|Win32 - {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Debug|x64.ActiveCfg = Debug|x64 - {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Debug|x64.Build.0 = Debug|x64 + {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Debug|x64.ActiveCfg = Release|x64 + {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Debug|x64.Build.0 = Release|x64 {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Release|Mixed Platforms.ActiveCfg = Release|x64 {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Release|Mixed Platforms.Build.0 = Release|x64 {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Release|Win32.ActiveCfg = Release|Win32 @@ -225,7 +223,7 @@ Global {11C301E8-35E7-48AE-978F-4AC651CEFC67}.Release|x64.Build.0 = Release|x64 {3A753B88-4374-4456-93D8-D0FDC9DCACF3}.Debug|Mixed Platforms.ActiveCfg = Release|x64 {3A753B88-4374-4456-93D8-D0FDC9DCACF3}.Debug|Win32.ActiveCfg = Debug|Win32 - {3A753B88-4374-4456-93D8-D0FDC9DCACF3}.Debug|x64.ActiveCfg = Debug|x64 + {3A753B88-4374-4456-93D8-D0FDC9DCACF3}.Debug|x64.ActiveCfg = Release|x64 {3A753B88-4374-4456-93D8-D0FDC9DCACF3}.Release|Mixed Platforms.ActiveCfg = Release|x64 {3A753B88-4374-4456-93D8-D0FDC9DCACF3}.Release|Win32.ActiveCfg = Release|Win32 {3A753B88-4374-4456-93D8-D0FDC9DCACF3}.Release|x64.ActiveCfg = Release|x64 @@ -233,8 +231,8 @@ Global {2A290337-FC79-4987-8488-A71F29252DB0}.Debug|Mixed Platforms.Build.0 = Release|x64 {2A290337-FC79-4987-8488-A71F29252DB0}.Debug|Win32.ActiveCfg = Debug|Win32 {2A290337-FC79-4987-8488-A71F29252DB0}.Debug|Win32.Build.0 = Debug|Win32 - {2A290337-FC79-4987-8488-A71F29252DB0}.Debug|x64.ActiveCfg = Debug|x64 - {2A290337-FC79-4987-8488-A71F29252DB0}.Debug|x64.Build.0 = Debug|x64 + {2A290337-FC79-4987-8488-A71F29252DB0}.Debug|x64.ActiveCfg = Release|x64 + {2A290337-FC79-4987-8488-A71F29252DB0}.Debug|x64.Build.0 = Release|x64 {2A290337-FC79-4987-8488-A71F29252DB0}.Release|Mixed Platforms.ActiveCfg = Release|x64 {2A290337-FC79-4987-8488-A71F29252DB0}.Release|Mixed Platforms.Build.0 = Release|x64 {2A290337-FC79-4987-8488-A71F29252DB0}.Release|Win32.ActiveCfg = Release|Win32 @@ -245,8 +243,8 @@ Global {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Debug|Mixed Platforms.Build.0 = Release|x64 {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Debug|Win32.ActiveCfg = Debug|Win32 {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Debug|Win32.Build.0 = Debug|Win32 - {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Debug|x64.ActiveCfg = Debug|x64 - {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Debug|x64.Build.0 = Debug|x64 + {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Debug|x64.ActiveCfg = Release|x64 + {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Debug|x64.Build.0 = Release|x64 {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Release|Mixed Platforms.ActiveCfg = Release|x64 {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Release|Mixed Platforms.Build.0 = Release|x64 {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Release|Win32.ActiveCfg = Release|Win32 @@ -255,7 +253,7 @@ Global {D0AEE4AA-68A7-4598-89E4-3BF5A5EBCA2A}.Release|x64.Build.0 = Release|x64 {767D282E-0BE5-4B35-874A-3B1ED925F06B}.Debug|Mixed Platforms.ActiveCfg = Release|x64 {767D282E-0BE5-4B35-874A-3B1ED925F06B}.Debug|Win32.ActiveCfg = Debug|Win32 - {767D282E-0BE5-4B35-874A-3B1ED925F06B}.Debug|x64.ActiveCfg = Debug|x64 + {767D282E-0BE5-4B35-874A-3B1ED925F06B}.Debug|x64.ActiveCfg = Release|x64 {767D282E-0BE5-4B35-874A-3B1ED925F06B}.Release|Mixed Platforms.ActiveCfg = Release|x64 {767D282E-0BE5-4B35-874A-3B1ED925F06B}.Release|Win32.ActiveCfg = Release|Win32 {767D282E-0BE5-4B35-874A-3B1ED925F06B}.Release|x64.ActiveCfg = Release|x64 @@ -263,8 +261,8 @@ Global {9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Mixed Platforms.Build.0 = Release|x64 {9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Win32.ActiveCfg = Debug|Win32 {9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Win32.Build.0 = Debug|Win32 - {9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|x64.ActiveCfg = Debug|x64 - {9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|x64.Build.0 = Debug|x64 + {9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|x64.ActiveCfg = Release|x64 + {9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|x64.Build.0 = Release|x64 {9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Mixed Platforms.ActiveCfg = Release|x64 {9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Mixed Platforms.Build.0 = Release|x64 {9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Win32.ActiveCfg = Release|Win32 @@ -275,32 +273,20 @@ Global {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Debug|Mixed Platforms.Build.0 = Release|x64 {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Debug|Win32.ActiveCfg = Debug|Win32 {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Debug|Win32.Build.0 = Debug|Win32 - {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Debug|x64.ActiveCfg = Debug|x64 - {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Debug|x64.Build.0 = Debug|x64 + {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Debug|x64.ActiveCfg = Release|x64 + {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Debug|x64.Build.0 = Release|x64 {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Release|Mixed Platforms.ActiveCfg = Release|x64 {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Release|Mixed Platforms.Build.0 = Release|x64 {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Release|Win32.ActiveCfg = Release|Win32 {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Release|Win32.Build.0 = Release|Win32 {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Release|x64.ActiveCfg = Release|x64 {A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Release|x64.Build.0 = Release|x64 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Debug|Mixed Platforms.ActiveCfg = Release|x64 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Debug|Mixed Platforms.Build.0 = Release|x64 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Debug|Win32.ActiveCfg = Debug|Win32 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Debug|Win32.Build.0 = Debug|Win32 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Debug|x64.ActiveCfg = Debug|x64 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Debug|x64.Build.0 = Debug|x64 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Release|Mixed Platforms.ActiveCfg = Release|x64 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Release|Mixed Platforms.Build.0 = Release|x64 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Release|Win32.ActiveCfg = Release|Win32 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Release|Win32.Build.0 = Release|Win32 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Release|x64.ActiveCfg = Release|x64 - {D6A842A4-AC32-4AD0-B6AF-01AF1FBC8661}.Release|x64.Build.0 = Release|x64 {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|Win32.ActiveCfg = Debug|Win32 {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|Win32.Build.0 = Debug|Win32 - {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|x64.ActiveCfg = Debug|x64 - {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|x64.Build.0 = Debug|x64 + {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|x64.ActiveCfg = Release|x64 + {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|x64.Build.0 = Release|x64 {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Release|Mixed Platforms.Build.0 = Release|Win32 {270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Release|Win32.ActiveCfg = Release|Win32 @@ -311,12 +297,14 @@ Global {F250DB70-6E3E-408C-BD9E-1483D574499D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {F250DB70-6E3E-408C-BD9E-1483D574499D}.Debug|Win32.ActiveCfg = Debug|Win32 {F250DB70-6E3E-408C-BD9E-1483D574499D}.Debug|Win32.Build.0 = Debug|Win32 - {F250DB70-6E3E-408C-BD9E-1483D574499D}.Debug|x64.ActiveCfg = Debug|x64 + {F250DB70-6E3E-408C-BD9E-1483D574499D}.Debug|x64.ActiveCfg = Release|x64 + {F250DB70-6E3E-408C-BD9E-1483D574499D}.Debug|x64.Build.0 = Release|x64 {F250DB70-6E3E-408C-BD9E-1483D574499D}.Release|Mixed Platforms.ActiveCfg = Release|Win32 {F250DB70-6E3E-408C-BD9E-1483D574499D}.Release|Mixed Platforms.Build.0 = Release|Win32 {F250DB70-6E3E-408C-BD9E-1483D574499D}.Release|Win32.ActiveCfg = Release|Win32 {F250DB70-6E3E-408C-BD9E-1483D574499D}.Release|Win32.Build.0 = Release|Win32 {F250DB70-6E3E-408C-BD9E-1483D574499D}.Release|x64.ActiveCfg = Release|x64 + {F250DB70-6E3E-408C-BD9E-1483D574499D}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj b/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj index 0e5433566f1ff70ad13d0aafd805105baddf743c..72936ceb095449c7c1a35226aebed6c5157a4a38 100644 --- a/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj +++ b/Builds/VisualStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj @@ -74,7 +74,7 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -95,7 +95,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -109,7 +109,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/Builds/VisualStudio2013/Plugins/RecordControl/RecordControl.vcxproj b/Builds/VisualStudio2013/Plugins/RecordControl/RecordControl.vcxproj index 52b6b4251f154a764a150294c971e8826b860369..20ee0e8df9acdacda7ed4727fdcb8d1217bd3394 100644 --- a/Builds/VisualStudio2013/Plugins/RecordControl/RecordControl.vcxproj +++ b/Builds/VisualStudio2013/Plugins/RecordControl/RecordControl.vcxproj @@ -74,7 +74,7 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -95,7 +95,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -109,7 +109,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/Builds/VisualStudio2013/Plugins/Rectifier/Rectifier.vcxproj b/Builds/VisualStudio2013/Plugins/Rectifier/Rectifier.vcxproj index 62ab80991460930f4b301cb1247c171719e4fa74..52407b0bc1243d425d53aa54eb3f79632eba1628 100644 --- a/Builds/VisualStudio2013/Plugins/Rectifier/Rectifier.vcxproj +++ b/Builds/VisualStudio2013/Plugins/Rectifier/Rectifier.vcxproj @@ -74,7 +74,7 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -95,7 +95,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -109,7 +109,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/Builds/VisualStudio2013/Plugins/SerialInput/SerialInput.vcxproj b/Builds/VisualStudio2013/Plugins/SerialInput/SerialInput.vcxproj index 9fcd277b7b269098b16cb8bbfe67efaad654eb67..b7bd2cc098f44920fcbf03493813e04f1396f174 100644 --- a/Builds/VisualStudio2013/Plugins/SerialInput/SerialInput.vcxproj +++ b/Builds/VisualStudio2013/Plugins/SerialInput/SerialInput.vcxproj @@ -74,7 +74,7 @@ <ClCompile> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -95,7 +95,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -109,7 +109,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/Builds/VisualStudio2013/Plugins/SpikeSorter/SpikeSorter.vcxproj b/Builds/VisualStudio2013/Plugins/SpikeSorter/SpikeSorter.vcxproj index 693fe9028cfda94bc2ad2de74d098ab7a2c6c2d7..c6ec5249514f063577a441b2952cbb812de23d81 100644 --- a/Builds/VisualStudio2013/Plugins/SpikeSorter/SpikeSorter.vcxproj +++ b/Builds/VisualStudio2013/Plugins/SpikeSorter/SpikeSorter.vcxproj @@ -95,7 +95,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -109,7 +109,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> + <SDLCheck>false</SDLCheck> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/Builds/VisualStudio2013/open-ephys.vcxproj b/Builds/VisualStudio2013/open-ephys.vcxproj index 28b9e28dcbd726afc970f1f7173dd5ddcb9bfda6..573629d6bb6d8573667f5b977ce889d2486b7281 100644 --- a/Builds/VisualStudio2013/open-ephys.vcxproj +++ b/Builds/VisualStudio2013/open-ephys.vcxproj @@ -84,7 +84,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - <AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.2;JUCE_APP_VERSION_HEX=0x402;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> @@ -130,7 +130,7 @@ </Midl> <ClCompile> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.2;JUCE_APP_VERSION_HEX=0x402;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> @@ -178,7 +178,7 @@ <ClCompile> <Optimization>Disabled</Optimization> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.2;JUCE_APP_VERSION_HEX=0x402;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> @@ -222,7 +222,7 @@ </Midl> <ClCompile> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>~\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>c:\SDKs\VST3 SDK;..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;JuceLibraryCode/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.4.2;JUCE_APP_VERSION_HEX=0x402;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeTypeInfo>true</RuntimeTypeInfo> diff --git a/Projucer/Builds/LinuxMakefile/Makefile b/Projucer/Builds/LinuxMakefile/Makefile index f6368828ac1fed29c4f46eade60fd3eb665a6fb9..f94c27832ed819ec3ad6299d061cf5211c828637 100644 --- a/Projucer/Builds/LinuxMakefile/Makefile +++ b/Projucer/Builds/LinuxMakefile/Makefile @@ -18,7 +18,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../JuceLibraryCode/modules + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_6D53C8B4=1" -D "JUCE_APP_VERSION=4.2.1" -D "JUCE_APP_VERSION_HEX=0x40201" -D "JUCE_DISABLE_NATIVE_FILECHOOSERS=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../JuceLibraryCode/modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 CXXFLAGS += $(CFLAGS) -std=c++11 LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt -lcurl diff --git a/open-ephys.jucer b/open-ephys.jucer index 3c996776dbf473a246555534a308e89edb04460b..231a3cc5c90f8d1b288aafc42b8bcd70940bd0a6 100644 --- a/open-ephys.jucer +++ b/open-ephys.jucer @@ -11,7 +11,7 @@ companyName="Open Ephys" userNotes="The Open Ephys GUI was designed to provide a fast and flexible interface for acquiring, processing, and visualizing data from extracellular electrodes. See open-ephys.org for more information." includeBinaryInAppConfig="1"> <EXPORTFORMATS> - <LINUX_MAKE targetFolder="Builds/Linux" vstFolder="" extraLinkerFlags="-ldl -lXext -lGLU -rdynamic -fPIC" + <LINUX_MAKE targetFolder="Builds/Linux" vstFolder="" extraLinkerFlags="-ldl -lXext -lGLU -rdynamic -fPIC -Wl,-rpath,'$$ORIGIN'" extraCompilerFlags="-rdynamic -fvisibility=hidden" extraDefs="" smallIcon="nFMauU" bigIcon="nFMauU" cppLanguageStandard="-std=c++11"> <CONFIGURATIONS>