diff --git a/examples/AUv3Synth/JuceLibraryCode/AppConfig.h b/examples/AUv3Synth/JuceLibraryCode/AppConfig.h index 9fe27141c5..5f5597899b 100644 --- a/examples/AUv3Synth/JuceLibraryCode/AppConfig.h +++ b/examples/AUv3Synth/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -98,6 +98,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/AnalyticsCollection/Builds/Android/app/CMakeLists.txt b/examples/AnalyticsCollection/Builds/Android/app/CMakeLists.txt index 525b985c00..f593b2665a 100644 --- a/examples/AnalyticsCollection/Builds/Android/app/CMakeLists.txt +++ b/examples/AnalyticsCollection/Builds/Android/app/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( AFTER enable_language(ASM) -IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") -ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE") +ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") -ELSE(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) -ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_library( ${BINARY_NAME} diff --git a/examples/AnalyticsCollection/Builds/Android/app/build.gradle b/examples/AnalyticsCollection/Builds/Android/app/build.gradle index 04072da9ab..466c0c1f01 100644 --- a/examples/AnalyticsCollection/Builds/Android/app/build.gradle +++ b/examples/AnalyticsCollection/Builds/Android/app/build.gradle @@ -54,7 +54,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" + arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" } } @@ -63,7 +63,7 @@ android { release_ { externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" + arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" } } diff --git a/examples/AnalyticsCollection/Builds/LinuxMakefile/Makefile b/examples/AnalyticsCollection/Builds/LinuxMakefile/Makefile index 5c03d8aa78..7db3f7f593 100644 --- a/examples/AnalyticsCollection/Builds/LinuxMakefile/Makefile +++ b/examples/AnalyticsCollection/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCE_USE_CURL=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) -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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := AnalyticsCollection JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCE_USE_CURL=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) -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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := AnalyticsCollection JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -85,7 +87,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/AnalyticsCollection/JuceLibraryCode/AppConfig.h b/examples/AnalyticsCollection/JuceLibraryCode/AppConfig.h index 6e45e1edbf..8b9537adf5 100644 --- a/examples/AnalyticsCollection/JuceLibraryCode/AppConfig.h +++ b/examples/AnalyticsCollection/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 diff --git a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h index cbc91df3ac..44dd6c544c 100644 --- a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -99,6 +99,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h index 835b6ff6b2..3a5546d5aa 100644 --- a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile index ac2a8333c5..5a499edfe3 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := BlocksDrawing JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := BlocksDrawing JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -93,7 +95,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h index 2fac4519ce..e2129f1adf 100644 --- a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -99,6 +99,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile index 3af3c98686..ff80ea97a9 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := BlocksMonitor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := BlocksMonitor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -92,7 +94,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h index 2fac4519ce..e2129f1adf 100644 --- a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -99,6 +99,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile b/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile index 3cf0bb5eca..5df43bd50c 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile +++ b/examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := BlocksSynth JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := BlocksSynth JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -92,7 +94,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h index 2fac4519ce..e2129f1adf 100644 --- a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -99,6 +99,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/BouncingBallWavetableDemo/Builds/LinuxMakefile/Makefile b/examples/BouncingBallWavetableDemo/Builds/LinuxMakefile/Makefile index 74d4b0c845..1b3b548d07 100644 --- a/examples/BouncingBallWavetableDemo/Builds/LinuxMakefile/Makefile +++ b/examples/BouncingBallWavetableDemo/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := WavetableBouncingEditor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := WavetableBouncingEditor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -Os $(CFLAGS) @@ -93,7 +95,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/MainComponent_a6ffb4a5.o: ../../Source/MainComponent.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h index a90a2dc3e9..d561af9bee 100644 --- a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h +++ b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -99,6 +99,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h b/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h index 636584d1cb..acdd7bb40d 100644 --- a/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h +++ b/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_SharedCode.vcxproj b/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_SharedCode.vcxproj index f019b7ed8b..82bd98b8a8 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_SharedCode.vcxproj +++ b/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_SharedCode.vcxproj @@ -998,6 +998,9 @@ true + + true + true @@ -2266,12 +2269,14 @@ + + diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_SharedCode.vcxproj.filters b/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_SharedCode.vcxproj.filters index 5cb4e1c9be..3afd4da8d9 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_SharedCode.vcxproj.filters +++ b/examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_SharedCode.vcxproj.filters @@ -1306,6 +1306,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3465,6 +3468,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3483,6 +3489,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj b/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj index 9878463f02..e314811eee 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj +++ b/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj @@ -999,6 +999,9 @@ true + + true + true @@ -2267,12 +2270,14 @@ + + diff --git a/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj.filters b/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj.filters index 6de27094ed..5c502d210d 100644 --- a/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj.filters +++ b/examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj.filters @@ -1306,6 +1306,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3465,6 +3468,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3483,6 +3489,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors diff --git a/examples/DSP module plugin demo/JuceLibraryCode/AppConfig.h b/examples/DSP module plugin demo/JuceLibraryCode/AppConfig.h index 31d8d119c3..945a6974c9 100644 --- a/examples/DSP module plugin demo/JuceLibraryCode/AppConfig.h +++ b/examples/DSP module plugin demo/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/DSPDemo/Builds/LinuxMakefile/Makefile b/examples/DSPDemo/Builds/LinuxMakefile/Makefile index 8e7bf7b6cf..3564a29da2 100644 --- a/examples/DSPDemo/Builds/LinuxMakefile/Makefile +++ b/examples/DSPDemo/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := DSPDemo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := DSPDemo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -102,7 +104,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/ConvolutionDemo_ecad51bd.o: ../../Source/Demos/ConvolutionDemo.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj b/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj index ad0ab5649c..577da3d6eb 100644 --- a/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj +++ b/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj @@ -935,6 +935,9 @@ true + + true + true @@ -2126,12 +2129,14 @@ + + diff --git a/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj.filters b/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj.filters index 899cbe4f31..05c604593c 100644 --- a/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj.filters +++ b/examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj.filters @@ -1225,6 +1225,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3210,6 +3213,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3228,6 +3234,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors diff --git a/examples/DSPDemo/JuceLibraryCode/AppConfig.h b/examples/DSPDemo/JuceLibraryCode/AppConfig.h index e24fe2a763..391e1fb061 100644 --- a/examples/DSPDemo/JuceLibraryCode/AppConfig.h +++ b/examples/DSPDemo/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 1 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -98,6 +98,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/Demo/Builds/Android/app/CMakeLists.txt b/examples/Demo/Builds/Android/app/CMakeLists.txt index ee562106a1..3228698b21 100644 --- a/examples/Demo/Builds/Android/app/CMakeLists.txt +++ b/examples/Demo/Builds/Android/app/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( AFTER enable_language(ASM) -IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") -ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE") +ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") -ELSE(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) -ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_library( ${BINARY_NAME} diff --git a/examples/Demo/Builds/Android/app/build.gradle b/examples/Demo/Builds/Android/app/build.gradle index 4f2b7ec282..5853fc0ea0 100644 --- a/examples/Demo/Builds/Android/app/build.gradle +++ b/examples/Demo/Builds/Android/app/build.gradle @@ -54,7 +54,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" + arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" } } @@ -63,7 +63,7 @@ android { release_ { externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" + arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" } } diff --git a/examples/Demo/Builds/LinuxMakefile/Makefile b/examples/Demo/Builds/LinuxMakefile/Makefile index 2dc44157e5..ed5592eb6c 100644 --- a/examples/Demo/Builds/LinuxMakefile/Makefile +++ b/examples/Demo/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := JuceDemo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := JuceDemo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -136,7 +138,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj b/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj index 2ff6eb338b..c3e3e9982c 100644 --- a/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj +++ b/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj @@ -343,7 +343,7 @@ INFOPLIST_FILE = Info-App.plist; INFOPLIST_PREPROCESS = NO; INSTALL_PATH = "$(HOME)/Applications"; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.6; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wstrict-aliasing -Wconversion -Wsign-compare -Woverloaded-virtual -Wextra-semi"; PRODUCT_BUNDLE_IDENTIFIER = com.roli.JuceDemo; diff --git a/examples/Demo/JuceLibraryCode/AppConfig.h b/examples/Demo/JuceLibraryCode/AppConfig.h index fa15111208..7bae2d5680 100644 --- a/examples/Demo/JuceLibraryCode/AppConfig.h +++ b/examples/Demo/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -101,6 +101,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/HelloWorld/Builds/LinuxMakefile/Makefile b/examples/HelloWorld/Builds/LinuxMakefile/Makefile index a7daf013f7..d19e40606d 100644 --- a/examples/HelloWorld/Builds/LinuxMakefile/Makefile +++ b/examples/HelloWorld/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := HelloWorld JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := HelloWorld JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -Os $(CFLAGS) @@ -86,7 +88,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/HelloWorld/JuceLibraryCode/AppConfig.h b/examples/HelloWorld/JuceLibraryCode/AppConfig.h index 636584d1cb..acdd7bb40d 100644 --- a/examples/HelloWorld/JuceLibraryCode/AppConfig.h +++ b/examples/HelloWorld/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 diff --git a/examples/InAppPurchase/Builds/Android/app/CMakeLists.txt b/examples/InAppPurchase/Builds/Android/app/CMakeLists.txt index fb1a5ec71f..e8b3f21041 100644 --- a/examples/InAppPurchase/Builds/Android/app/CMakeLists.txt +++ b/examples/InAppPurchase/Builds/Android/app/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( AFTER enable_language(ASM) -IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") -ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE") +ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") -ELSE(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) -ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_library( ${BINARY_NAME} diff --git a/examples/InAppPurchase/Builds/Android/app/build.gradle b/examples/InAppPurchase/Builds/Android/app/build.gradle index 51cf12f394..7eb1117117 100644 --- a/examples/InAppPurchase/Builds/Android/app/build.gradle +++ b/examples/InAppPurchase/Builds/Android/app/build.gradle @@ -54,7 +54,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" + arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" } } @@ -63,7 +63,7 @@ android { release_ { externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" + arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" } } diff --git a/examples/InAppPurchase/JuceLibraryCode/AppConfig.h b/examples/InAppPurchase/JuceLibraryCode/AppConfig.h index b77eb827fd..91f129ac82 100644 --- a/examples/InAppPurchase/JuceLibraryCode/AppConfig.h +++ b/examples/InAppPurchase/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 1 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/MPETest/Builds/LinuxMakefile/Makefile b/examples/MPETest/Builds/LinuxMakefile/Makefile index ecaf0fa7d3..d948b6a105 100644 --- a/examples/MPETest/Builds/LinuxMakefile/Makefile +++ b/examples/MPETest/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := MPETest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := MPETest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -93,7 +95,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/MPETest/JuceLibraryCode/AppConfig.h b/examples/MPETest/JuceLibraryCode/AppConfig.h index 835b6ff6b2..3a5546d5aa 100644 --- a/examples/MPETest/JuceLibraryCode/AppConfig.h +++ b/examples/MPETest/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/MidiTest/Builds/Android/app/CMakeLists.txt b/examples/MidiTest/Builds/Android/app/CMakeLists.txt index 99d9f5ca76..bc12abc848 100644 --- a/examples/MidiTest/Builds/Android/app/CMakeLists.txt +++ b/examples/MidiTest/Builds/Android/app/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( AFTER enable_language(ASM) -IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") -ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE") +ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") -ELSE(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) -ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_library( ${BINARY_NAME} diff --git a/examples/MidiTest/Builds/Android/app/build.gradle b/examples/MidiTest/Builds/Android/app/build.gradle index 09823509e6..a4a5bee85b 100644 --- a/examples/MidiTest/Builds/Android/app/build.gradle +++ b/examples/MidiTest/Builds/Android/app/build.gradle @@ -54,7 +54,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" + arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" } } @@ -63,7 +63,7 @@ android { release_ { externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" + arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" } } diff --git a/examples/MidiTest/Builds/LinuxMakefile/Makefile b/examples/MidiTest/Builds/LinuxMakefile/Makefile index 23bccc9e7a..6b85168936 100644 --- a/examples/MidiTest/Builds/LinuxMakefile/Makefile +++ b/examples/MidiTest/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := MidiTest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := MidiTest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -91,7 +93,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/MidiTest/JuceLibraryCode/AppConfig.h b/examples/MidiTest/JuceLibraryCode/AppConfig.h index 3297659b93..82aef10c2c 100644 --- a/examples/MidiTest/JuceLibraryCode/AppConfig.h +++ b/examples/MidiTest/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -97,6 +97,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index 2df00b80a2..ce6754cecf 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( AFTER enable_language(ASM) -IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DJUCE_DEBUG=0" "-DDEBUG=1" "-D_DEBUG=1") -ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE") +ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") -ELSE(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) -ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_library( ${BINARY_NAME} diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle b/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle index 01d87255a1..ae4b69c2db 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle @@ -54,7 +54,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-Ofast", "-DCMAKE_C_FLAGS_DEBUG=-Ofast" + arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-Ofast", "-DCMAKE_C_FLAGS_DEBUG=-Ofast" } } @@ -63,7 +63,7 @@ android { release_ { externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" + arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" } } diff --git a/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile b/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile index f0107836b3..b56bc9085e 100644 --- a/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile +++ b/examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := JUCE\ Network\ Graphics\ Demo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := JUCE\ Network\ Graphics\ Demo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -94,7 +96,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h b/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h index 245597d201..597c9ab5b9 100644 --- a/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/OSCMonitor/Builds/LinuxMakefile/Makefile b/examples/OSCMonitor/Builds/LinuxMakefile/Makefile index 6a74954498..069d57dcdf 100644 --- a/examples/OSCMonitor/Builds/LinuxMakefile/Makefile +++ b/examples/OSCMonitor/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := OSCMonitor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := OSCMonitor JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -93,7 +95,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h index d43fda9dc7..82a462cb6d 100644 --- a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt index 04427c6c97..349195d086 100644 --- a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( AFTER enable_language(ASM) -IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") -ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE") +ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") -ELSE(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) -ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_library( ${BINARY_NAME} diff --git a/examples/OSCReceiver/Builds/Android/app/build.gradle b/examples/OSCReceiver/Builds/Android/app/build.gradle index 661969e574..63f3a13d77 100644 --- a/examples/OSCReceiver/Builds/Android/app/build.gradle +++ b/examples/OSCReceiver/Builds/Android/app/build.gradle @@ -54,7 +54,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" + arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" } } @@ -63,7 +63,7 @@ android { release_ { externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" + arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" } } diff --git a/examples/OSCReceiver/Builds/LinuxMakefile/Makefile b/examples/OSCReceiver/Builds/LinuxMakefile/Makefile index 08e6364489..d582b0c71a 100644 --- a/examples/OSCReceiver/Builds/LinuxMakefile/Makefile +++ b/examples/OSCReceiver/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := OSCReceiver JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := OSCReceiver JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -87,7 +89,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/OSCReceiver/JuceLibraryCode/AppConfig.h b/examples/OSCReceiver/JuceLibraryCode/AppConfig.h index 0b8c06a249..d7fe888d6e 100644 --- a/examples/OSCReceiver/JuceLibraryCode/AppConfig.h +++ b/examples/OSCReceiver/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 diff --git a/examples/OSCSender/Builds/Android/app/CMakeLists.txt b/examples/OSCSender/Builds/Android/app/CMakeLists.txt index e969323173..82182bba32 100644 --- a/examples/OSCSender/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCSender/Builds/Android/app/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( AFTER enable_language(ASM) -IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") -ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE") +ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") -ELSE(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) -ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_library( ${BINARY_NAME} diff --git a/examples/OSCSender/Builds/Android/app/build.gradle b/examples/OSCSender/Builds/Android/app/build.gradle index d87b6d2fda..b706d797ce 100644 --- a/examples/OSCSender/Builds/Android/app/build.gradle +++ b/examples/OSCSender/Builds/Android/app/build.gradle @@ -54,7 +54,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" + arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" } } @@ -63,7 +63,7 @@ android { release_ { externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" + arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" } } diff --git a/examples/OSCSender/Builds/LinuxMakefile/Makefile b/examples/OSCSender/Builds/LinuxMakefile/Makefile index 5d23ca0297..92140dc5a4 100644 --- a/examples/OSCSender/Builds/LinuxMakefile/Makefile +++ b/examples/OSCSender/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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) -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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := OSCSender JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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) -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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := OSCSender JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -85,7 +87,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/OSCSender/JuceLibraryCode/AppConfig.h b/examples/OSCSender/JuceLibraryCode/AppConfig.h index 0c9e6ad80c..d729998624 100644 --- a/examples/OSCSender/JuceLibraryCode/AppConfig.h +++ b/examples/OSCSender/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 diff --git a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h index cbc91df3ac..44dd6c544c 100644 --- a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -99,6 +99,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h b/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h index 3297659b93..82aef10c2c 100644 --- a/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -97,6 +97,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h index c3963d4f4d..f7018fa92f 100644 --- a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h index 157a337615..e4abb75792 100644 --- a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h index 874aaf986d..9f39628910 100644 --- a/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -98,6 +98,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h index aa8bb36c67..99a3518a70 100644 --- a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h index c10b904a77..94db85fcc3 100644 --- a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h index 203fb76c64..cdd3ff1de5 100644 --- a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/PushNotificationsDemo/Builds/Android/app/CMakeLists.txt b/examples/PushNotificationsDemo/Builds/Android/app/CMakeLists.txt index 20cae2f53e..a9b3132d64 100644 --- a/examples/PushNotificationsDemo/Builds/Android/app/CMakeLists.txt +++ b/examples/PushNotificationsDemo/Builds/Android/app/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( AFTER enable_language(ASM) -IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") -ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE") +ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") -ELSE(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) -ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_library( ${BINARY_NAME} diff --git a/examples/PushNotificationsDemo/Builds/Android/app/build.gradle b/examples/PushNotificationsDemo/Builds/Android/app/build.gradle index 4223eb37a9..516f16d2d2 100644 --- a/examples/PushNotificationsDemo/Builds/Android/app/build.gradle +++ b/examples/PushNotificationsDemo/Builds/Android/app/build.gradle @@ -54,7 +54,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" + arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" } } @@ -63,7 +63,7 @@ android { release_ { externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" + arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" } } diff --git a/examples/PushNotificationsDemo/JuceLibraryCode/AppConfig.h b/examples/PushNotificationsDemo/JuceLibraryCode/AppConfig.h index 8bec10662f..bda0308d34 100644 --- a/examples/PushNotificationsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/PushNotificationsDemo/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -98,6 +98,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj index a2b2c889d9..5814676532 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj @@ -925,6 +925,9 @@ true + + true + true @@ -2113,12 +2116,14 @@ + + diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters index 9e5dc04878..063992b55f 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters @@ -1189,6 +1189,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3165,6 +3168,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3183,6 +3189,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj index 94fa2c733b..ecd021e215 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj @@ -925,6 +925,9 @@ true + + true + true @@ -2113,12 +2116,14 @@ + + diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters index 26d807fea3..b7ce88396c 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters @@ -1189,6 +1189,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3165,6 +3168,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3183,6 +3189,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors diff --git a/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h b/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h index eb24028469..c4c5ee3f28 100644 --- a/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h +++ b/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -98,6 +98,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt index 186859e942..562bcc46df 100644 --- a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt +++ b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( AFTER enable_language(ASM) -IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") -ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE") +ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") -ELSE(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) -ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_library( ${BINARY_NAME} diff --git a/examples/audio plugin demo/Builds/Android/app/build.gradle b/examples/audio plugin demo/Builds/Android/app/build.gradle index 6d1d9db5ad..3414aa635a 100644 --- a/examples/audio plugin demo/Builds/Android/app/build.gradle +++ b/examples/audio plugin demo/Builds/Android/app/build.gradle @@ -54,7 +54,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" + arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" } } @@ -63,7 +63,7 @@ android { release_ { externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" + arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-O3", "-DCMAKE_C_FLAGS_RELEASE=-O3" } } diff --git a/examples/audio plugin demo/Builds/LinuxMakefile/Makefile b/examples/audio plugin demo/Builds/LinuxMakefile/Makefile index 70e739166f..868f5bec78 100644 --- a/examples/audio plugin demo/Builds/LinuxMakefile/Makefile +++ b/examples/audio plugin demo/Builds/LinuxMakefile/Makefile @@ -43,6 +43,7 @@ ifeq ($(CONFIG),Debug) JUCE_TARGET_VST := JuceDemoPlugin.so JUCE_CPPFLAGS_STANDALONE_PLUGIN := -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=1 + JUCE_LDFLAGS_STANDALONE_PLUGIN := -no-pie JUCE_TARGET_STANDALONE_PLUGIN := JuceDemoPlugin JUCE_CPPFLAGS_SHARED_CODE := -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=1 -DJUCE_SHARED_CODE=1 @@ -73,6 +74,7 @@ ifeq ($(CONFIG),Release) JUCE_TARGET_VST := JuceDemoPlugin.so JUCE_CPPFLAGS_STANDALONE_PLUGIN := -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=1 + JUCE_LDFLAGS_STANDALONE_PLUGIN := -no-pie JUCE_TARGET_STANDALONE_PLUGIN := JuceDemoPlugin JUCE_CPPFLAGS_SHARED_CODE := -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=1 -DJUCE_SHARED_CODE=1 @@ -129,7 +131,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_STANDALONE_PLUGIN) : check-pkg-config $(OBJECTS_STA -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_STANDALONE_PLUGIN) $(OBJECTS_STANDALONE_PLUGIN) $(JUCE_OUTDIR)/$(JUCE_TARGET_SHARED_CODE) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_STANDALONE_PLUGIN) $(OBJECTS_STANDALONE_PLUGIN) $(JUCE_OUTDIR)/$(JUCE_TARGET_SHARED_CODE) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_STANDALONE_PLUGIN) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OUTDIR)/$(JUCE_TARGET_SHARED_CODE) : check-pkg-config $(OBJECTS_SHARED_CODE) $(RESOURCES) @echo Linking "JuceDemoPlugin - Shared Code" diff --git a/examples/audio plugin demo/JuceLibraryCode/AppConfig.h b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h index 1f68648ae9..a56762943e 100644 --- a/examples/audio plugin demo/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -98,6 +98,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/examples/audio plugin host/Builds/LinuxMakefile/Makefile b/examples/audio plugin host/Builds/LinuxMakefile/Makefile index 2074df588d..ff2d9cefc4 100644 --- a/examples/audio plugin host/Builds/LinuxMakefile/Makefile +++ b/examples/audio plugin host/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := Plugin\ Host JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := Plugin\ Host JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -Os $(CFLAGS) @@ -98,7 +100,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/FilterGraph_62e9c017.o: ../../Source/FilterGraph.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/examples/audio plugin host/JuceLibraryCode/AppConfig.h b/examples/audio plugin host/JuceLibraryCode/AppConfig.h index 38617944dc..8b7b761beb 100644 --- a/examples/audio plugin host/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin host/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index e8e2dbc527..113c69a4b1 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -18,13 +18,13 @@ include_directories( AFTER enable_language(ASM) -IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") -ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE") +ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") -ELSE(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) -ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") +ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_library( ${BINARY_NAME} diff --git a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle index ce3dacaa1b..3707b70f3c 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle +++ b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle @@ -54,7 +54,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" + arguments "-DJUCE_BUILD_CONFIGURATION=DEBUG", "-DCMAKE_CXX_FLAGS_DEBUG=-O0", "-DCMAKE_C_FLAGS_DEBUG=-O0" } } @@ -66,7 +66,7 @@ android { } externalNativeBuild { cmake { - arguments "-DJUCE_BUILD_CONFIGFURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-Ofast", "-DCMAKE_C_FLAGS_RELEASE=-Ofast" + arguments "-DJUCE_BUILD_CONFIGURATION=RELEASE", "-DCMAKE_CXX_FLAGS_RELEASE=-Ofast", "-DCMAKE_C_FLAGS_RELEASE=-Ofast" } } diff --git a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile index 98916e6678..52c3d22167 100644 --- a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile +++ b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG),Debug) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := AudioPerformanceTest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -58,6 +59,7 @@ ifeq ($(CONFIG),Release) 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_LDFLAGS_APP := -no-pie JUCE_TARGET_APP := AudioPerformanceTest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) @@ -90,7 +92,7 @@ $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : check-pkg-config $(OBJECTS_APP) $(RESOURCES) -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) -$(V_AT)mkdir -p $(JUCE_OUTDIR) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(RESOURCES) $(TARGET_ARCH) + $(V_AT)$(CXX) -o $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(OBJECTS_APP) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_APP) $(RESOURCES) $(TARGET_ARCH) $(JUCE_OBJDIR)/Main_90ebc5c2.o: ../../Source/Main.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h index 3297659b93..82aef10c2c 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h +++ b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -97,6 +97,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index 8dcc719356..6a57c2af03 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -787,7 +787,7 @@ INFOPLIST_FILE = Info-App.plist; INFOPLIST_PREPROCESS = NO; INSTALL_PATH = "$(HOME)/Applications"; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wstrict-aliasing -Wconversion -Wsign-compare -Woverloaded-virtual -Wextra-semi"; PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; @@ -821,7 +821,7 @@ INFOPLIST_FILE = Info-App.plist; INFOPLIST_PREPROCESS = NO; INSTALL_PATH = "$(HOME)/Applications"; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wstrict-aliasing -Wconversion -Wsign-compare -Woverloaded-virtual -Wextra-semi"; PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj index b56611d3ea..5989490265 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj @@ -978,6 +978,9 @@ true + + true + true @@ -2294,12 +2297,14 @@ + + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters index f408a8b035..fdfe88cf2f 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -1324,6 +1324,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3519,6 +3522,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors @@ -3537,6 +3543,9 @@ Juce Modules\juce_dsp\processors + + Juce Modules\juce_dsp\processors + Juce Modules\juce_dsp\processors diff --git a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h index 47a23349ce..95aa49ea7e 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h +++ b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -105,6 +105,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: diff --git a/extras/binarybuilder/JuceLibraryCode/AppConfig.h b/extras/binarybuilder/JuceLibraryCode/AppConfig.h index 28d7899c72..631ee977ee 100644 --- a/extras/binarybuilder/JuceLibraryCode/AppConfig.h +++ b/extras/binarybuilder/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 diff --git a/extras/windows dll/JuceLibraryCode/AppConfig.h b/extras/windows dll/JuceLibraryCode/AppConfig.h index 835b6ff6b2..3a5546d5aa 100644 --- a/extras/windows dll/JuceLibraryCode/AppConfig.h +++ b/extras/windows dll/JuceLibraryCode/AppConfig.h @@ -29,6 +29,7 @@ under the GPL v3 license. End User License Agreement: www.juce.com/juce-5-licence + ============================================================================== */ @@ -42,7 +43,6 @@ #define JUCE_REPORT_APP_USAGE 0 #endif - // END SECTION A #define JUCE_USE_DARK_SPLASH_SCREEN 1 @@ -100,6 +100,10 @@ //#define JUCE_USE_WINRT_MIDI 1 #endif +#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS + //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 1 +#endif + //============================================================================== // juce_audio_formats flags: