From c2991f77c259c754cbf514d5c2ea2a601da432d7 Mon Sep 17 00:00:00 2001 From: hogliux Date: Tue, 30 May 2017 16:25:04 +0100 Subject: [PATCH] Re-saved all projects --- examples/AUv3Synth/AUv3Synth.jucer | 2 +- examples/AnimationAppExample/AnimationAppExample.jucer | 2 +- .../VisualStudio2017/AnimationAppExample_App.vcxproj | 4 ++-- examples/AudioAppExample/AudioAppExample.jucer | 2 +- .../VisualStudio2017/AudioAppExample_App.vcxproj | 4 ++-- examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer | 2 +- .../BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile | 10 +++++----- .../Builds/VisualStudio2015/BlocksDrawing_App.vcxproj | 4 ++-- .../Builds/VisualStudio2017/BlocksDrawing_App.vcxproj | 4 ++-- examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer | 2 +- .../BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile | 10 +++++----- .../Builds/VisualStudio2015/BlocksMonitor_App.vcxproj | 4 ++-- .../Builds/VisualStudio2017/BlocksMonitor_App.vcxproj | 4 ++-- examples/BLOCKS/BlocksSynth/BlocksSynth.jucer | 2 +- .../BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile | 10 +++++----- .../Builds/VisualStudio2015/BlocksSynth_App.vcxproj | 4 ++-- .../Builds/VisualStudio2017/BlocksSynth_App.vcxproj | 4 ++-- .../BouncingBallWavetableDemo.jucer | 2 +- .../Builds/{Linux => LinuxMakefile}/Makefile | 10 +++++----- .../BouncingBallWavetableDemo_App.vcxproj | 4 ++-- .../BouncingBallWavetableDemo_App.vcxproj | 4 ++-- .../ComponentTutorialExample_App.vcxproj | 4 ++-- .../ComponentTutorialExample_App.vcxproj | 4 ++-- .../ComponentTutorialExample.jucer | 2 +- examples/Demo/Builds/{Linux => LinuxMakefile}/Makefile | 10 +++++----- .../Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj | 4 ++-- .../Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj | 4 ++-- .../Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj | 4 ++-- examples/Demo/JuceDemo.jucer | 2 +- .../Builds/{Linux => LinuxMakefile}/Makefile | 10 +++++----- .../Builds/VisualStudio2015/HelloWorld_App.vcxproj | 4 ++-- .../Builds/VisualStudio2017/HelloWorld_App.vcxproj | 4 ++-- examples/HelloWorld/HelloWorld.jucer | 2 +- examples/MPETest/Builds/LinuxMakefile/Makefile | 10 +++++----- .../Builds/VisualStudio2015/MPETest_App.vcxproj | 4 ++-- .../Builds/VisualStudio2017/MPETest_App.vcxproj | 4 ++-- examples/MPETest/MPETest.jucer | 2 +- examples/MidiTest/Builds/LinuxMakefile/Makefile | 10 +++++----- .../Builds/VisualStudio2015/MidiTest_App.vcxproj | 4 ++-- .../Builds/VisualStudio2017/MidiTest_App.vcxproj | 4 ++-- examples/MidiTest/MidiTest.jucer | 2 +- .../NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile | 10 +++++----- .../JUCE Network Graphics Demo_App.vcxproj | 4 ++-- .../JUCE Network Graphics Demo_App.vcxproj | 4 ++-- examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer | 2 +- examples/OSCMonitor/Builds/LinuxMakefile/Makefile | 10 +++++----- .../Builds/VisualStudio2015/OSCMonitor_App.vcxproj | 4 ++-- .../Builds/VisualStudio2017/OSCMonitor_App.vcxproj | 4 ++-- examples/OSCMonitor/OSCMonitor.jucer | 2 +- examples/OSCReceiver/Builds/LinuxMakefile/Makefile | 10 +++++----- .../Builds/VisualStudio2015/OSCReceiver_App.vcxproj | 4 ++-- .../Builds/VisualStudio2017/OSCReceiver_App.vcxproj | 4 ++-- examples/OSCReceiver/OSCReceiver.jucer | 2 +- .../Builds/VisualStudio2015/OSCSender_App.vcxproj | 4 ++-- .../Builds/VisualStudio2017/OSCSender_App.vcxproj | 4 ++-- examples/OSCSender/OSCSender.jucer | 2 +- .../VisualStudio2017/OpenGLAppExample_App.vcxproj | 4 ++-- examples/OpenGLAppExample/OpenGLAppExample.jucer | 2 +- .../VisualStudio2013/PluckedStringsDemo_App.vcxproj | 4 ++-- .../VisualStudio2017/PluckedStringsDemo_App.vcxproj | 4 ++-- examples/PluckedStringsDemo/PluckedStringsDemo.jucer | 2 +- examples/PlugInSamples/Arpeggiator/Arpeggiator.jucer | 2 +- .../VisualStudio2015/Arpeggiator_SharedCode.vcxproj | 4 ++-- .../Builds/VisualStudio2015/Arpeggiator_VST.vcxproj | 8 ++++---- .../VisualStudio2017/Arpeggiator_SharedCode.vcxproj | 4 ++-- .../Builds/VisualStudio2017/Arpeggiator_VST.vcxproj | 8 ++++---- .../VisualStudio2015/GainPlugIn_SharedCode.vcxproj | 4 ++-- .../Builds/VisualStudio2015/GainPlugIn_VST.vcxproj | 8 ++++---- .../Builds/VisualStudio2015/GainPlugIn_VST3.vcxproj | 8 ++++---- .../VisualStudio2017/GainPlugIn_SharedCode.vcxproj | 4 ++-- .../Builds/VisualStudio2017/GainPlugIn_VST.vcxproj | 8 ++++---- .../Builds/VisualStudio2017/GainPlugIn_VST3.vcxproj | 8 ++++---- examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer | 2 +- .../InterAppAudioEffect/InterAppAudioEffect.jucer | 2 +- .../Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj | 8 ++++---- .../VisualStudio2015/MultiOutSynth_SharedCode.vcxproj | 4 ++-- .../Builds/VisualStudio2015/MultiOutSynth_VST.vcxproj | 8 ++++---- .../Builds/VisualStudio2015/MultiOutSynth_VST3.vcxproj | 8 ++++---- .../Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj | 8 ++++---- .../VisualStudio2017/MultiOutSynth_SharedCode.vcxproj | 4 ++-- .../Builds/VisualStudio2017/MultiOutSynth_VST.vcxproj | 8 ++++---- .../Builds/VisualStudio2017/MultiOutSynth_VST3.vcxproj | 8 ++++---- .../PlugInSamples/MultiOutSynth/MultiOutSynth.jucer | 2 +- .../Builds/VisualStudio2015/NoiseGate_AAX.vcxproj | 8 ++++---- .../VisualStudio2015/NoiseGate_SharedCode.vcxproj | 4 ++-- .../Builds/VisualStudio2015/NoiseGate_VST.vcxproj | 8 ++++---- .../Builds/VisualStudio2015/NoiseGate_VST3.vcxproj | 8 ++++---- .../Builds/VisualStudio2017/NoiseGate_AAX.vcxproj | 8 ++++---- .../VisualStudio2017/NoiseGate_SharedCode.vcxproj | 4 ++-- .../Builds/VisualStudio2017/NoiseGate_VST.vcxproj | 8 ++++---- .../Builds/VisualStudio2017/NoiseGate_VST3.vcxproj | 8 ++++---- examples/PlugInSamples/NoiseGate/NoiseGate.jucer | 2 +- .../Surround/Builds/LinuxMakefile/Makefile | 10 +++++----- .../Builds/VisualStudio2015/Surround_AAX.vcxproj | 8 ++++---- .../VisualStudio2015/Surround_SharedCode.vcxproj | 4 ++-- .../Builds/VisualStudio2015/Surround_VST.vcxproj | 8 ++++---- .../Builds/VisualStudio2015/Surround_VST3.vcxproj | 8 ++++---- .../Builds/VisualStudio2017/Surround_AAX.vcxproj | 8 ++++---- .../VisualStudio2017/Surround_SharedCode.vcxproj | 4 ++-- .../Builds/VisualStudio2017/Surround_VST.vcxproj | 8 ++++---- .../Builds/VisualStudio2017/Surround_VST3.vcxproj | 8 ++++---- examples/PlugInSamples/Surround/Surround.jucer | 2 +- .../VisualStudio2013/SimpleFFTExample_App.vcxproj | 4 ++-- .../VisualStudio2017/SimpleFFTExample_App.vcxproj | 4 ++-- examples/SimpleFFTExample/SimpleFFTExample.jucer | 2 +- .../Builds/{Linux => LinuxMakefile}/Makefile | 10 +++++----- .../VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj | 4 ++-- .../JuceDemoPlugin_StandalonePlugin.vcxproj | 8 ++++---- .../Builds/VisualStudio2015/JuceDemoPlugin_VST.vcxproj | 8 ++++---- .../VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj | 4 ++-- .../JuceDemoPlugin_StandalonePlugin.vcxproj | 8 ++++---- .../Builds/VisualStudio2017/JuceDemoPlugin_VST.vcxproj | 8 ++++---- examples/audio plugin demo/JuceDemoPlugin.jucer | 2 +- .../Builds/{Linux => LinuxMakefile}/Makefile | 10 +++++----- .../Builds/VisualStudio2013/Plugin Host_App.vcxproj | 4 ++-- .../Builds/VisualStudio2015/Plugin Host_App.vcxproj | 4 ++-- .../Builds/VisualStudio2017/Plugin Host_App.vcxproj | 4 ++-- examples/audio plugin host/Plugin Host.jucer | 2 +- extras/AudioPerformanceTest/AudioPerformanceTest.jucer | 2 +- .../AudioPerformanceTest/Builds/LinuxMakefile/Makefile | 10 +++++----- .../VisualStudio2015/AudioPerformanceTest_App.vcxproj | 4 ++-- extras/Projucer/Builds/LinuxMakefile/Makefile | 10 +++++----- extras/Projucer/Builds/MacOSX/Info-App.plist | 4 ++-- .../Builds/MacOSX/Projucer.xcodeproj/project.pbxproj | 8 ++++---- .../Builds/VisualStudio2013/Projucer_App.vcxproj | 8 ++++---- extras/Projucer/Builds/VisualStudio2013/resources.rc | 6 +++--- .../Builds/VisualStudio2015/Projucer_App.vcxproj | 8 ++++---- extras/Projucer/Builds/VisualStudio2015/resources.rc | 6 +++--- .../Builds/VisualStudio2017/Projucer_App.vcxproj | 8 ++++---- extras/Projucer/Builds/VisualStudio2017/resources.rc | 6 +++--- extras/Projucer/JuceLibraryCode/JuceHeader.h | 4 ++-- extras/UnitTestRunner/Builds/LinuxMakefile/Makefile | 10 +++++----- .../VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj | 4 ++-- extras/UnitTestRunner/UnitTestRunner.jucer | 2 +- extras/binarybuilder/BinaryBuilder.jucer | 2 +- .../Builds/{Linux => LinuxMakefile}/Makefile | 4 ++-- .../VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj | 4 ++-- .../VisualStudio2017/juce_dll_StaticLibrary.vcxproj | 4 ++-- extras/windows dll/jucedll.jucer | 2 +- 139 files changed, 365 insertions(+), 365 deletions(-) rename examples/BouncingBallWavetableDemo/Builds/{Linux => LinuxMakefile}/Makefile (89%) rename examples/Demo/Builds/{Linux => LinuxMakefile}/Makefile (94%) rename examples/HelloWorld/Builds/{Linux => LinuxMakefile}/Makefile (86%) rename examples/audio plugin demo/Builds/{Linux => LinuxMakefile}/Makefile (92%) rename examples/audio plugin host/Builds/{Linux => LinuxMakefile}/Makefile (88%) rename extras/binarybuilder/Builds/{Linux => LinuxMakefile}/Makefile (94%) diff --git a/examples/AUv3Synth/AUv3Synth.jucer b/examples/AUv3Synth/AUv3Synth.jucer index 0d5b947be0..9747871ba9 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="5.0.1" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.2" buildStandalone="1" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd."> diff --git a/examples/AnimationAppExample/AnimationAppExample.jucer b/examples/AnimationAppExample/AnimationAppExample.jucer index 52e7bca89d..34aed5015c 100644 --- a/examples/AnimationAppExample/AnimationAppExample.jucer +++ b/examples/AnimationAppExample/AnimationAppExample.jucer @@ -2,7 +2,7 @@ diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj index 40fbe49450..12d0a22cd5 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ AnimationAppExample true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ AnimationAppExample true diff --git a/examples/AudioAppExample/AudioAppExample.jucer b/examples/AudioAppExample/AudioAppExample.jucer index bce66b7080..9ac0cb02af 100644 --- a/examples/AudioAppExample/AudioAppExample.jucer +++ b/examples/AudioAppExample/AudioAppExample.jucer @@ -2,7 +2,7 @@ diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj index 6c67cf9d63..c0bb9b5793 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj +++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ AudioAppExample true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ AudioAppExample true diff --git a/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer b/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer index 26875e2be2..e1cb9e0c4b 100644 --- a/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer +++ b/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer @@ -2,7 +2,7 @@ diff --git a/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile index ce226d29cc..607278f769 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := BlocksDrawing JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := BlocksDrawing JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -162,7 +162,7 @@ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o: ../../JuceLibraryCode/include_juce check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning BlocksDrawing diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj index c0a95cb0cb..66419a8a77 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksDrawing true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksDrawing true diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj index fc79b542e3..6a4f8e6a2c 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksDrawing true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksDrawing true diff --git a/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer b/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer index 1c9e74c4ff..399bf8ca07 100644 --- a/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer +++ b/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer @@ -2,7 +2,7 @@ diff --git a/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile index 267a4bc0db..2a5a783c18 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := BlocksMonitor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := BlocksMonitor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -162,7 +162,7 @@ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o: ../../JuceLibraryCode/include_juce check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning BlocksMonitor diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj index 6861550e87..8231a0f341 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksMonitor true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksMonitor true diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj index c44091fa96..20cc550fb1 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksMonitor true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksMonitor true diff --git a/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer b/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer index 21cfb822e2..64d32dfe8f 100644 --- a/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer +++ b/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer @@ -2,7 +2,7 @@ diff --git a/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile index 295440393c..28676b8fe1 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := BlocksSynth JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := BlocksSynth JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -162,7 +162,7 @@ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o: ../../JuceLibraryCode/include_juce check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning BlocksSynth diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj index 1d3b7909e2..91d6e9ceea 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksSynth true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksSynth true diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj index 2bbd4f0ea9..b262d84e05 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksSynth true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BlocksSynth true diff --git a/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer b/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer index f13e806796..e112bb142a 100644 --- a/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer +++ b/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer @@ -2,7 +2,7 @@ diff --git a/examples/BouncingBallWavetableDemo/Builds/Linux/Makefile b/examples/BouncingBallWavetableDemo/Builds/LinuxMakefile/Makefile similarity index 89% rename from examples/BouncingBallWavetableDemo/Builds/Linux/Makefile rename to examples/BouncingBallWavetableDemo/Builds/LinuxMakefile/Makefile index 87def6a389..9578c1d294 100644 --- a/examples/BouncingBallWavetableDemo/Builds/Linux/Makefile +++ b/examples/BouncingBallWavetableDemo/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := WavetableBouncingEditor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := WavetableBouncingEditor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -Os $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + 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 webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -168,7 +168,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning BouncingBallWavetableDemo diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj index 1238f89e41..743d709183 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ WavetableBouncingEditor true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ WavetableBouncingEditor true diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj index e27dd640dc..0f8b1713d6 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BouncingBallWavetableDemo true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ BouncingBallWavetableDemo true diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj index 6c4fec524b..a1962bf66a 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ ComponentTutorialExample true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ ComponentTutorialExample true diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj index 21976ca8de..1426799ca7 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ ComponentTutorialExample true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ ComponentTutorialExample true diff --git a/examples/ComponentTutorialExample/ComponentTutorialExample.jucer b/examples/ComponentTutorialExample/ComponentTutorialExample.jucer index 59a087a85e..cb042f09e3 100644 --- a/examples/ComponentTutorialExample/ComponentTutorialExample.jucer +++ b/examples/ComponentTutorialExample/ComponentTutorialExample.jucer @@ -2,7 +2,7 @@ diff --git a/examples/Demo/Builds/Linux/Makefile b/examples/Demo/Builds/LinuxMakefile/Makefile similarity index 94% rename from examples/Demo/Builds/Linux/Makefile rename to examples/Demo/Builds/LinuxMakefile/Makefile index 1f4969c444..fa913504a1 100644 --- a/examples/Demo/Builds/Linux/Makefile +++ b/examples/Demo/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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_7346DA2A=1 -DJUCE_APP_VERSION=3.0.0 -DJUCE_APP_VERSION_HEX=0x30000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=3.0.0 -DJUCE_APP_VERSION_HEX=0x30000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := JuceDemo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=3.0.0 -DJUCE_APP_VERSION_HEX=0x30000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=3.0.0 -DJUCE_APP_VERSION_HEX=0x30000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := JuceDemo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + 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 webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -420,7 +420,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning JuceDemo diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj index 772cab7753..8b89e65bc8 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ JuceDemo true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ JuceDemo true diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj index 16c4a46663..e4a9eff552 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ JuceDemo true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ JuceDemo true diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj index 1971c18704..208b211dc7 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ JuceDemo true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ JuceDemo true diff --git a/examples/Demo/JuceDemo.jucer b/examples/Demo/JuceDemo.jucer index af56553829..bf2bd0bdda 100644 --- a/examples/Demo/JuceDemo.jucer +++ b/examples/Demo/JuceDemo.jucer @@ -1,7 +1,7 @@ diff --git a/examples/HelloWorld/Builds/Linux/Makefile b/examples/HelloWorld/Builds/LinuxMakefile/Makefile similarity index 86% rename from examples/HelloWorld/Builds/Linux/Makefile rename to examples/HelloWorld/Builds/LinuxMakefile/Makefile index c93a255761..4c6f65f290 100644 --- a/examples/HelloWorld/Builds/Linux/Makefile +++ b/examples/HelloWorld/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := HelloWorld JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := HelloWorld JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -Os $(CFLAGS) JUCE_CXXFLAGS += $(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 freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -126,7 +126,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors freetype2 libcurl x11 xext xinerama clean: @echo Cleaning HelloWorld diff --git a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj index 82058edbc1..f0eec44729 100644 --- a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj +++ b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ HelloWorld true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ HelloWorld true diff --git a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj index 1cf32805cf..63fac35131 100644 --- a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj +++ b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ HelloWorld true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ HelloWorld true diff --git a/examples/HelloWorld/HelloWorld.jucer b/examples/HelloWorld/HelloWorld.jucer index 61d34e21c3..1569c44940 100644 --- a/examples/HelloWorld/HelloWorld.jucer +++ b/examples/HelloWorld/HelloWorld.jucer @@ -1,7 +1,7 @@ diff --git a/examples/MPETest/Builds/LinuxMakefile/Makefile b/examples/MPETest/Builds/LinuxMakefile/Makefile index 3d9feda38f..f60a493074 100644 --- a/examples/MPETest/Builds/LinuxMakefile/Makefile +++ b/examples/MPETest/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := MPETest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := MPETest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + 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 webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -168,7 +168,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning MPETest diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj index c3f897f083..9483221825 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ MPETest true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ MPETest true diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj index 14ea293a5b..0828cec6a6 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ MPETest true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ MPETest true diff --git a/examples/MPETest/MPETest.jucer b/examples/MPETest/MPETest.jucer index cb5439c7be..add2cc1b12 100644 --- a/examples/MPETest/MPETest.jucer +++ b/examples/MPETest/MPETest.jucer @@ -2,7 +2,7 @@ diff --git a/examples/MidiTest/Builds/LinuxMakefile/Makefile b/examples/MidiTest/Builds/LinuxMakefile/Makefile index 8cf72f34be..0f092c8624 100644 --- a/examples/MidiTest/Builds/LinuxMakefile/Makefile +++ b/examples/MidiTest/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := MidiTest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := MidiTest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + 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 webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -156,7 +156,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning MidiTest diff --git a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj index 3af8b94c2f..39f640e849 100644 --- a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj +++ b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ MidiTest true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ MidiTest true diff --git a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj index 9c313a7e69..e5867e41fd 100644 --- a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj +++ b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ MidiTest true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ MidiTest true diff --git a/examples/MidiTest/MidiTest.jucer b/examples/MidiTest/MidiTest.jucer index 71c3c48d9b..2e872b3fd5 100644 --- a/examples/MidiTest/MidiTest.jucer +++ b/examples/MidiTest/MidiTest.jucer @@ -2,7 +2,7 @@ diff --git a/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile b/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile index fa0b092a46..3b6197ae25 100644 --- a/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile +++ b/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := JUCE\ Network\ Graphics\ Demo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := JUCE\ Network\ Graphics\ Demo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + 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 webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -174,7 +174,7 @@ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o: ../../JuceLibraryCode/include_juce_o check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning JUCE Network Graphics Demo diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj index 07f265294e..83c9ee908e 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ JUCE Network Graphics Demo true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ JUCE Network Graphics Demo true diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj index 1e26b3602f..44b2826deb 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ JUCE Network Graphics Demo true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ JUCE Network Graphics Demo true diff --git a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer index 1abf076a36..3f822e0abd 100644 --- a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer +++ b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer @@ -2,7 +2,7 @@ diff --git a/examples/OSCMonitor/Builds/LinuxMakefile/Makefile b/examples/OSCMonitor/Builds/LinuxMakefile/Makefile index 5963e5178d..56e668986e 100644 --- a/examples/OSCMonitor/Builds/LinuxMakefile/Makefile +++ b/examples/OSCMonitor/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := OSCMonitor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := OSCMonitor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + 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 webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -168,7 +168,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning OSCMonitor diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj index 01e5c46eb7..d108822825 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCMonitor true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCMonitor true diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj index d60ca46ef1..1f1d8d1d76 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCMonitor true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCMonitor true diff --git a/examples/OSCMonitor/OSCMonitor.jucer b/examples/OSCMonitor/OSCMonitor.jucer index 012284a5c9..58134142b2 100644 --- a/examples/OSCMonitor/OSCMonitor.jucer +++ b/examples/OSCMonitor/OSCMonitor.jucer @@ -2,7 +2,7 @@ diff --git a/examples/OSCReceiver/Builds/LinuxMakefile/Makefile b/examples/OSCReceiver/Builds/LinuxMakefile/Makefile index 0d145a8ffa..47bfafb0aa 100644 --- a/examples/OSCReceiver/Builds/LinuxMakefile/Makefile +++ b/examples/OSCReceiver/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := OSCReceiver JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := OSCReceiver JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(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 freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -132,7 +132,7 @@ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o: ../../JuceLibraryCode/include_juce_o check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors freetype2 libcurl x11 xext xinerama clean: @echo Cleaning OSCReceiver diff --git a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj index 16d20fa75e..23bdd1ac1b 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj +++ b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCReceiver true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCReceiver true diff --git a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj index d67c98f6a1..70621c3fd4 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj +++ b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCReceiver true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCReceiver true diff --git a/examples/OSCReceiver/OSCReceiver.jucer b/examples/OSCReceiver/OSCReceiver.jucer index 40bf1ab15c..849fac7351 100644 --- a/examples/OSCReceiver/OSCReceiver.jucer +++ b/examples/OSCReceiver/OSCReceiver.jucer @@ -2,7 +2,7 @@ diff --git a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj index 15b3aba5bd..6adc375747 100644 --- a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj +++ b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCSender true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCSender true diff --git a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj index 8cdd2d9dff..ed5f375579 100644 --- a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj +++ b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCSender true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OSCSender true diff --git a/examples/OSCSender/OSCSender.jucer b/examples/OSCSender/OSCSender.jucer index 339c4eb647..faeeb64c32 100644 --- a/examples/OSCSender/OSCSender.jucer +++ b/examples/OSCSender/OSCSender.jucer @@ -2,7 +2,7 @@ diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj index aef0956883..015b45f056 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OpenGLAppExample true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ OpenGLAppExample true diff --git a/examples/OpenGLAppExample/OpenGLAppExample.jucer b/examples/OpenGLAppExample/OpenGLAppExample.jucer index afb9c86bd9..eee2247715 100644 --- a/examples/OpenGLAppExample/OpenGLAppExample.jucer +++ b/examples/OpenGLAppExample/OpenGLAppExample.jucer @@ -2,7 +2,7 @@ diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj index 54037476d6..95de987462 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ PluckedStringsDemo true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ PluckedStringsDemo true diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj index 77bebafe59..f88b860842 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ PluckedStringsDemo true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ PluckedStringsDemo true diff --git a/examples/PluckedStringsDemo/PluckedStringsDemo.jucer b/examples/PluckedStringsDemo/PluckedStringsDemo.jucer index aa2ad4bee4..d90e049383 100644 --- a/examples/PluckedStringsDemo/PluckedStringsDemo.jucer +++ b/examples/PluckedStringsDemo/PluckedStringsDemo.jucer @@ -2,7 +2,7 @@ diff --git a/examples/PlugInSamples/Arpeggiator/Arpeggiator.jucer b/examples/PlugInSamples/Arpeggiator/Arpeggiator.jucer index aeccb75343..5d4a0220f1 100644 --- a/examples/PlugInSamples/Arpeggiator/Arpeggiator.jucer +++ b/examples/PlugInSamples/Arpeggiator/Arpeggiator.jucer @@ -9,7 +9,7 @@ pluginIsMidiEffectPlugin="1" pluginSilenceInIsSilenceOut="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="ArpeggiatorAU" pluginRTASCategory="" aaxIdentifier="com.roli.Arpeggiator" pluginAAXCategory="AAX_EPlugInCategory_Effect" - jucerVersion="5.0.1" companyName="ROLI Ltd." companyWebsite="www.juce.com" + jucerVersion="5.0.2" companyName="ROLI Ltd." companyWebsite="www.juce.com" companyEmail="info@juce.com" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"> diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj index 24db21abab..f2682d704c 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ Arpeggiator true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ Arpeggiator true diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_VST.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_VST.vcxproj index 069e9f70e8..86c2559db8 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_VST.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_VST.vcxproj @@ -44,16 +44,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ Arpeggiator true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ Arpeggiator true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj index bb4cffd57e..b8ba45fc36 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ Arpeggiator true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ Arpeggiator true diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_VST.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_VST.vcxproj index 194c9dc23d..081f5200c8 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_VST.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_VST.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ Arpeggiator true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ Arpeggiator true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj index 92a32d90a7..4cc5812478 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ GainPlugIn true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ GainPlugIn true diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST.vcxproj index 5f00fb1a73..1dc2e44f16 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST.vcxproj @@ -44,16 +44,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ GainPlugIn true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ GainPlugIn true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST3.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST3.vcxproj index c2c2899991..d13f0ce6d8 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST3.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_VST3.vcxproj @@ -44,16 +44,16 @@ <_ProjectFileVersion>10.0.30319.1 .vst3 - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ GainPlugIn true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ GainPlugIn true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj index c4397bc78b..fb5546b1a3 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ GainPlugIn true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ GainPlugIn true diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST.vcxproj index f3c82f2cad..5a4f24fa1d 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ GainPlugIn true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ GainPlugIn true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST3.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST3.vcxproj index f63b3fc89a..5dad3dac00 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST3.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_VST3.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .vst3 - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ GainPlugIn true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ GainPlugIn true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer b/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer index 756a69884a..15866c5ba6 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="5.0.1" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.2" pluginIsMidiEffectPlugin="0" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd."> diff --git a/examples/PlugInSamples/InterAppAudioEffect/InterAppAudioEffect.jucer b/examples/PlugInSamples/InterAppAudioEffect/InterAppAudioEffect.jucer index 41442809ee..8b699cf8b3 100644 --- a/examples/PlugInSamples/InterAppAudioEffect/InterAppAudioEffect.jucer +++ b/examples/PlugInSamples/InterAppAudioEffect/InterAppAudioEffect.jucer @@ -9,7 +9,7 @@ pluginIsSynth="0" pluginWantsMidiIn="0" pluginProducesMidiOut="0" pluginIsMidiEffectPlugin="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="InterAppAudioEffectAU" pluginRTASCategory="" aaxIdentifier="com.yourcompany.InterAppAudioEffect" - pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.1" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.2" companyName="ROLI Ltd." buildStandalone="1" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"> diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj index 9bcfaddb4f..812202fcfa 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj @@ -44,16 +44,16 @@ <_ProjectFileVersion>10.0.30319.1 .aaxdll - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj index 10e8989e57..b3e8a9ace3 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ MultiOutSynth true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ MultiOutSynth true diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST.vcxproj index 87eb4b33f2..e1a006c487 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST.vcxproj @@ -44,16 +44,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST3.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST3.vcxproj index 304b5fd7f2..49242547e3 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST3.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_VST3.vcxproj @@ -44,16 +44,16 @@ <_ProjectFileVersion>10.0.30319.1 .vst3 - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj index 8f9cd2b948..ab198e4fbf 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .aaxdll - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj index b6c687c4b1..bbb7fe56f9 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ MultiOutSynth true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ MultiOutSynth true diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST.vcxproj index e3e8cc736f..3ff5c00fed 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST3.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST3.vcxproj index e85b9da99d..7d72b0e8c0 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST3.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_VST3.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .vst3 - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ MultiOutSynth true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer b/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer index b2ddf844a5..c56944e245 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="5.0.1" companyName="ROLI Ltd." companyWebsite="www.roli.com" + jucerVersion="5.0.2" companyName="ROLI Ltd." companyWebsite="www.roli.com" companyEmail="info@juce.com" pluginIsMidiEffectPlugin="0" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"> diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj index d8850fb35d..dd096db1d9 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj @@ -44,16 +44,16 @@ <_ProjectFileVersion>10.0.30319.1 .aaxdll - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj index f6b6c69469..4df4073ac9 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ NoiseGate true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ NoiseGate true diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST.vcxproj index 224f9b59a5..54f5779adb 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST.vcxproj @@ -44,16 +44,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST3.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST3.vcxproj index 526b3ecc5d..0a08ed1566 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST3.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_VST3.vcxproj @@ -44,16 +44,16 @@ <_ProjectFileVersion>10.0.30319.1 .vst3 - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj index b569b1afd4..ba686cfd1b 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .aaxdll - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj index 1f6a2ce638..637894ca8b 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ NoiseGate true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ NoiseGate true diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST.vcxproj index dcddd84d0d..9753009b69 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST3.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST3.vcxproj index 1f95adda44..71dadf061b 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST3.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_VST3.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .vst3 - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ NoiseGate true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/NoiseGate/NoiseGate.jucer b/examples/PlugInSamples/NoiseGate/NoiseGate.jucer index 957e023d97..4d1a0b43a4 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="5.0.1" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.2" pluginIsMidiEffectPlugin="0" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd."> diff --git a/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile b/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile index 1c9d03e7ed..67f3eabac1 100644 --- a/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile +++ b/examples/PlugInSamples/Surround/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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_CFLAGS_VST := -fPIC @@ -45,7 +45,7 @@ ifeq ($(CONFIG),Debug) JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -fPIC -g -ggdb -O0 -Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -Wl,--no-undefined -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -Wl,--no-undefined -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_CFLAGS_VST := -fPIC @@ -72,7 +72,7 @@ ifeq ($(CONFIG),Release) JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -fPIC -O3 -Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -Wl,--no-undefined -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -Wl,--no-undefined -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -199,7 +199,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning Surround diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj index 38c99225a2..63ddab95ca 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .aaxdll - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140_xp diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj index 327d7d238a..fee3b13b35 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ Surround true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ Surround true diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST.vcxproj index 950ac8ef48..d3b02643db 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140_xp diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST3.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST3.vcxproj index db7287a85b..0012e8e135 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST3.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_VST3.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .vst3 - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140_xp diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj index 454bf343b5..5eca6e5ebf 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .aaxdll - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\AAX\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\AAX\ $(Platform)\$(Configuration)\AAX\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj index d14b72a7f8..27f25f5b31 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ Surround true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ Surround true diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST.vcxproj index 74c87a1e67..d31aa1433a 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST3.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST3.vcxproj index 005b1696f1..6e99e6e8e9 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST3.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_VST3.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .vst3 - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST3\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST3\ $(Platform)\$(Configuration)\VST3\ Surround true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/PlugInSamples/Surround/Surround.jucer b/examples/PlugInSamples/Surround/Surround.jucer index 3983c923bd..3c907e1884 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="5.0.1" buildAUv3="0" buildStandalone="0" enableIAA="0" + jucerVersion="5.0.2" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd."> diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj index 0d413e2182..f16f8029d1 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ SimpleFFTExample true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ SimpleFFTExample true diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj index 8ee7b514f2..00b881deb5 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ SimpleFFTExample true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ SimpleFFTExample true diff --git a/examples/SimpleFFTExample/SimpleFFTExample.jucer b/examples/SimpleFFTExample/SimpleFFTExample.jucer index 2fb1482e89..a51f15ab10 100644 --- a/examples/SimpleFFTExample/SimpleFFTExample.jucer +++ b/examples/SimpleFFTExample/SimpleFFTExample.jucer @@ -2,7 +2,7 @@ diff --git a/examples/audio plugin demo/Builds/Linux/Makefile b/examples/audio plugin demo/Builds/LinuxMakefile/Makefile similarity index 92% rename from examples/audio plugin demo/Builds/Linux/Makefile rename to examples/audio plugin demo/Builds/LinuxMakefile/Makefile index 8259858ff6..95738b0403 100644 --- a/examples/audio plugin demo/Builds/Linux/Makefile +++ b/examples/audio plugin demo/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_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_CFLAGS_VST := -fPIC @@ -48,7 +48,7 @@ ifeq ($(CONFIG),Debug) JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -fPIC -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -Wl,--no-undefined -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -Wl,--no-undefined -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -63,7 +63,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_CFLAGS_VST := -fPIC @@ -78,7 +78,7 @@ ifeq ($(CONFIG),Release) JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -fPIC -O3 $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -Wl,--no-undefined -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -Wl,--no-undefined -fvisibility=hidden -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -214,7 +214,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning JuceDemoPlugin diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj index 80261acb57..ba704e51ce 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ JuceDemoPlugin true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ JuceDemoPlugin true diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_StandalonePlugin.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_StandalonePlugin.vcxproj index a6fdcfc1bf..2e2a3a702a 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_StandalonePlugin.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_StandalonePlugin.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\Standalone Plugin\ + $(SolutionDir)$(Platform)\$(Configuration)\Standalone Plugin\ $(Platform)\$(Configuration)\Standalone Plugin\ JuceDemoPlugin true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\Standalone Plugin\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\Standalone Plugin\ $(Platform)\$(Configuration)\Standalone Plugin\ JuceDemoPlugin true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_VST.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_VST.vcxproj index dc50acb735..095242c305 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_VST.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_VST.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ JuceDemoPlugin true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ JuceDemoPlugin true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v140 diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj index 25328e2cf1..346c84bc23 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ JuceDemoPlugin true - $(SolutionDir)\$(Platform)\$(Configuration)\Shared Code\ + $(SolutionDir)$(Platform)\$(Configuration)\Shared Code\ $(Platform)\$(Configuration)\Shared Code\ JuceDemoPlugin true diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_StandalonePlugin.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_StandalonePlugin.vcxproj index c9119b1e6b..8cea998d6e 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_StandalonePlugin.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_StandalonePlugin.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\Standalone Plugin\ + $(SolutionDir)$(Platform)\$(Configuration)\Standalone Plugin\ $(Platform)\$(Configuration)\Standalone Plugin\ JuceDemoPlugin true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\Standalone Plugin\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\Standalone Plugin\ $(Platform)\$(Configuration)\Standalone Plugin\ JuceDemoPlugin true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_VST.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_VST.vcxproj index c5a5cc40c3..e345f89249 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_VST.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_VST.vcxproj @@ -46,16 +46,16 @@ <_ProjectFileVersion>10.0.30319.1 .dll - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ JuceDemoPlugin true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code - $(SolutionDir)\$(Platform)\$(Configuration)\VST\ + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code + $(SolutionDir)$(Platform)\$(Configuration)\VST\ $(Platform)\$(Configuration)\VST\ JuceDemoPlugin true - $(LibraryPath);$(SolutionDir)\$(Platform)\$(Configuration)\Shared Code + $(LibraryPath);$(SolutionDir)$(Platform)\$(Configuration)\Shared Code v141 diff --git a/examples/audio plugin demo/JuceDemoPlugin.jucer b/examples/audio plugin demo/JuceDemoPlugin.jucer index f655f69456..a62dd03aa2 100644 --- a/examples/audio plugin demo/JuceDemoPlugin.jucer +++ b/examples/audio plugin demo/JuceDemoPlugin.jucer @@ -8,7 +8,7 @@ pluginProducesMidiOut="1" pluginSilenceInIsSilenceOut="0" pluginTailLength="0" pluginEditorRequiresKeys="1" pluginAUExportPrefix="JuceDemoProjectAU" pluginAUViewClass="JuceDemoProjectAU_V1" pluginRTASCategory="" - bundleIdentifier="com.juce.JuceDemoPlugin" jucerVersion="5.0.1" + bundleIdentifier="com.juce.JuceDemoPlugin" jucerVersion="5.0.2" companyName="ROLI Ltd." aaxIdentifier="com.yourcompany.JuceDemoPlugin" buildAAX="0" pluginAAXCategory="AAX_ePlugInCategory_Dynamics" includeBinaryInAppConfig="1" buildVST3="0" pluginManufacturerEmail="support@yourcompany.com" diff --git a/examples/audio plugin host/Builds/Linux/Makefile b/examples/audio plugin host/Builds/LinuxMakefile/Makefile similarity index 88% rename from examples/audio plugin host/Builds/Linux/Makefile rename to examples/audio plugin host/Builds/LinuxMakefile/Makefile index f5a08ee5ff..bf01d4f43d 100644 --- a/examples/audio plugin host/Builds/Linux/Makefile +++ b/examples/audio plugin host/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I$(HOME)/SDKs/VST_SDK/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=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$(HOME)/SDKs/VST_SDK/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := Plugin\ Host JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + 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) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I$(HOME)/SDKs/VST_SDK/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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$(HOME)/SDKs/VST_SDK/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := Plugin\ Host JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -Os $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + 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) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -198,7 +198,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning Plugin Host diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj index 74bb89996a..b468cde3b1 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Plugin Host true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Plugin Host true diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj index 218fe9bd6f..0e8d34c089 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Plugin Host true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Plugin Host true diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj index 4a8cbdc434..f8f5f83681 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Plugin Host true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Plugin Host true diff --git a/examples/audio plugin host/Plugin Host.jucer b/examples/audio plugin host/Plugin Host.jucer index 44d23bc474..ef31fb7a54 100644 --- a/examples/audio plugin host/Plugin Host.jucer +++ b/examples/audio plugin host/Plugin Host.jucer @@ -2,7 +2,7 @@ diff --git a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer index 26439311cc..f9456024f6 100644 --- a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer +++ b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer @@ -2,7 +2,7 @@ diff --git a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile index 59f44d0a8e..eab9277d02 100644 --- a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile +++ b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := AudioPerformanceTest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := AudioPerformanceTest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + 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 webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -150,7 +150,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning AudioPerformanceTest diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj index d46d2a368b..3105fad17b 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ AudioPerformanceTest true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ AudioPerformanceTest true diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile index 7f10d3d2d0..a282a48029 100644 --- a/extras/Projucer/Builds/LinuxMakefile/Makefile +++ b/extras/Projucer/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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=5.0.1 -DJUCE_APP_VERSION_HEX=0x50001 $(shell pkg-config --cflags freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 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=5.0.2 -DJUCE_APP_VERSION_HEX=0x50002 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := Projucer JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 -std=c++11 $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.0.1 -DJUCE_APP_VERSION_HEX=0x50001 $(shell pkg-config --cflags freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.0.2 -DJUCE_APP_VERSION_HEX=0x50002 $(shell pkg-config --cflags freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := Projucer JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -std=c++11 $(CFLAGS) JUCE_CXXFLAGS += $(CXXFLAGS) $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) - JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden $(shell pkg-config --libs freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -420,7 +420,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors freetype2 libcurl x11 xext xinerama clean: @echo Cleaning Projucer diff --git a/extras/Projucer/Builds/MacOSX/Info-App.plist b/extras/Projucer/Builds/MacOSX/Info-App.plist index 74bef0a326..ab9f07f801 100644 --- a/extras/Projucer/Builds/MacOSX/Info-App.plist +++ b/extras/Projucer/Builds/MacOSX/Info-App.plist @@ -33,9 +33,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 5.0.1 + 5.0.2 CFBundleVersion - 5.0.1 + 5.0.2 NSHumanReadableCopyright ROLI Ltd. NSHighResolutionCapable diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index 64ab2cb575..e8970d656f 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -739,8 +739,8 @@ "_DEBUG=1", "DEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=5.0.1", - "JUCE_APP_VERSION_HEX=0x50001", + "JUCE_APP_VERSION=5.0.2", + "JUCE_APP_VERSION_HEX=0x50002", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -771,8 +771,8 @@ "_NDEBUG=1", "NDEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=5.0.1", - "JUCE_APP_VERSION_HEX=0x50001", + "JUCE_APP_VERSION=5.0.2", + "JUCE_APP_VERSION_HEX=0x50002", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj index 49807da273..a483f0f93d 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Projucer true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Projucer true @@ -68,7 +68,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=5.0.2;JUCE_APP_VERSION_HEX=0x50002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -107,7 +107,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=5.0.2;JUCE_APP_VERSION_HEX=0x50002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Projucer/Builds/VisualStudio2013/resources.rc b/extras/Projucer/Builds/VisualStudio2013/resources.rc index 874ff63e17..c6c0009b43 100644 --- a/extras/Projucer/Builds/VisualStudio2013/resources.rc +++ b/extras/Projucer/Builds/VisualStudio2013/resources.rc @@ -7,7 +7,7 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 5,0,1,0 +FILEVERSION 5,0,2,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -15,9 +15,9 @@ BEGIN BEGIN VALUE "CompanyName", "ROLI Ltd.\0" VALUE "FileDescription", "Projucer\0" - VALUE "FileVersion", "5.0.1\0" + VALUE "FileVersion", "5.0.2\0" VALUE "ProductName", "Projucer\0" - VALUE "ProductVersion", "5.0.1\0" + VALUE "ProductVersion", "5.0.2\0" END END diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj index feb44f5127..27eeee228e 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Projucer true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Projucer true @@ -68,7 +68,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=5.0.2;JUCE_APP_VERSION_HEX=0x50002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -107,7 +107,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=5.0.2;JUCE_APP_VERSION_HEX=0x50002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Projucer/Builds/VisualStudio2015/resources.rc b/extras/Projucer/Builds/VisualStudio2015/resources.rc index 874ff63e17..c6c0009b43 100644 --- a/extras/Projucer/Builds/VisualStudio2015/resources.rc +++ b/extras/Projucer/Builds/VisualStudio2015/resources.rc @@ -7,7 +7,7 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 5,0,1,0 +FILEVERSION 5,0,2,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -15,9 +15,9 @@ BEGIN BEGIN VALUE "CompanyName", "ROLI Ltd.\0" VALUE "FileDescription", "Projucer\0" - VALUE "FileVersion", "5.0.1\0" + VALUE "FileVersion", "5.0.2\0" VALUE "ProductName", "Projucer\0" - VALUE "ProductVersion", "5.0.1\0" + VALUE "ProductVersion", "5.0.2\0" END END diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj index 894564e817..a375503921 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Projucer true - $(SolutionDir)\$(Platform)\$(Configuration)\App\ + $(SolutionDir)$(Platform)\$(Configuration)\App\ $(Platform)\$(Configuration)\App\ Projucer true @@ -68,7 +68,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=5.0.2;JUCE_APP_VERSION_HEX=0x50002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -107,7 +107,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=5.0.2;JUCE_APP_VERSION_HEX=0x50002;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Projucer/Builds/VisualStudio2017/resources.rc b/extras/Projucer/Builds/VisualStudio2017/resources.rc index 874ff63e17..c6c0009b43 100644 --- a/extras/Projucer/Builds/VisualStudio2017/resources.rc +++ b/extras/Projucer/Builds/VisualStudio2017/resources.rc @@ -7,7 +7,7 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 5,0,1,0 +FILEVERSION 5,0,2,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -15,9 +15,9 @@ BEGIN BEGIN VALUE "CompanyName", "ROLI Ltd.\0" VALUE "FileDescription", "Projucer\0" - VALUE "FileVersion", "5.0.1\0" + VALUE "FileVersion", "5.0.2\0" VALUE "ProductName", "Projucer\0" - VALUE "ProductVersion", "5.0.1\0" + VALUE "ProductVersion", "5.0.2\0" END END diff --git a/extras/Projucer/JuceLibraryCode/JuceHeader.h b/extras/Projucer/JuceLibraryCode/JuceHeader.h index 9447b34bf1..9cfe22ab40 100644 --- a/extras/Projucer/JuceLibraryCode/JuceHeader.h +++ b/extras/Projucer/JuceLibraryCode/JuceHeader.h @@ -34,7 +34,7 @@ namespace ProjectInfo { const char* const projectName = "Projucer"; - const char* const versionString = "5.0.1"; - const int versionNumber = 0x50001; + const char* const versionString = "5.0.2"; + const int versionNumber = 0x50002; } #endif diff --git a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile index bc20bac32f..23659c8646 100644 --- a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile +++ b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile @@ -33,13 +33,13 @@ 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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + 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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_CONSOLEAPP := UnitTestRunner JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/X11R6/lib/ $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -54,13 +54,13 @@ 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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + 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 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_CONSOLEAPP := UnitTestRunner JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(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 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -lGL -ldl -lpthread -lrt $(LDFLAGS) + 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 webkit2gtk-4.0 gtk+-x11-3.0) -lGL -ldl -lpthread -lrt $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif @@ -168,7 +168,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ check-pkg-config: @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama + @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama clean: @echo Cleaning UnitTestRunner diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj index ee82c6ae87..69d5b9e463 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj @@ -44,11 +44,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\ConsoleApp\ + $(SolutionDir)$(Platform)\$(Configuration)\ConsoleApp\ $(Platform)\$(Configuration)\ConsoleApp\ UnitTestRunner true - $(SolutionDir)\$(Platform)\$(Configuration)\ConsoleApp\ + $(SolutionDir)$(Platform)\$(Configuration)\ConsoleApp\ $(Platform)\$(Configuration)\ConsoleApp\ UnitTestRunner true diff --git a/extras/UnitTestRunner/UnitTestRunner.jucer b/extras/UnitTestRunner/UnitTestRunner.jucer index 51cd3a7465..8d73f3c07a 100644 --- a/extras/UnitTestRunner/UnitTestRunner.jucer +++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -2,7 +2,7 @@ diff --git a/extras/binarybuilder/BinaryBuilder.jucer b/extras/binarybuilder/BinaryBuilder.jucer index 6ceee3e7d1..abb4db7261 100644 --- a/extras/binarybuilder/BinaryBuilder.jucer +++ b/extras/binarybuilder/BinaryBuilder.jucer @@ -1,7 +1,7 @@ diff --git a/extras/binarybuilder/Builds/Linux/Makefile b/extras/binarybuilder/Builds/LinuxMakefile/Makefile similarity index 94% rename from extras/binarybuilder/Builds/Linux/Makefile rename to extras/binarybuilder/Builds/LinuxMakefile/Makefile index 7442b0ed86..db490d072a 100644 --- a/extras/binarybuilder/Builds/Linux/Makefile +++ b/extras/binarybuilder/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_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_CONSOLEAPP := BinaryBuilder @@ -54,7 +54,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_7346DA2A=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_CONSOLEAPP := BinaryBuilder diff --git a/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj b/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj index a60407b294..e48fb4534a 100644 --- a/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj +++ b/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .exe - $(SolutionDir)\$(Platform)\$(Configuration)\ConsoleApp\ + $(SolutionDir)$(Platform)\$(Configuration)\ConsoleApp\ $(Platform)\$(Configuration)\ConsoleApp\ BinaryBuilder true - $(SolutionDir)\$(Platform)\$(Configuration)\ConsoleApp\ + $(SolutionDir)$(Platform)\$(Configuration)\ConsoleApp\ $(Platform)\$(Configuration)\ConsoleApp\ BinaryBuilder true diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj index 11074411d9..ce09d8fbd7 100644 --- a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj +++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>10.0.30319.1 .lib - $(SolutionDir)\$(Platform)\$(Configuration)\Static Library\ + $(SolutionDir)$(Platform)\$(Configuration)\Static Library\ $(Platform)\$(Configuration)\Static Library\ juce_dll true - $(SolutionDir)\$(Platform)\$(Configuration)\Static Library\ + $(SolutionDir)$(Platform)\$(Configuration)\Static Library\ $(Platform)\$(Configuration)\Static Library\ juce_dll true diff --git a/extras/windows dll/jucedll.jucer b/extras/windows dll/jucedll.jucer index 35a3619448..0600e88b12 100644 --- a/extras/windows dll/jucedll.jucer +++ b/extras/windows dll/jucedll.jucer @@ -1,7 +1,7 @@