From 37f0fdd0fa52c8302b2dd89eac94e9e504183dec Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Mon, 5 Nov 2018 17:14:45 +0000 Subject: [PATCH] Re-saved all projects --- .../DemoRunner/Builds/LinuxMakefile/Makefile | 10 ++++------ .../DemoRunner/JuceLibraryCode/AppConfig.h | 8 ++++---- .../Builds/LinuxMakefile/Makefile | 10 ++++------ .../JuceLibraryCode/AppConfig.h | 8 ++++---- extras/AudioPluginHost/AudioPluginHost.jucer | 18 +++++++++--------- .../Builds/LinuxMakefile/Makefile | 10 ++++------ .../JuceLibraryCode/AppConfig.h | 8 ++++---- .../Builds/LinuxMakefile/Makefile | 10 ++++------ .../Builds/LinuxMakefile/Makefile | 10 ++++------ .../JuceLibraryCode/AppConfig.h | 8 ++++---- extras/Projucer/Builds/LinuxMakefile/Makefile | 10 ++++------ .../Builds/LinuxMakefile/Makefile | 10 ++++------ .../UnitTestRunner/JuceLibraryCode/AppConfig.h | 8 ++++---- extras/WindowsDLL/JuceLibraryCode/AppConfig.h | 8 ++++---- 14 files changed, 61 insertions(+), 75 deletions(-) diff --git a/examples/DemoRunner/Builds/LinuxMakefile/Makefile b/examples/DemoRunner/Builds/LinuxMakefile/Makefile index 0bab1a5616..3518dac0ff 100644 --- a/examples/DemoRunner/Builds/LinuxMakefile/Makefile +++ b/examples/DemoRunner/Builds/LinuxMakefile/Makefile @@ -95,11 +95,13 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/include_juce_product_unlocking_8278fcdc.o \ $(JUCE_OBJDIR)/include_juce_video_be78589.o \ -.PHONY: clean all +.PHONY: clean all strip all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) -$(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) +$(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES) + @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 x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 libcurl @echo Linking "DemoRunner - App" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) @@ -236,10 +238,6 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ @echo "Compiling include_juce_video.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -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 x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 libcurl - clean: @echo Cleaning DemoRunner $(V_AT)$(CLEANCMD) diff --git a/examples/DemoRunner/JuceLibraryCode/AppConfig.h b/examples/DemoRunner/JuceLibraryCode/AppConfig.h index 995e25ffd1..295046259d 100644 --- a/examples/DemoRunner/JuceLibraryCode/AppConfig.h +++ b/examples/DemoRunner/JuceLibraryCode/AppConfig.h @@ -74,6 +74,10 @@ //============================================================================== // juce_audio_devices flags: +#ifndef JUCE_USE_WINRT_MIDI + //#define JUCE_USE_WINRT_MIDI 0 +#endif + #ifndef JUCE_ASIO //#define JUCE_ASIO 0 #endif @@ -110,10 +114,6 @@ //#define JUCE_USE_ANDROID_OPENSLES 0 #endif -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - #ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 #endif diff --git a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile index a0bcbd51fb..114cbfc4f9 100644 --- a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile +++ b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile @@ -81,11 +81,13 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/include_juce_gui_basics_e3f79785.o \ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o \ -.PHONY: clean all +.PHONY: clean all strip all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) -$(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) +$(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES) + @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 x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 libcurl @echo Linking "AudioPerformanceTest - App" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) @@ -152,10 +154,6 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ @echo "Compiling include_juce_gui_extra.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -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 x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 libcurl - clean: @echo Cleaning AudioPerformanceTest $(V_AT)$(CLEANCMD) diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h index e035cc6c64..79b8844d90 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h +++ b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h @@ -65,6 +65,10 @@ //============================================================================== // juce_audio_devices flags: +#ifndef JUCE_USE_WINRT_MIDI + //#define JUCE_USE_WINRT_MIDI 0 +#endif + #ifndef JUCE_ASIO //#define JUCE_ASIO 0 #endif @@ -101,10 +105,6 @@ //#define JUCE_USE_ANDROID_OPENSLES 0 #endif -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - #ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 #endif diff --git a/extras/AudioPluginHost/AudioPluginHost.jucer b/extras/AudioPluginHost/AudioPluginHost.jucer index 288c67de93..c5b5a390b6 100644 --- a/extras/AudioPluginHost/AudioPluginHost.jucer +++ b/extras/AudioPluginHost/AudioPluginHost.jucer @@ -7,7 +7,7 @@ companyCopyright="ROLI Ltd."> @@ -54,8 +54,8 @@ - + @@ -79,8 +79,8 @@ - + @@ -102,8 +102,8 @@ - + @@ -127,8 +127,8 @@ + microphonePermissionNeeded="1" iosBackgroundAudio="1" iosBackgroundBle="1" + smallIcon="c97aUr" bigIcon="c97aUr"> diff --git a/extras/AudioPluginHost/Builds/LinuxMakefile/Makefile b/extras/AudioPluginHost/Builds/LinuxMakefile/Makefile index 599324850f..a43b4166b9 100644 --- a/extras/AudioPluginHost/Builds/LinuxMakefile/Makefile +++ b/extras/AudioPluginHost/Builds/LinuxMakefile/Makefile @@ -90,11 +90,13 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o \ $(JUCE_OBJDIR)/include_juce_video_be78589.o \ -.PHONY: clean all +.PHONY: clean all strip all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) -$(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) +$(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES) + @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 x11 xext xinerama libcurl @echo Linking "AudioPluginHost - App" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) @@ -206,10 +208,6 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ @echo "Compiling include_juce_video.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -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 x11 xext xinerama libcurl - clean: @echo Cleaning AudioPluginHost $(V_AT)$(CLEANCMD) diff --git a/extras/AudioPluginHost/JuceLibraryCode/AppConfig.h b/extras/AudioPluginHost/JuceLibraryCode/AppConfig.h index 8194eb0fdf..2b5f6944d9 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/AppConfig.h +++ b/extras/AudioPluginHost/JuceLibraryCode/AppConfig.h @@ -70,6 +70,10 @@ //============================================================================== // juce_audio_devices flags: +#ifndef JUCE_USE_WINRT_MIDI + //#define JUCE_USE_WINRT_MIDI 0 +#endif + #ifndef JUCE_ASIO //#define JUCE_ASIO 0 #endif @@ -106,10 +110,6 @@ //#define JUCE_USE_ANDROID_OPENSLES 0 #endif -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - #ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 #endif diff --git a/extras/BinaryBuilder/Builds/LinuxMakefile/Makefile b/extras/BinaryBuilder/Builds/LinuxMakefile/Makefile index f5c11dba43..da7f25873b 100644 --- a/extras/BinaryBuilder/Builds/LinuxMakefile/Makefile +++ b/extras/BinaryBuilder/Builds/LinuxMakefile/Makefile @@ -71,11 +71,13 @@ OBJECTS_CONSOLEAPP := \ $(JUCE_OBJDIR)/Main_90ebc5c2.o \ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o \ -.PHONY: clean all +.PHONY: clean all strip all : $(JUCE_OUTDIR)/$(JUCE_TARGET_CONSOLEAPP) -$(JUCE_OUTDIR)/$(JUCE_TARGET_CONSOLEAPP) : check-pkg-config $(OBJECTS_CONSOLEAPP) $(RESOURCES) +$(JUCE_OUTDIR)/$(JUCE_TARGET_CONSOLEAPP) : $(OBJECTS_CONSOLEAPP) $(RESOURCES) + @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } + @pkg-config --print-errors libcurl @echo Linking "BinaryBuilder - ConsoleApp" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) @@ -92,10 +94,6 @@ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o: ../../JuceLibraryCode/include_juce_ @echo "Compiling include_juce_core.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_CONSOLEAPP) $(JUCE_CFLAGS_CONSOLEAPP) -o "$@" -c "$<" -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 libcurl - clean: @echo Cleaning BinaryBuilder $(V_AT)$(CLEANCMD) diff --git a/extras/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile b/extras/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile index d3ea395018..849e181c8e 100644 --- a/extras/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile +++ b/extras/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile @@ -85,11 +85,13 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o \ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o \ -.PHONY: clean all +.PHONY: clean all strip all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) -$(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) +$(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES) + @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 x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 libcurl @echo Linking "NetworkGraphicsDemo - App" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) @@ -176,10 +178,6 @@ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o: ../../JuceLibraryCode/include_juce_o @echo "Compiling include_juce_osc.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -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 x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 libcurl - clean: @echo Cleaning NetworkGraphicsDemo $(V_AT)$(CLEANCMD) diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h b/extras/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h index 432a2308ce..ac4e6435cd 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h @@ -68,6 +68,10 @@ //============================================================================== // juce_audio_devices flags: +#ifndef JUCE_USE_WINRT_MIDI + //#define JUCE_USE_WINRT_MIDI 0 +#endif + #ifndef JUCE_ASIO //#define JUCE_ASIO 0 #endif @@ -104,10 +108,6 @@ //#define JUCE_USE_ANDROID_OPENSLES 0 #endif -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - #ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 #endif diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile index 49693e7808..f3410b5358 100644 --- a/extras/Projucer/Builds/LinuxMakefile/Makefile +++ b/extras/Projucer/Builds/LinuxMakefile/Makefile @@ -130,11 +130,13 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/include_juce_gui_basics_e3f79785.o \ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o \ -.PHONY: clean all +.PHONY: clean all strip all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) -$(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) +$(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES) + @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } + @pkg-config --print-errors freetype2 x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 libcurl @echo Linking "Projucer - App" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) @@ -446,10 +448,6 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ @echo "Compiling include_juce_gui_extra.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" -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 x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 libcurl - clean: @echo Cleaning Projucer $(V_AT)$(CLEANCMD) diff --git a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile index 6d5bade061..7e387636cf 100644 --- a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile +++ b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile @@ -89,11 +89,13 @@ OBJECTS_CONSOLEAPP := \ $(JUCE_OBJDIR)/include_juce_product_unlocking_8278fcdc.o \ $(JUCE_OBJDIR)/include_juce_video_be78589.o \ -.PHONY: clean all +.PHONY: clean all strip all : $(JUCE_OUTDIR)/$(JUCE_TARGET_CONSOLEAPP) -$(JUCE_OUTDIR)/$(JUCE_TARGET_CONSOLEAPP) : check-pkg-config $(OBJECTS_CONSOLEAPP) $(RESOURCES) +$(JUCE_OUTDIR)/$(JUCE_TARGET_CONSOLEAPP) : $(OBJECTS_CONSOLEAPP) $(RESOURCES) + @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 x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 libcurl @echo Linking "UnitTestRunner - ConsoleApp" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) @@ -200,10 +202,6 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_ @echo "Compiling include_juce_video.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_CONSOLEAPP) $(JUCE_CFLAGS_CONSOLEAPP) -o "$@" -c "$<" -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 x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0 libcurl - clean: @echo Cleaning UnitTestRunner $(V_AT)$(CLEANCMD) diff --git a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h index e7790b7802..7d4e58bc06 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h +++ b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h @@ -73,6 +73,10 @@ //============================================================================== // juce_audio_devices flags: +#ifndef JUCE_USE_WINRT_MIDI + //#define JUCE_USE_WINRT_MIDI 0 +#endif + #ifndef JUCE_ASIO //#define JUCE_ASIO 0 #endif @@ -109,10 +113,6 @@ //#define JUCE_USE_ANDROID_OPENSLES 0 #endif -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - #ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 #endif diff --git a/extras/WindowsDLL/JuceLibraryCode/AppConfig.h b/extras/WindowsDLL/JuceLibraryCode/AppConfig.h index ac0018e231..43dadbd22e 100644 --- a/extras/WindowsDLL/JuceLibraryCode/AppConfig.h +++ b/extras/WindowsDLL/JuceLibraryCode/AppConfig.h @@ -68,6 +68,10 @@ //============================================================================== // juce_audio_devices flags: +#ifndef JUCE_USE_WINRT_MIDI + //#define JUCE_USE_WINRT_MIDI 0 +#endif + #ifndef JUCE_ASIO //#define JUCE_ASIO 0 #endif @@ -104,10 +108,6 @@ //#define JUCE_USE_ANDROID_OPENSLES 0 #endif -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - #ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 #endif