Skip to content

Commit 96f503d

Browse files
aacuevasaacuevas
committed
Fix Linux compiler flags
1 parent a12ecd0 commit 96f503d

9 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎Builds/Linux/Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ 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.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
22-
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -rdynamic -g -pg -std=c++0x -fvisibility=hidden
21+
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.6" -D "JUCE_APP_VERSION_HEX=0x306" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
22+
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -rdynamic -std=c++0x -fvisibility=hidden
2323
CXXFLAGS += $(CFLAGS)
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 -pg -ldl -lXext -lGLU -rdynamic -fPIC -fvisibility=hidden
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 -fvisibility=hidden
2525
LDDEPS :=
26-
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
26+
RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.6" -D "JUCE_APP_VERSION_HEX=0x306" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
2727
TARGET := open-ephys
2828
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
2929
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
@@ -39,12 +39,12 @@ ifeq ($(CONFIG),Release)
3939
TARGET_ARCH := -march=native
4040
endif
4141

42-
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
43-
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -rdynamic -g -pg -std=c++0x -fvisibility=hidden
42+
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.6" -D "JUCE_APP_VERSION_HEX=0x306" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
43+
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -rdynamic -std=c++0x -fvisibility=hidden
4444
CXXFLAGS += $(CFLAGS)
45-
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 -rdynamic -fPIC -fvisibility=hidden
45+
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 -fvisibility=hidden
4646
LDDEPS :=
47-
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
47+
RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.6" -D "JUCE_APP_VERSION_HEX=0x306" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
4848
TARGET := open-ephys-release
4949
BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
5050
CLEANCMD = rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)

‎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
endif
2222

2323
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "OEPLUGIN" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../Source/Plugins/Headers
24-
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -g -pg -std=c++0x -fPIC -rdynamic
24+
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -std=c++0x -fPIC -rdynamic
2525
CXXFLAGS += $(CFLAGS)
2626
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
2727
LDDEPS :=
@@ -40,7 +40,7 @@ ifeq ($(CONFIG),Release)
4040
endif
4141

4242
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "OEPLUGIN" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.3.5" -D "JUCE_APP_VERSION_HEX=0x305" -I /usr/include -I /usr/include/freetype2 -I $(CURDIR)/../../Source/Plugins/Headers
43-
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -g -pg -std=c++0x -fPIC -rdynamic
43+
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++0x -fPIC -rdynamic
4444
CXXFLAGS += $(CFLAGS)
4545
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
4646
LDDEPS1 :=

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,6 +1130,7 @@
11301130
DCA17BBB4FC31AAE9DC34DE9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileFilter.cpp"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_FileFilter.cpp"; sourceTree = "SOURCE_ROOT"; };
11311131
DCF6696CA1463CD8557E1FFE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
11321132
DD5695DE97CEF7BE76869232 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileOutputStream.cpp"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_FileOutputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
1133+
DDD708C7DBA729D2550B40BF = {isa = PBXFileReference; lastKnownFileType = "file.h~"; name = "juce_StandardHeader.h~"; path = "../../JuceLibraryCode/modules/juce_core/system/juce_StandardHeader.h~"; sourceTree = "SOURCE_ROOT"; };
11331134
DDE157BB06373ECDBB23469C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableLayoutManager.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.h"; sourceTree = "SOURCE_ROOT"; };
11341135
DDE89F0D5E01F079323CC89C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioProcessorPlayer.h"; path = "../../JuceLibraryCode/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h"; sourceTree = "SOURCE_ROOT"; };
11351136
DE4861552DB1976665B25DFD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HighResolutionTimer.cpp"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1936,6 +1937,7 @@
19361937
9D740F320C13F9B82EB64461 = {isa = PBXGroup; children = (
19371938
7F17077973FFDD70C4B78E7E,
19381939
A5E8E0CF6DA1AEAEE9D872DE,
1940+
DDD708C7DBA729D2550B40BF,
19391941
9978BC2A359BC506F69E545F,
19401942
DB4F34DA0F04B40EB6A50FB1,
19411943
C446923C1950EB5BE5E67F15, ); name = system; sourceTree = "<group>"; };
@@ -2682,8 +2684,8 @@
26822684
"_DEBUG=1",
26832685
"DEBUG=1",
26842686
"JUCER_XCODE_MAC_F6D2F4CF=1",
2685-
"JUCE_APP_VERSION=0.3.5",
2686-
"JUCE_APP_VERSION_HEX=0x305", );
2687+
"JUCE_APP_VERSION=0.3.6",
2688+
"JUCE_APP_VERSION_HEX=0x306", );
26872689
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
26882690
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "/opt/local/include", "/usr/local/include", "$(inherited)");
26892691
INFOPLIST_FILE = Info.plist;
@@ -2705,8 +2707,8 @@
27052707
"_NDEBUG=1",
27062708
"NDEBUG=1",
27072709
"JUCER_XCODE_MAC_F6D2F4CF=1",
2708-
"JUCE_APP_VERSION=0.3.5",
2709-
"JUCE_APP_VERSION_HEX=0x305", );
2710+
"JUCE_APP_VERSION=0.3.6",
2711+
"JUCE_APP_VERSION_HEX=0x306", );
27102712
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
27112713
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
27122714
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "/opt/local/include", "/usr/local/include", "$(inherited)");

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 5 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>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88-
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;%(PreprocessorDefinitions)</PreprocessorDefinitions>
88+
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.3.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8989
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
9090
<RuntimeTypeInfo>true</RuntimeTypeInfo>
9191
<PrecompiledHeader/>
@@ -130,7 +130,7 @@
130130
<ClCompile>
131131
<Optimization>Full</Optimization>
132132
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
133-
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.3.6;JUCE_APP_VERSION_HEX=0x306;%(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>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
180-
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180+
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.3.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
181181
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
182182
<RuntimeTypeInfo>true</RuntimeTypeInfo>
183183
<PrecompiledHeader/>
@@ -220,7 +220,7 @@
220220
<ClCompile>
221221
<Optimization>Full</Optimization>
222222
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
223-
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;%(PreprocessorDefinitions)</PreprocessorDefinitions>
223+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.3.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
224224
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
225225
<RuntimeTypeInfo>true</RuntimeTypeInfo>
226226
<PrecompiledHeader/>
@@ -2066,6 +2066,7 @@
20662066
<None Include="..\..\JuceLibraryCode\modules\juce_audio_formats\juce_module_info"/>
20672067
<None Include="..\..\JuceLibraryCode\modules\juce_audio_processors\juce_module_info"/>
20682068
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info"/>
2069+
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~"/>
20692070
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info"/>
20702071
<None Include="..\..\JuceLibraryCode\modules\juce_cryptography\juce_module_info"/>
20712072
<None Include="..\..\JuceLibraryCode\modules\juce_data_structures\juce_module_info"/>

‎Builds/VisualStudio2012/open-ephys.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3683,6 +3683,9 @@
36833683
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info">
36843684
<Filter>Juce Modules\juce_audio_utils</Filter>
36853685
</None>
3686+
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~">
3687+
<Filter>Juce Modules\juce_core\system</Filter>
3688+
</None>
36863689
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info">
36873690
<Filter>Juce Modules\juce_core</Filter>
36883691
</None>

‎Builds/VisualStudio2013/open-ephys.sln‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 11.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
4-
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
3+
Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
64
EndProject
75
Global
86
GlobalSection(SolutionConfigurationPlatforms) = preSolution
97
Debug|Win32 = Debug|Win32
10-
Debug|x64 = Debug|x64
11-
Debug64|Win32 = Debug64|Win32
12-
Debug64|x64 = Debug64|x64
138
Release|Win32 = Release|Win32
14-
Release|x64 = Release|x64
15-
Release64|Win32 = Release64|Win32
9+
Debug64|x64 = Debug64|x64
1610
Release64|x64 = Release64|x64
1711
EndGlobalSection
1812
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1913
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
2014
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
21-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|x64.ActiveCfg = Debug|Win32
22-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|Win32.ActiveCfg = Debug64|x64
23-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
24-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
2515
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
2616
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
27-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|x64.ActiveCfg = Release|Win32
28-
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|Win32.ActiveCfg = Release64|x64
17+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.ActiveCfg = Debug64|x64
18+
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug64|x64.Build.0 = Debug64|x64
2919
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.ActiveCfg = Release64|x64
3020
{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release64|x64.Build.0 = Release64|x64
3121
EndGlobalSection

‎Builds/VisualStudio2013/open-ephys.vcxproj‎

Lines changed: 5 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>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
88-
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;%(PreprocessorDefinitions)</PreprocessorDefinitions>
88+
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8989
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
9090
<RuntimeTypeInfo>true</RuntimeTypeInfo>
9191
<PrecompiledHeader/>
@@ -131,7 +131,7 @@
131131
<ClCompile>
132132
<Optimization>Full</Optimization>
133133
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134-
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;%(PreprocessorDefinitions)</PreprocessorDefinitions>
134+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135135
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
136136
<RuntimeTypeInfo>true</RuntimeTypeInfo>
137137
<PrecompiledHeader/>
@@ -179,7 +179,7 @@
179179
<Optimization>Disabled</Optimization>
180180
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
181181
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
182-
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;%(PreprocessorDefinitions)</PreprocessorDefinitions>
182+
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
183183
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
184184
<RuntimeTypeInfo>true</RuntimeTypeInfo>
185185
<PrecompiledHeader/>
@@ -223,7 +223,7 @@
223223
<ClCompile>
224224
<Optimization>Full</Optimization>
225225
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
226-
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.5;JUCE_APP_VERSION_HEX=0x305;%(PreprocessorDefinitions)</PreprocessorDefinitions>
226+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCE_API=__declspec(dllexport);JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=0.3.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
227227
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
228228
<RuntimeTypeInfo>true</RuntimeTypeInfo>
229229
<PrecompiledHeader/>
@@ -2070,6 +2070,7 @@
20702070
<None Include="..\..\JuceLibraryCode\modules\juce_audio_formats\juce_module_info"/>
20712071
<None Include="..\..\JuceLibraryCode\modules\juce_audio_processors\juce_module_info"/>
20722072
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info"/>
2073+
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~"/>
20732074
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info"/>
20742075
<None Include="..\..\JuceLibraryCode\modules\juce_cryptography\juce_module_info"/>
20752076
<None Include="..\..\JuceLibraryCode\modules\juce_data_structures\juce_module_info"/>

‎Builds/VisualStudio2013/open-ephys.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3683,6 +3683,9 @@
36833683
<None Include="..\..\JuceLibraryCode\modules\juce_audio_utils\juce_module_info">
36843684
<Filter>Juce Modules\juce_audio_utils</Filter>
36853685
</None>
3686+
<None Include="..\..\JuceLibraryCode\modules\juce_core\system\juce_StandardHeader.h~">
3687+
<Filter>Juce Modules\juce_core\system</Filter>
3688+
</None>
36863689
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info">
36873690
<Filter>Juce Modules\juce_core</Filter>
36883691
</None>

‎open-ephys.jucer‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<JUCERPROJECT id="ynSYIrr" name="open-ephys" projectType="guiapp" version="0.3.5"
3+
<JUCERPROJECT id="ynSYIrr" name="open-ephys" projectType="guiapp" version="0.3.6"
44
juceLinkage="amalg_multi" buildVST="1" buildRTAS="0" buildAU="1"
55
pluginName="Juce Project" pluginDesc="Juce Project" pluginManufacturer="yourcompany"
66
pluginManufacturerCode="Manu" pluginCode="Plug" pluginChannelConfigs="{1, 1}, {2, 2}"
@@ -42,8 +42,8 @@
4242
<MODULEPATH id="juce_audio_basics" path="JuceLibraryCode/modules"/>
4343
</MODULEPATHS>
4444
</XCODE_MAC>
45-
<LINUX_MAKE targetFolder="Builds/Linux" vstFolder="~/SDKs/vstsdk2.4" extraLinkerFlags="-pg -ldl -lXext -lGLU -rdynamic -fPIC -fvisibility=hidden"
46-
extraCompilerFlags="-rdynamic -g -pg -std=c++0x -fvisibility=hidden"
45+
<LINUX_MAKE targetFolder="Builds/Linux" vstFolder="~/SDKs/vstsdk2.4" extraLinkerFlags="-ldl -lXext -lGLU -rdynamic -fPIC -fvisibility=hidden"
46+
extraCompilerFlags="-rdynamic -std=c++0x -fvisibility=hidden"
4747
extraDefs="">
4848
<CONFIGURATIONS>
4949
<CONFIGURATION name="Debug" isDebug="1" optimisation="3" targetName="open-ephys"

0 commit comments

Comments
 (0)