Merge branch 'release/v0.2.3'

TheSlowGrowth · Jul 5, 2016 · 0cc0e2a · 0cc0e2a
2 parents fb846c5 + 45f85e4
commit 0cc0e2a
Show file tree

Hide file tree

Showing 25 changed files with 1,014 additions and 854 deletions.
diff --git a/Builds/Linux/Makefile b/Builds/Linux/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 "JUCE_JACK=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION" -D "JUCE_APP_VERSION_HEX=0x0" -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_7346DA2A=1" -D "JUCE_APP_VERSION" -D "JUCE_APP_VERSION_HEX=0x0" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0
   CXXFLAGS += $(CFLAGS) -std=c++11
   LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt 
@@ -38,7 +38,7 @@ ifeq ($(CONFIG),Release)
     TARGET_ARCH := -march=native
   endif
 
-  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_JACK=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION" -D "JUCE_APP_VERSION_HEX=0x0" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
+  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "JUCE_APP_VERSION" -D "JUCE_APP_VERSION_HEX=0x0" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../JuceLibraryCode/modules
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os
   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 

diff --git a/Builds/MacOSX/RecentFilesMenuTemplate.nib b/Builds/MacOSX/RecentFilesMenuTemplate.nib
diff --git a/Builds/MacOSX/VCO Tuner.xcodeproj/project.pbxproj b/Builds/MacOSX/VCO Tuner.xcodeproj/project.pbxproj
@@ -806,6 +806,7 @@
 		A19A4CBA0BB3962D33A1D123 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableObjectResizer.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/layout/juce_StretchableObjectResizer.h"; sourceTree = "SOURCE_ROOT"; };
 		A19EDB9FA65ADE4ED03844CB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Midi.cpp"; path = "../../JuceLibraryCode/modules/juce_audio_devices/native/juce_linux_Midi.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A1B0DF8C1622646AB28AC477 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_EdgeTable.h"; path = "../../JuceLibraryCode/modules/juce_graphics/geometry/juce_EdgeTable.h"; sourceTree = "SOURCE_ROOT"; };
+		A1B63EA752A1DFBE9A5325A6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VersionInfo.h; path = ../../Source/VersionInfo.h; sourceTree = "SOURCE_ROOT"; };
 		A1C2B7C4964449783DA4CCB3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Windowing.cpp"; path = "../../JuceLibraryCode/modules/juce_gui_basics/native/juce_android_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A1ED49A640210FD42C9779BC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HyperlinkButton.h"; path = "../../JuceLibraryCode/modules/juce_gui_basics/buttons/juce_HyperlinkButton.h"; sourceTree = "SOURCE_ROOT"; };
 		A1F35BECAA1B17CF60AA86A0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TemporaryFile.cpp"; path = "../../JuceLibraryCode/modules/juce_core/files/juce_TemporaryFile.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1278,6 +1279,7 @@
 					C0B943B37166EE6AE884BD09,
 					FE7CCC33D0FC6AD442627D02,
 					3DC41604B6251DCAD59980B2,
+					A1B63EA752A1DFBE9A5325A6,
 					1694EC1B42AC2CCF819373C9,
 					C28B07E955022A0CCDA7B4AC, ); name = "VCO Tuner"; sourceTree = "<group>"; };
 		EBC9CD52F42C330D1A15D3A4 = {isa = PBXGroup; children = (

diff --git a/Builds/VisualStudio2010/VCO Tuner.vcxproj b/Builds/VisualStudio2010/VCO Tuner.vcxproj
@@ -1711,6 +1711,7 @@
     <ClInclude Include="..\..\Source\ReportPrepScreen.h"/>
     <ClInclude Include="..\..\Source\ReportProperties.h"/>
     <ClInclude Include="..\..\Source\VCOTuner.h"/>
+    <ClInclude Include="..\..\Source\VersionInfo.h"/>
     <ClInclude Include="..\..\Source\Visualizer.h"/>
     <ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_basics\buffers\juce_AudioDataConverters.h"/>
     <ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_basics\buffers\juce_AudioSampleBuffer.h"/>

diff --git a/Builds/VisualStudio2010/VCO Tuner.vcxproj.filters b/Builds/VisualStudio2010/VCO Tuner.vcxproj.filters
@@ -2139,6 +2139,9 @@
     <ClInclude Include="..\..\Source\VCOTuner.h">
       <Filter>VCO Tuner</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\VersionInfo.h">
+      <Filter>VCO Tuner</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\Visualizer.h">
       <Filter>VCO Tuner</Filter>
     </ClInclude>