Skip to content

Commit 507e07e

Browse files
aacuevasaacuevas
committed
Update version number to 0.4.0
1 parent 4fcf755 commit 507e07e

File tree

13 files changed

+839
-771
lines changed

13 files changed

+839
-771
lines changed

‎Builds/Linux/Makefile‎

Lines changed: 4 additions & 4 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.6" -D "JUCE_APP_VERSION_HEX=0x306" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
21+
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.0" -D "JUCE_APP_VERSION_HEX=0x400" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
2222
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O3 -rdynamic -std=c++0x -fvisibility=hidden
2323
CXXFLAGS += $(CFLAGS)
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 -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.6" -D "JUCE_APP_VERSION_HEX=0x306" -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.4.0" -D "JUCE_APP_VERSION_HEX=0x400" -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.6" -D "JUCE_APP_VERSION_HEX=0x306" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
42+
CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION=0.4.0" -D "JUCE_APP_VERSION_HEX=0x400" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
4343
CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 -rdynamic -std=c++0x -fvisibility=hidden
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 -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.6" -D "JUCE_APP_VERSION_HEX=0x306" -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.4.0" -D "JUCE_APP_VERSION_HEX=0x400" -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/MacOSX/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
<key>CFBundleSignature</key>
1717
<string>????</string>
1818
<key>CFBundleShortVersionString</key>
19-
<string>0.3.6</string>
19+
<string>0.4.0</string>
2020
<key>CFBundleVersion</key>
21-
<string>0.3.6</string>
21+
<string>0.4.0</string>
2222
<key>NSHumanReadableCopyright</key>
2323
<string>Open Ephys</string>
2424
<key>NSHighResolutionCapable</key>

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,6 @@
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"; };
11341133
DDE157BB06373ECDBB23469C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableLayoutManager.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_StretchableLayoutManager.h"; sourceTree = "SOURCE_ROOT"; };
11351134
DDE89F0D5E01F079323CC89C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioProcessorPlayer.h"; path = "../../JuceLibraryCode/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h"; sourceTree = "SOURCE_ROOT"; };
11361135
DE4861552DB1976665B25DFD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HighResolutionTimer.cpp"; path = "../../JuceLibraryCode/modules/juce_core/threads/juce_HighResolutionTimer.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1937,7 +1936,6 @@
19371936
9D740F320C13F9B82EB64461 = {isa = PBXGroup; children = (
19381937
7F17077973FFDD70C4B78E7E,
19391938
A5E8E0CF6DA1AEAEE9D872DE,
1940-
DDD708C7DBA729D2550B40BF,
19411939
9978BC2A359BC506F69E545F,
19421940
DB4F34DA0F04B40EB6A50FB1,
19431941
C446923C1950EB5BE5E67F15, ); name = system; sourceTree = "<group>"; };
@@ -2684,8 +2682,8 @@
26842682
"_DEBUG=1",
26852683
"DEBUG=1",
26862684
"JUCER_XCODE_MAC_F6D2F4CF=1",
2687-
"JUCE_APP_VERSION=0.3.6",
2688-
"JUCE_APP_VERSION_HEX=0x306", );
2685+
"JUCE_APP_VERSION=0.4.0",
2686+
"JUCE_APP_VERSION_HEX=0x400", );
26892687
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
26902688
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "/opt/local/include", "/usr/local/include", "$(inherited)");
26912689
INFOPLIST_FILE = Info.plist;
@@ -2707,8 +2705,8 @@
27072705
"_NDEBUG=1",
27082706
"NDEBUG=1",
27092707
"JUCER_XCODE_MAC_F6D2F4CF=1",
2710-
"JUCE_APP_VERSION=0.3.6",
2711-
"JUCE_APP_VERSION_HEX=0x306", );
2708+
"JUCE_APP_VERSION=0.4.0",
2709+
"JUCE_APP_VERSION_HEX=0x400", );
27122710
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
27132711
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
27142712
HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../JuceLibraryCode/modules", "/opt/local/include", "/usr/local/include", "$(inherited)");

‎Builds/VisualStudio2012/open-ephys.vcxproj‎

Lines changed: 4 additions & 5 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.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
88+
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.0;JUCE_APP_VERSION_HEX=0x400;%(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.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
133+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.0;JUCE_APP_VERSION_HEX=0x400;%(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.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180+
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.0;JUCE_APP_VERSION_HEX=0x400;%(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.6;JUCE_APP_VERSION_HEX=0x306;%(PreprocessorDefinitions)</PreprocessorDefinitions>
223+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;JUCE_APP_VERSION=0.4.0;JUCE_APP_VERSION_HEX=0x400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
224224
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
225225
<RuntimeTypeInfo>true</RuntimeTypeInfo>
226226
<PrecompiledHeader/>
@@ -2066,7 +2066,6 @@
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~"/>
20702069
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info"/>
20712070
<None Include="..\..\JuceLibraryCode\modules\juce_cryptography\juce_module_info"/>
20722071
<None Include="..\..\JuceLibraryCode\modules\juce_data_structures\juce_module_info"/>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3683,9 +3683,6 @@
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>
36893686
<None Include="..\..\JuceLibraryCode\modules\juce_core\juce_module_info">
36903687
<Filter>Juce Modules\juce_core</Filter>
36913688
</None>

‎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,3,6,0
10+
FILEVERSION 0,4,0,0
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.3.6\0"
18+
VALUE "FileVersion", "0.4.0\0"
1919
VALUE "ProductName", "open-ephys\0"
20-
VALUE "ProductVersion", "0.3.6\0"
20+
VALUE "ProductVersion", "0.4.0\0"
2121
END
2222
END
2323

‎Builds/VisualStudio2013/open-ephys.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.31101.0
3+
VisualStudioVersion = 12.0.40629.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
66
EndProject

0 commit comments

Comments
 (0)