From 03b0df1205e00fcf4501be5e144696bf79142b8e Mon Sep 17 00:00:00 2001 From: hogliux Date: Thu, 26 Jan 2017 10:47:48 +0000 Subject: [PATCH] Re-saved all projects --- examples/AUv3Synth/AUv3Synth.jucer | 2 +- .../AnimationAppExample.jucer | 2 +- .../AudioAppExample/AudioAppExample.jucer | 2 +- .../BLOCKS/BlocksDrawing/BlocksDrawing.jucer | 2 +- .../BLOCKS/BlocksMonitor/BlocksMonitor.jucer | 2 +- examples/BLOCKS/BlocksSynth/BlocksSynth.jucer | 2 +- .../BouncingBallWavetableDemo.jucer | 2 +- .../ComponentTutorialExample.jucer | 2 +- examples/Demo/Builds/Android/local.properties | 4 +- examples/Demo/JuceDemo.jucer | 2 +- examples/HelloWorld/HelloWorld.jucer | 2 +- examples/MPETest/MPETest.jucer | 2 +- examples/MidiTest/MidiTest.jucer | 2 +- .../NetworkGraphicsDemo.jucer | 2 +- examples/OSCMonitor/OSCMonitor.jucer | 2 +- examples/OSCReceiver/OSCReceiver.jucer | 2 +- examples/OSCSender/OSCSender.jucer | 2 +- .../OpenGLAppExample/OpenGLAppExample.jucer | 2 +- .../PluckedStringsDemo.jucer | 2 +- .../Arpeggiator/Arpeggiator.jucer | 2 +- .../PlugInSamples/GainPlugIn/GainPlugIn.jucer | 2 +- .../MultiOutSynth/MultiOutSynth.jucer | 2 +- .../PlugInSamples/NoiseGate/NoiseGate.jucer | 2 +- .../PlugInSamples/Surround/Surround.jucer | 2 +- .../SimpleFFTExample/SimpleFFTExample.jucer | 2 +- .../audio plugin demo/JuceDemoPlugin.jucer | 2 +- examples/audio plugin host/Plugin Host.jucer | 2 +- .../AudioPerformanceTest.jucer | 2 +- extras/Projucer/Builds/LinuxMakefile/Makefile | 4 +- extras/Projucer/Builds/MacOSX/Info-App.plist | 4 +- .../MacOSX/Projucer.xcodeproj/project.pbxproj | 8 +-- .../Builds/VisualStudio2013/Projucer.vcxproj | 4 +- .../Builds/VisualStudio2013/resources.rc | 6 +- .../Builds/VisualStudio2015/Projucer.vcxproj | 4 +- .../Builds/VisualStudio2015/resources.rc | 6 +- extras/Projucer/JuceLibraryCode/JuceHeader.h | 4 +- .../Builds/LinuxMakefile/Makefile | 57 +++++++++++-------- extras/UnitTestRunner/UnitTestRunner.jucer | 2 +- extras/binarybuilder/BinaryBuilder.jucer | 2 +- extras/windows dll/jucedll.jucer | 2 +- 40 files changed, 84 insertions(+), 77 deletions(-) diff --git a/examples/AUv3Synth/AUv3Synth.jucer b/examples/AUv3Synth/AUv3Synth.jucer index 897ce54fa9..6a50388932 100644 --- a/examples/AUv3Synth/AUv3Synth.jucer +++ b/examples/AUv3Synth/AUv3Synth.jucer @@ -8,7 +8,7 @@ pluginCode="AUv3" pluginChannelConfigs="" pluginIsSynth="1" pluginWantsMidiIn="1" pluginProducesMidiOut="0" pluginIsMidiEffectPlugin="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="AUv3SynthAU" pluginRTASCategory="" aaxIdentifier="com.roli.development.AUv3Synth" - pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="4.3.0" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="4.3.1" buildStandalone="1"> diff --git a/examples/AnimationAppExample/AnimationAppExample.jucer b/examples/AnimationAppExample/AnimationAppExample.jucer index 057acc6046..a6d7a4f34d 100644 --- a/examples/AnimationAppExample/AnimationAppExample.jucer +++ b/examples/AnimationAppExample/AnimationAppExample.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.1"> + jucerVersion="4.3.1"> + jucerVersion="4.3.1"> + jucerVersion="4.3.1"> diff --git a/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer b/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer index b88368fe9e..abf0ba9ad8 100644 --- a/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer +++ b/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.1"> diff --git a/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer b/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer index 434d69c7bf..8d288c5613 100644 --- a/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer +++ b/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer @@ -2,7 +2,7 @@ + includeBinaryInAppConfig="1" jucerVersion="4.3.1"> + includeBinaryInAppConfig="1" jucerVersion="4.3.1"> + jucerVersion="4.3.1"> diff --git a/examples/MidiTest/MidiTest.jucer b/examples/MidiTest/MidiTest.jucer index e76adfe51a..fd0ad705e5 100644 --- a/examples/MidiTest/MidiTest.jucer +++ b/examples/MidiTest/MidiTest.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.1"> diff --git a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer index a96d9a12a9..63be54ab68 100644 --- a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer +++ b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer @@ -2,7 +2,7 @@ + includeBinaryInAppConfig="1" jucerVersion="4.3.1"> diff --git a/examples/OSCMonitor/OSCMonitor.jucer b/examples/OSCMonitor/OSCMonitor.jucer index 81b6e03377..0f987e1aa7 100644 --- a/examples/OSCMonitor/OSCMonitor.jucer +++ b/examples/OSCMonitor/OSCMonitor.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.1"> diff --git a/examples/OSCReceiver/OSCReceiver.jucer b/examples/OSCReceiver/OSCReceiver.jucer index 43896a7a29..410de97740 100644 --- a/examples/OSCReceiver/OSCReceiver.jucer +++ b/examples/OSCReceiver/OSCReceiver.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.1"> diff --git a/examples/OSCSender/OSCSender.jucer b/examples/OSCSender/OSCSender.jucer index 5c4e5c71ad..7544de5f05 100644 --- a/examples/OSCSender/OSCSender.jucer +++ b/examples/OSCSender/OSCSender.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.1"> diff --git a/examples/OpenGLAppExample/OpenGLAppExample.jucer b/examples/OpenGLAppExample/OpenGLAppExample.jucer index eba4db5f2c..0fc2b36f4f 100644 --- a/examples/OpenGLAppExample/OpenGLAppExample.jucer +++ b/examples/OpenGLAppExample/OpenGLAppExample.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.1"> diff --git a/examples/PluckedStringsDemo/PluckedStringsDemo.jucer b/examples/PluckedStringsDemo/PluckedStringsDemo.jucer index e056483e8b..bc01bd8840 100644 --- a/examples/PluckedStringsDemo/PluckedStringsDemo.jucer +++ b/examples/PluckedStringsDemo/PluckedStringsDemo.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.1"> diff --git a/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer b/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer index ca4affdbbe..df060c5a1a 100644 --- a/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer +++ b/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer @@ -8,7 +8,7 @@ pluginIsSynth="0" pluginWantsMidiIn="0" pluginProducesMidiOut="0" pluginSilenceInIsSilenceOut="1" pluginEditorRequiresKeys="0" pluginAUExportPrefix="GainPlugInAU" pluginRTASCategory="" aaxIdentifier="com.ROLI.GainPlugIn" - pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="4.3.0" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="4.3.1" pluginIsMidiEffectPlugin="0" buildAUv3="0"> diff --git a/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer b/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer index 48258dfb6c..6ce08873b8 100644 --- a/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer +++ b/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer @@ -9,7 +9,7 @@ pluginSilenceInIsSilenceOut="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="MultiOutSynthAU" pluginRTASCategory="" aaxIdentifier="com.ROLI.MultiOutSynth" pluginAAXCategory="AAX_ePlugInCategory_SWGenerators" - jucerVersion="4.3.0" companyName="ROLI Ltd." companyWebsite="www.roli.com" + jucerVersion="4.3.1" companyName="ROLI Ltd." companyWebsite="www.roli.com" companyEmail="info@juce.com" pluginIsMidiEffectPlugin="0" buildAUv3="0"> diff --git a/examples/PlugInSamples/NoiseGate/NoiseGate.jucer b/examples/PlugInSamples/NoiseGate/NoiseGate.jucer index 074c0ba12b..f2166dc6ae 100644 --- a/examples/PlugInSamples/NoiseGate/NoiseGate.jucer +++ b/examples/PlugInSamples/NoiseGate/NoiseGate.jucer @@ -8,7 +8,7 @@ pluginIsSynth="0" pluginWantsMidiIn="0" pluginProducesMidiOut="0" pluginSilenceInIsSilenceOut="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="NoiseGateAU" pluginRTASCategory="" aaxIdentifier="com.roli.NoiseGate" - pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="4.3.0" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="4.3.1" pluginIsMidiEffectPlugin="0" buildAUv3="0"> diff --git a/examples/PlugInSamples/Surround/Surround.jucer b/examples/PlugInSamples/Surround/Surround.jucer index 9ae0a9c62b..3c1d6e310a 100644 --- a/examples/PlugInSamples/Surround/Surround.jucer +++ b/examples/PlugInSamples/Surround/Surround.jucer @@ -9,7 +9,7 @@ pluginIsMidiEffectPlugin="0" pluginSilenceInIsSilenceOut="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="SurroundAU" pluginRTASCategory="" aaxIdentifier="com.ROLI.Surround" pluginAAXCategory="AAX_ePlugInCategory_Dynamics" - jucerVersion="4.3.0" buildAUv3="0"> + jucerVersion="4.3.1" buildAUv3="0"> + jucerVersion="4.3.1"> + includeBinaryInAppConfig="1" jucerVersion="4.3.1"> diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile index 38ad87108e..ef4ebeb1fa 100644 --- a/extras/Projucer/Builds/LinuxMakefile/Makefile +++ b/extras/Projucer/Builds/LinuxMakefile/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.1 -DJUCE_APP_VERSION_HEX=0x40301 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 $(CFLAGS) JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) @@ -53,7 +53,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.0 -DJUCE_APP_VERSION_HEX=0x40300 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=4.3.1 -DJUCE_APP_VERSION_HEX=0x40301 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 $(CFLAGS) JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) diff --git a/extras/Projucer/Builds/MacOSX/Info-App.plist b/extras/Projucer/Builds/MacOSX/Info-App.plist index 2ed1ad416e..492d93c037 100644 --- a/extras/Projucer/Builds/MacOSX/Info-App.plist +++ b/extras/Projucer/Builds/MacOSX/Info-App.plist @@ -33,9 +33,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 4.3.0 + 4.3.1 CFBundleVersion - 4.3.0 + 4.3.1 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index 4b402ead66..f9a61c0c0e 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -2399,8 +2399,8 @@ "_DEBUG=1", "DEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=4.3.0", - "JUCE_APP_VERSION_HEX=0x40300", ); + "JUCE_APP_VERSION=4.3.1", + "JUCE_APP_VERSION_HEX=0x40301", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); INFOPLIST_FILE = Info-App.plist; @@ -2423,8 +2423,8 @@ "_NDEBUG=1", "NDEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=4.3.0", - "JUCE_APP_VERSION_HEX=0x40300", ); + "JUCE_APP_VERSION=4.3.1", + "JUCE_APP_VERSION_HEX=0x40301", ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "$(inherited)"); diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj b/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj index 0826930bfb..27b24de258 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer.vcxproj @@ -60,7 +60,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.3.0;JUCE_APP_VERSION_HEX=0x40300;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.3.1;JUCE_APP_VERSION_HEX=0x40301;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -99,7 +99,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.3.0;JUCE_APP_VERSION_HEX=0x40300;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=4.3.1;JUCE_APP_VERSION_HEX=0x40301;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Projucer/Builds/VisualStudio2013/resources.rc b/extras/Projucer/Builds/VisualStudio2013/resources.rc index 61a9e7d6bf..081fd0df9d 100644 --- a/extras/Projucer/Builds/VisualStudio2013/resources.rc +++ b/extras/Projucer/Builds/VisualStudio2013/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 4,3,0,0 +FILEVERSION 4,3,1,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "Projucer\0" - VALUE "FileVersion", "4.3.0\0" + VALUE "FileVersion", "4.3.1\0" VALUE "ProductName", "Projucer\0" - VALUE "ProductVersion", "4.3.0\0" + VALUE "ProductVersion", "4.3.1\0" END END diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj index deff82e65a..3000aae997 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer.vcxproj @@ -60,7 +60,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.3.0;JUCE_APP_VERSION_HEX=0x40300;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.3.1;JUCE_APP_VERSION_HEX=0x40301;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -99,7 +99,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.3.0;JUCE_APP_VERSION_HEX=0x40300;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=4.3.1;JUCE_APP_VERSION_HEX=0x40301;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Projucer/Builds/VisualStudio2015/resources.rc b/extras/Projucer/Builds/VisualStudio2015/resources.rc index 61a9e7d6bf..081fd0df9d 100644 --- a/extras/Projucer/Builds/VisualStudio2015/resources.rc +++ b/extras/Projucer/Builds/VisualStudio2015/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 4,3,0,0 +FILEVERSION 4,3,1,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "Projucer\0" - VALUE "FileVersion", "4.3.0\0" + VALUE "FileVersion", "4.3.1\0" VALUE "ProductName", "Projucer\0" - VALUE "ProductVersion", "4.3.0\0" + VALUE "ProductVersion", "4.3.1\0" END END diff --git a/extras/Projucer/JuceLibraryCode/JuceHeader.h b/extras/Projucer/JuceLibraryCode/JuceHeader.h index 7bce745e27..65d8fe6afa 100644 --- a/extras/Projucer/JuceLibraryCode/JuceHeader.h +++ b/extras/Projucer/JuceLibraryCode/JuceHeader.h @@ -35,8 +35,8 @@ namespace ProjectInfo { const char* const projectName = "Projucer"; - const char* const versionString = "4.3.0"; - const int versionNumber = 0x40300; + const char* const versionString = "4.3.1"; + const int versionNumber = 0x40301; } #endif diff --git a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile index 99761d265c..cb94c2233a 100644 --- a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile +++ b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile @@ -1,6 +1,13 @@ # Automatically generated makefile, created by the Projucer # Don't edit this file! Your changes will be overwritten when you re-save the Projucer project! +# build with "V=1" for verbose builds +ifeq ($(V), 1) +V_AT = +else +V_AT = @ +endif + # (this disables dependency generation if multiple architectures are set) DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD) @@ -26,10 +33,10 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules - JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 - JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 - JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama) -lGL -ldl -lpthread -lrt + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) TARGET := UnitTestRunner BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) @@ -46,10 +53,10 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules - JUCE_CFLAGS += $(CFLAGS) $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 - JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 - JUCE_LDFLAGS += $(LDFLAGS) $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama) -lGL -ldl -lpthread -lrt + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) + JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) TARGET := UnitTestRunner BLDCMD = $(CXX) -o $(JUCE_OUTDIR)/$(TARGET) $(OBJECTS) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) @@ -80,7 +87,7 @@ $(JUCE_OUTDIR)/$(TARGET): check-pkg-config $(OBJECTS) $(RESOURCES) -@mkdir -p $(JUCE_BINDIR) -@mkdir -p $(JUCE_LIBDIR) -@mkdir -p $(JUCE_OUTDIR) - @$(BLDCMD) + $(V_AT)$(BLDCMD) check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @@ -88,7 +95,7 @@ check-pkg-config: clean: @echo Cleaning UnitTestRunner - @$(CLEANCMD) + $(V_AT)$(CLEANCMD) strip: @echo Stripping UnitTestRunner @@ -97,76 +104,76 @@ strip: $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling Main.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_audio_basics_6b797ca1.o: ../../JuceLibraryCode/juce_audio_basics.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_audio_basics.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_audio_devices_a742c38b.o: ../../JuceLibraryCode/juce_audio_devices.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_audio_devices.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_audio_formats_5a29c68a.o: ../../JuceLibraryCode/juce_audio_formats.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_audio_formats.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_audio_processors_dea3173d.o: ../../JuceLibraryCode/juce_audio_processors.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_audio_processors.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_core_75b14332.o: ../../JuceLibraryCode/juce_core.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_core.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_cryptography_6de2ebff.o: ../../JuceLibraryCode/juce_cryptography.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_cryptography.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_data_structures_72d3da2c.o: ../../JuceLibraryCode/juce_data_structures.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_data_structures.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_events_d2be882c.o: ../../JuceLibraryCode/juce_events.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_events.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_graphics_9c18891e.o: ../../JuceLibraryCode/juce_graphics.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_graphics.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_gui_basics_8a6da59c.o: ../../JuceLibraryCode/juce_gui_basics.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_gui_basics.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_gui_extra_4a026f23.o: ../../JuceLibraryCode/juce_gui_extra.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_gui_extra.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_opengl_cd70b4c2.o: ../../JuceLibraryCode/juce_opengl.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_opengl.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_osc_be4cee16.o: ../../JuceLibraryCode/juce_osc.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_osc.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" $(JUCE_OBJDIR)/juce_video_f128c512.o: ../../JuceLibraryCode/juce_video.cpp -@mkdir -p $(JUCE_OBJDIR) @echo "Compiling juce_video.cpp" - @$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) -o "$@" -c "$<" -include $(OBJECTS:%.o=%.d) diff --git a/extras/UnitTestRunner/UnitTestRunner.jucer b/extras/UnitTestRunner/UnitTestRunner.jucer index a08a615e97..80fc549ff3 100644 --- a/extras/UnitTestRunner/UnitTestRunner.jucer +++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -2,7 +2,7 @@ + jucerVersion="4.3.1" defines="JUCE_UNIT_TESTS=1"> diff --git a/extras/binarybuilder/BinaryBuilder.jucer b/extras/binarybuilder/BinaryBuilder.jucer index 18d964e1bc..f8fce0962b 100644 --- a/extras/binarybuilder/BinaryBuilder.jucer +++ b/extras/binarybuilder/BinaryBuilder.jucer @@ -1,7 +1,7 @@ + jucerVersion="4.3.1" defines="JUCE_DLL_BUILD=1" includeBinaryInAppConfig="1">