diff --git a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt index b01c803ef5..406a692338 100644 --- a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt +++ b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt @@ -19,9 +19,9 @@ include_directories( AFTER enable_language(ASM) IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") - add_definitions("-DDEBUG=1" "-D_DEBUG=1") + add_definitions("-DJUCE_DEMO_RUNNER=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_blocks_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_box2d=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_dsp=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_MODULE_AVAILABLE_juce_product_unlocking=1" "-DJUCE_MODULE_AVAILABLE_juce_video=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_USE_MP3AUDIOFORMAT=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_USE_CAMERA=1" "-DJUCE_STANDALONE_APPLICATION=1" "-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") - add_definitions("-DNDEBUG=1") + add_definitions("-DJUCE_DEMO_RUNNER=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_blocks_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_box2d=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_dsp=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_MODULE_AVAILABLE_juce_product_unlocking=1" "-DJUCE_MODULE_AVAILABLE_juce_video=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_USE_MP3AUDIOFORMAT=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_USE_CAMERA=1" "-DJUCE_STANDALONE_APPLICATION=1" "-DNDEBUG=1") ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") @@ -1618,7 +1618,6 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_video/juce_video.cpp" "../../../../../modules/juce_video/juce_video.mm" "../../../../../modules/juce_video/juce_video.h" - "../../../JuceLibraryCode/AppConfig.h" "../../../JuceLibraryCode/include_juce_analytics.cpp" "../../../JuceLibraryCode/include_juce_audio_basics.cpp" "../../../JuceLibraryCode/include_juce_audio_devices.cpp" @@ -3224,7 +3223,6 @@ set_source_files_properties("../../../../../modules/juce_video/playback/juce_Vid set_source_files_properties("../../../../../modules/juce_video/juce_video.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/juce_video.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/juce_video.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../JuceLibraryCode/AppConfig.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../JuceLibraryCode/JuceHeader.h" PROPERTIES HEADER_FILE_ONLY TRUE) find_library(log "log") diff --git a/examples/DemoRunner/Builds/LinuxMakefile/Makefile b/examples/DemoRunner/Builds/LinuxMakefile/Makefile index 2257474ec5..db21de74ba 100644 --- a/examples/DemoRunner/Builds/LinuxMakefile/Makefile +++ b/examples/DemoRunner/Builds/LinuxMakefile/Makefile @@ -35,8 +35,8 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCE_DEMO_RUNNER=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=6.0.0 -DJUCE_APP_VERSION_HEX=0x60000 $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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 -DJucePlugin_Build_Unity=0 + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DEMO_RUNNER=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_blocks_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_box2d=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_dsp=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_MODULE_AVAILABLE_juce_product_unlocking=1" "-DJUCE_MODULE_AVAILABLE_juce_video=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_USE_MP3AUDIOFORMAT=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_USE_CAMERA=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := DemoRunner JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -56,8 +56,8 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCE_DEMO_RUNNER=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=6.0.0 -DJUCE_APP_VERSION_HEX=0x60000 $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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 -DJucePlugin_Build_Unity=0 + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DEMO_RUNNER=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_blocks_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_box2d=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_dsp=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_MODULE_AVAILABLE_juce_product_unlocking=1" "-DJUCE_MODULE_AVAILABLE_juce_video=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_USE_MP3AUDIOFORMAT=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_USE_CAMERA=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := DemoRunner JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) diff --git a/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj b/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj index 5ed6f643e1..5fda80919c 100644 --- a/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj +++ b/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj @@ -499,13 +499,6 @@ path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; - 72129757D2A553B90A7157C6 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = AppConfig.h; - path = ../../JuceLibraryCode/AppConfig.h; - sourceTree = "SOURCE_ROOT"; - }; 7A5AAE9EE573FC6105CC4AAC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -831,7 +824,6 @@ 61F3057D838D7DABB0FA3D34 = { isa = PBXGroup; children = ( - 72129757D2A553B90A7157C6, 5965349393850F41DF76F350, 03B0F9318FD583525AB195A9, 03A63C3CA6F24977F19C316D, @@ -944,6 +936,36 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_analytics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_blocks_basics=1", + "JUCE_MODULE_AVAILABLE_juce_box2d=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_dsp=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_osc=1", + "JUCE_MODULE_AVAILABLE_juce_product_unlocking=1", + "JUCE_MODULE_AVAILABLE_juce_video=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_USE_MP3AUDIOFORMAT=1", + "JUCE_ALLOW_STATIC_NULL_VARIABLES=0", + "JUCE_STRICT_REFCOUNTEDPOINTER=1", + "JUCE_USE_CAMERA=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( @@ -990,6 +1012,36 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_analytics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_blocks_basics=1", + "JUCE_MODULE_AVAILABLE_juce_box2d=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_dsp=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_osc=1", + "JUCE_MODULE_AVAILABLE_juce_product_unlocking=1", + "JUCE_MODULE_AVAILABLE_juce_video=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_USE_MP3AUDIOFORMAT=1", + "JUCE_ALLOW_STATIC_NULL_VARIABLES=0", + "JUCE_STRICT_REFCOUNTEDPOINTER=1", + "JUCE_USE_CAMERA=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( diff --git a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj index 13da4ad110..e1dbb1f809 100644 --- a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_blocks_basics=1;JUCE_MODULE_AVAILABLE_juce_box2d=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_dsp=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_MP3AUDIOFORMAT=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -106,7 +106,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_blocks_basics=1;JUCE_MODULE_AVAILABLE_juce_box2d=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_dsp=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_MP3AUDIOFORMAT=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreaded true @@ -3077,7 +3077,6 @@ - diff --git a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters index 7bc43cf36b..86461c06f3 100644 --- a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters @@ -5298,9 +5298,6 @@ JUCE Modules\juce_video - - JUCE Library Code - JUCE Library Code diff --git a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj index 43ba01466b..665a8c4307 100644 --- a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_blocks_basics=1;JUCE_MODULE_AVAILABLE_juce_box2d=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_dsp=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_MP3AUDIOFORMAT=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -106,7 +106,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_blocks_basics=1;JUCE_MODULE_AVAILABLE_juce_box2d=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_dsp=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_MP3AUDIOFORMAT=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreaded true @@ -3077,7 +3077,6 @@ - diff --git a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters index fd8d8ddf9b..6b687740aa 100644 --- a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters @@ -5298,9 +5298,6 @@ JUCE Modules\juce_video - - JUCE Library Code - JUCE Library Code diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj index bea686ecda..695aee3a4a 100644 --- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_blocks_basics=1;JUCE_MODULE_AVAILABLE_juce_box2d=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_dsp=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_MP3AUDIOFORMAT=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -106,7 +106,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_blocks_basics=1;JUCE_MODULE_AVAILABLE_juce_box2d=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_dsp=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_USE_MP3AUDIOFORMAT=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreaded true @@ -3077,7 +3077,6 @@ - diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters index b4113685d4..2732bd68b9 100644 --- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters @@ -5298,9 +5298,6 @@ JUCE Modules\juce_video - - JUCE Library Code - JUCE Library Code diff --git a/examples/DemoRunner/Builds/iOS/DemoRunner.xcodeproj/project.pbxproj b/examples/DemoRunner/Builds/iOS/DemoRunner.xcodeproj/project.pbxproj index 99d6e93ba5..bbd3512617 100644 --- a/examples/DemoRunner/Builds/iOS/DemoRunner.xcodeproj/project.pbxproj +++ b/examples/DemoRunner/Builds/iOS/DemoRunner.xcodeproj/project.pbxproj @@ -463,13 +463,6 @@ path = "../../JuceLibraryCode/include_juce_cryptography.mm"; sourceTree = "SOURCE_ROOT"; }; - 72129757D2A553B90A7157C6 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = AppConfig.h; - path = ../../JuceLibraryCode/AppConfig.h; - sourceTree = "SOURCE_ROOT"; - }; 76A157A111866670A4678F04 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; @@ -816,7 +809,6 @@ 61F3057D838D7DABB0FA3D34 = { isa = PBXGroup; children = ( - 72129757D2A553B90A7157C6, 5965349393850F41DF76F350, 03B0F9318FD583525AB195A9, 03A63C3CA6F24977F19C316D, @@ -930,6 +922,36 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_analytics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_blocks_basics=1", + "JUCE_MODULE_AVAILABLE_juce_box2d=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_dsp=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_osc=1", + "JUCE_MODULE_AVAILABLE_juce_product_unlocking=1", + "JUCE_MODULE_AVAILABLE_juce_video=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_USE_MP3AUDIOFORMAT=1", + "JUCE_ALLOW_STATIC_NULL_VARIABLES=0", + "JUCE_STRICT_REFCOUNTEDPOINTER=1", + "JUCE_USE_CAMERA=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( @@ -978,6 +1000,36 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_analytics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_blocks_basics=1", + "JUCE_MODULE_AVAILABLE_juce_box2d=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_dsp=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_osc=1", + "JUCE_MODULE_AVAILABLE_juce_product_unlocking=1", + "JUCE_MODULE_AVAILABLE_juce_video=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_USE_MP3AUDIOFORMAT=1", + "JUCE_ALLOW_STATIC_NULL_VARIABLES=0", + "JUCE_STRICT_REFCOUNTEDPOINTER=1", + "JUCE_USE_CAMERA=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( diff --git a/examples/DemoRunner/DemoRunner.jucer b/examples/DemoRunner/DemoRunner.jucer index 4b565a0945..7bd912dcac 100644 --- a/examples/DemoRunner/DemoRunner.jucer +++ b/examples/DemoRunner/DemoRunner.jucer @@ -3,7 +3,8 @@ + companyEmail="info@juce.com" id="yj7xMM" reportAppUsage="0" useAppConfig="0" + addUsingNamespaceToJuceHeader="1"> diff --git a/examples/DemoRunner/JuceLibraryCode/AppConfig.h b/examples/DemoRunner/JuceLibraryCode/AppConfig.h deleted file mode 100644 index b9aa100a58..0000000000 --- a/examples/DemoRunner/JuceLibraryCode/AppConfig.h +++ /dev/null @@ -1,324 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - - There's a section below where you can add your own custom code safely, and the - Projucer will preserve the contents of that block, but the best way to change - any of these definitions is by using the Projucer's project settings. - - Any commented-out settings will assume their default values. - -*/ - -#pragma once - -//============================================================================== -// [BEGIN_USER_CODE_SECTION] - -// (You can add your own code in this section, and the Projucer will not overwrite it) - -// [END_USER_CODE_SECTION] - -/* - ============================================================================== - - In accordance with the terms of the JUCE 5 End-Use License Agreement, the - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered - ineffective unless you have a JUCE Indie or Pro license, or are using JUCE - under the GPL v3 license. - - End User License Agreement: www.juce.com/juce-5-licence - - ============================================================================== -*/ - -// BEGIN SECTION A - -#ifndef JUCE_DISPLAY_SPLASH_SCREEN - #define JUCE_DISPLAY_SPLASH_SCREEN 0 -#endif - -#ifndef JUCE_REPORT_APP_USAGE - #define JUCE_REPORT_APP_USAGE 0 -#endif - -// END SECTION A - -#define JUCE_USE_DARK_SPLASH_SCREEN 1 - -#define JUCE_PROJUCER_VERSION 0x60000 - -//============================================================================== -#define JUCE_MODULE_AVAILABLE_juce_analytics 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_devices 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_formats 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_processors 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_utils 1 -#define JUCE_MODULE_AVAILABLE_juce_blocks_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_box2d 1 -#define JUCE_MODULE_AVAILABLE_juce_core 1 -#define JUCE_MODULE_AVAILABLE_juce_cryptography 1 -#define JUCE_MODULE_AVAILABLE_juce_data_structures 1 -#define JUCE_MODULE_AVAILABLE_juce_dsp 1 -#define JUCE_MODULE_AVAILABLE_juce_events 1 -#define JUCE_MODULE_AVAILABLE_juce_graphics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1 -#define JUCE_MODULE_AVAILABLE_juce_opengl 1 -#define JUCE_MODULE_AVAILABLE_juce_osc 1 -#define JUCE_MODULE_AVAILABLE_juce_product_unlocking 1 -#define JUCE_MODULE_AVAILABLE_juce_video 1 - -#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 - -//============================================================================== -// juce_audio_devices flags: - -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - -#ifndef JUCE_ASIO - //#define JUCE_ASIO 0 -#endif - -#ifndef JUCE_WASAPI - //#define JUCE_WASAPI 1 -#endif - -#ifndef JUCE_WASAPI_EXCLUSIVE - //#define JUCE_WASAPI_EXCLUSIVE 0 -#endif - -#ifndef JUCE_DIRECTSOUND - //#define JUCE_DIRECTSOUND 1 -#endif - -#ifndef JUCE_ALSA - //#define JUCE_ALSA 1 -#endif - -#ifndef JUCE_JACK - //#define JUCE_JACK 0 -#endif - -#ifndef JUCE_BELA - //#define JUCE_BELA 0 -#endif - -#ifndef JUCE_USE_ANDROID_OBOE - //#define JUCE_USE_ANDROID_OBOE 0 -#endif - -#ifndef JUCE_USE_ANDROID_OPENSLES - //#define JUCE_USE_ANDROID_OPENSLES 0 -#endif - -#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS - //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 -#endif - -//============================================================================== -// juce_audio_formats flags: - -#ifndef JUCE_USE_FLAC - //#define JUCE_USE_FLAC 1 -#endif - -#ifndef JUCE_USE_OGGVORBIS - //#define JUCE_USE_OGGVORBIS 1 -#endif - -#ifndef JUCE_USE_MP3AUDIOFORMAT - #define JUCE_USE_MP3AUDIOFORMAT 1 -#endif - -#ifndef JUCE_USE_LAME_AUDIO_FORMAT - //#define JUCE_USE_LAME_AUDIO_FORMAT 0 -#endif - -#ifndef JUCE_USE_WINDOWS_MEDIA_FORMAT - //#define JUCE_USE_WINDOWS_MEDIA_FORMAT 1 -#endif - -//============================================================================== -// juce_audio_processors flags: - -#ifndef JUCE_PLUGINHOST_VST - //#define JUCE_PLUGINHOST_VST 0 -#endif - -#ifndef JUCE_PLUGINHOST_VST3 - //#define JUCE_PLUGINHOST_VST3 0 -#endif - -#ifndef JUCE_PLUGINHOST_AU - //#define JUCE_PLUGINHOST_AU 0 -#endif - -#ifndef JUCE_PLUGINHOST_LADSPA - //#define JUCE_PLUGINHOST_LADSPA 0 -#endif - -//============================================================================== -// juce_audio_utils flags: - -#ifndef JUCE_USE_CDREADER - //#define JUCE_USE_CDREADER 0 -#endif - -#ifndef JUCE_USE_CDBURNER - //#define JUCE_USE_CDBURNER 0 -#endif - -//============================================================================== -// juce_core flags: - -#ifndef JUCE_FORCE_DEBUG - //#define JUCE_FORCE_DEBUG 0 -#endif - -#ifndef JUCE_LOG_ASSERTIONS - //#define JUCE_LOG_ASSERTIONS 0 -#endif - -#ifndef JUCE_CHECK_MEMORY_LEAKS - //#define JUCE_CHECK_MEMORY_LEAKS 1 -#endif - -#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES - //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0 -#endif - -#ifndef JUCE_INCLUDE_ZLIB_CODE - //#define JUCE_INCLUDE_ZLIB_CODE 1 -#endif - -#ifndef JUCE_USE_CURL - //#define JUCE_USE_CURL 1 -#endif - -#ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY - //#define JUCE_LOAD_CURL_SYMBOLS_LAZILY 0 -#endif - -#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS - //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 -#endif - -#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES - #define JUCE_ALLOW_STATIC_NULL_VARIABLES 0 -#endif - -#ifndef JUCE_STRICT_REFCOUNTEDPOINTER - #define JUCE_STRICT_REFCOUNTEDPOINTER 1 -#endif - -//============================================================================== -// juce_dsp flags: - -#ifndef JUCE_ASSERTION_FIRFILTER - //#define JUCE_ASSERTION_FIRFILTER 1 -#endif - -#ifndef JUCE_DSP_USE_INTEL_MKL - //#define JUCE_DSP_USE_INTEL_MKL 0 -#endif - -#ifndef JUCE_DSP_USE_SHARED_FFTW - //#define JUCE_DSP_USE_SHARED_FFTW 0 -#endif - -#ifndef JUCE_DSP_USE_STATIC_FFTW - //#define JUCE_DSP_USE_STATIC_FFTW 0 -#endif - -#ifndef JUCE_DSP_ENABLE_SNAP_TO_ZERO - //#define JUCE_DSP_ENABLE_SNAP_TO_ZERO 1 -#endif - -//============================================================================== -// juce_events flags: - -#ifndef JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK - //#define JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK 0 -#endif - -//============================================================================== -// juce_graphics flags: - -#ifndef JUCE_USE_COREIMAGE_LOADER - //#define JUCE_USE_COREIMAGE_LOADER 1 -#endif - -#ifndef JUCE_USE_DIRECTWRITE - //#define JUCE_USE_DIRECTWRITE 1 -#endif - -#ifndef JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING - //#define JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING 0 -#endif - -//============================================================================== -// juce_gui_basics flags: - -#ifndef JUCE_ENABLE_REPAINT_DEBUGGING - //#define JUCE_ENABLE_REPAINT_DEBUGGING 0 -#endif - -#ifndef JUCE_USE_XRANDR - //#define JUCE_USE_XRANDR 1 -#endif - -#ifndef JUCE_USE_XINERAMA - //#define JUCE_USE_XINERAMA 1 -#endif - -#ifndef JUCE_USE_XSHM - //#define JUCE_USE_XSHM 1 -#endif - -#ifndef JUCE_USE_XRENDER - //#define JUCE_USE_XRENDER 0 -#endif - -#ifndef JUCE_USE_XCURSOR - //#define JUCE_USE_XCURSOR 1 -#endif - -#ifndef JUCE_WIN_PER_MONITOR_DPI_AWARE - //#define JUCE_WIN_PER_MONITOR_DPI_AWARE 1 -#endif - -//============================================================================== -// juce_gui_extra flags: - -#ifndef JUCE_WEB_BROWSER - //#define JUCE_WEB_BROWSER 1 -#endif - -#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR - //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 0 -#endif - -//============================================================================== -// juce_video flags: - -#ifndef JUCE_USE_CAMERA - #define JUCE_USE_CAMERA 1 -#endif - -#ifndef JUCE_SYNC_VIDEO_VOLUME_WITH_OS_MEDIA_VOLUME - //#define JUCE_SYNC_VIDEO_VOLUME_WITH_OS_MEDIA_VOLUME 1 -#endif - -//============================================================================== -#ifndef JUCE_STANDALONE_APPLICATION - #if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone) - #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone - #else - #define JUCE_STANDALONE_APPLICATION 1 - #endif -#endif diff --git a/examples/DemoRunner/JuceLibraryCode/JuceHeader.h b/examples/DemoRunner/JuceLibraryCode/JuceHeader.h index 0753b81f3d..d3f01df922 100644 --- a/examples/DemoRunner/JuceLibraryCode/JuceHeader.h +++ b/examples/DemoRunner/JuceLibraryCode/JuceHeader.h @@ -12,7 +12,6 @@ #pragma once -#include "AppConfig.h" #include #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_analytics.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_analytics.cpp index 3dfd4d2179..cda0f9390a 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_analytics.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_analytics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_basics.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_basics.cpp index 418694873c..e5c3ae92d6 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_basics.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_basics.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_basics.mm index e0e6c577cc..c7f36c6467 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_basics.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_devices.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_devices.cpp index fb5c2219d7..29b774fdbe 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_devices.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_devices.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_devices.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_devices.mm index e58b67ea49..287da26e86 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_devices.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_devices.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_formats.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_formats.cpp index a3c61170eb..8dac33250a 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_formats.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_formats.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_formats.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_formats.mm index f325b8fb67..79e6a22f66 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_formats.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_formats.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_processors.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_processors.cpp index bfe172edd0..217d330a9b 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_processors.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_processors.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_processors.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_processors.mm index b80ae9017f..1f7cc419da 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_processors.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_processors.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_utils.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_utils.cpp index 97bd2c568c..046bf31d94 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_utils.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_utils.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_utils.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_utils.mm index 8eae7c6e2f..a3f746dcac 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_audio_utils.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_audio_utils.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_blocks_basics.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_blocks_basics.cpp index 6ab147fbb4..fb50ac3c6e 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_blocks_basics.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_blocks_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_box2d.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_box2d.cpp index 2f1e1f8133..d8ddd0f1ca 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_box2d.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_box2d.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_core.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_core.cpp index d0ce1636f0..84fe988cb2 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_core.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_core.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_core.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_core.mm index 72b10bf817..9ee67bf662 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_core.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_core.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_cryptography.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_cryptography.cpp index 10b3401dbe..ee7d9085f0 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_cryptography.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_cryptography.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_cryptography.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_cryptography.mm index 9311ea0ffe..03ee05f466 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_cryptography.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_cryptography.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_data_structures.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_data_structures.cpp index 9315aa1686..152980aeb6 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_data_structures.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_data_structures.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_data_structures.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_data_structures.mm index 695ec43925..02b9711c65 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_data_structures.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_data_structures.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_dsp.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_dsp.cpp index 430d943f26..0f0af65999 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_dsp.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_dsp.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_dsp.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_dsp.mm index 1dea5d08a6..a5cb956cfc 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_dsp.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_dsp.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_events.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_events.cpp index 1bba110a97..39268e2b3e 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_events.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_events.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_events.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_events.mm index 4cc34fc401..191a998705 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_events.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_events.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_graphics.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_graphics.cpp index 319c76de0e..8ccabef94f 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_graphics.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_graphics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_graphics.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_graphics.mm index b28e6dd056..6bb7456da9 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_graphics.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_graphics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_gui_basics.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_gui_basics.cpp index 216c76bb05..71d04b2432 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_gui_basics.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_gui_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_gui_basics.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_gui_basics.mm index 6a9726fa5f..e449e0b733 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_gui_basics.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_gui_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_gui_extra.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_gui_extra.cpp index 7226e19833..a33ece0061 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_gui_extra.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_gui_extra.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_gui_extra.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_gui_extra.mm index c9b6c3bfc6..6dacee3a6a 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_gui_extra.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_gui_extra.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_opengl.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_opengl.cpp index d9895bce92..e6541a4249 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_opengl.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_opengl.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_opengl.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_opengl.mm index 6c2c32d095..793619ea4c 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_opengl.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_opengl.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_osc.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_osc.cpp index 0c3b9ae974..7eadead5c8 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_osc.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_osc.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_product_unlocking.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_product_unlocking.cpp index f3fcd328d6..ebb62e21a6 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_product_unlocking.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_product_unlocking.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_product_unlocking.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_product_unlocking.mm index 25aa7eaf68..12010f1876 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_product_unlocking.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_product_unlocking.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_video.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_video.cpp index bdf22ee131..29c128359d 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_video.cpp +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_video.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_video.mm b/examples/DemoRunner/JuceLibraryCode/include_juce_video.mm index 3da705bccd..082e1adb22 100644 --- a/examples/DemoRunner/JuceLibraryCode/include_juce_video.mm +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_video.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer index f51b2ebe8e..9704fe2ed4 100644 --- a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer +++ b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer @@ -3,7 +3,7 @@ + companyCopyright="ROLI Ltd." useAppConfig="0" addUsingNamespaceToJuceHeader="1"> diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index a27235f12b..305dc6858a 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -19,9 +19,9 @@ include_directories( AFTER enable_language(ASM) IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") - add_definitions("-DDEBUG=1" "-D_DEBUG=1") + add_definitions("-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STANDALONE_APPLICATION=1" "-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") - add_definitions("-DNDEBUG=1") + add_definitions("-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STANDALONE_APPLICATION=1" "-DNDEBUG=1") ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") @@ -1306,7 +1306,6 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_extra/juce_gui_extra.cpp" "../../../../../modules/juce_gui_extra/juce_gui_extra.mm" "../../../../../modules/juce_gui_extra/juce_gui_extra.h" - "../../../JuceLibraryCode/AppConfig.h" "../../../JuceLibraryCode/include_juce_audio_basics.cpp" "../../../JuceLibraryCode/include_juce_audio_devices.cpp" "../../../JuceLibraryCode/include_juce_audio_formats.cpp" @@ -2596,7 +2595,6 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_w set_source_files_properties("../../../../../modules/juce_gui_extra/juce_gui_extra.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/juce_gui_extra.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_gui_extra/juce_gui_extra.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../JuceLibraryCode/AppConfig.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../JuceLibraryCode/JuceHeader.h" PROPERTIES HEADER_FILE_ONLY TRUE) find_library(log "log") diff --git a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile index e4dead0bc8..c4ce600b92 100644 --- a/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile +++ b/extras/AudioPerformanceTest/Builds/LinuxMakefile/Makefile @@ -35,8 +35,8 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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 -DJucePlugin_Build_Unity=0 + 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" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := AudioPerformanceTest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -56,8 +56,8 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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 -DJucePlugin_Build_Unity=0 + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := AudioPerformanceTest JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) diff --git a/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj b/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj index fd65ab1ce0..481225e639 100644 --- a/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj +++ b/extras/AudioPerformanceTest/Builds/MacOSX/AudioPerformanceTest.xcodeproj/project.pbxproj @@ -308,13 +308,6 @@ path = "../../../../modules/juce_audio_devices"; sourceTree = "SOURCE_ROOT"; }; - A65BB8D452A2A4859FA41F8B = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = AppConfig.h; - path = ../../JuceLibraryCode/AppConfig.h; - sourceTree = "SOURCE_ROOT"; - }; AD134CACB71BED6A22743C18 = { isa = PBXFileReference; lastKnownFileType = file; @@ -423,7 +416,6 @@ 0B8996A5E2671A4628476CFB = { isa = PBXGroup; children = ( - A65BB8D452A2A4859FA41F8B, 89B3243200BAA6BD72905DBB, 322D3066DCD98A8D0542236A, 9E05B63699A307598B66F829, @@ -514,6 +506,23 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( @@ -557,6 +566,23 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj index c9a43f2cfb..bcf4bd8e01 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -105,7 +105,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -2510,7 +2510,6 @@ - diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj.filters b/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj.filters index 6426bf7125..fe90a05c6d 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj.filters +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj.filters @@ -4209,9 +4209,6 @@ JUCE Modules\juce_gui_extra - - JUCE Library Code - JUCE Library Code diff --git a/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj b/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj index 52095b590e..5d4d7ccbc1 100644 --- a/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj +++ b/extras/AudioPerformanceTest/Builds/iOS/AudioPerformanceTest.xcodeproj/project.pbxproj @@ -327,13 +327,6 @@ path = "../../../../modules/juce_audio_devices"; sourceTree = "SOURCE_ROOT"; }; - A65BB8D452A2A4859FA41F8B = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = AppConfig.h; - path = ../../JuceLibraryCode/AppConfig.h; - sourceTree = "SOURCE_ROOT"; - }; AD134CACB71BED6A22743C18 = { isa = PBXFileReference; lastKnownFileType = file; @@ -456,7 +449,6 @@ 0B8996A5E2671A4628476CFB = { isa = PBXGroup; children = ( - A65BB8D452A2A4859FA41F8B, 89B3243200BAA6BD72905DBB, 322D3066DCD98A8D0542236A, 9E05B63699A307598B66F829, @@ -552,6 +544,23 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( @@ -596,6 +605,23 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h deleted file mode 100644 index c7c679a60e..0000000000 --- a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h +++ /dev/null @@ -1,281 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - - There's a section below where you can add your own custom code safely, and the - Projucer will preserve the contents of that block, but the best way to change - any of these definitions is by using the Projucer's project settings. - - Any commented-out settings will assume their default values. - -*/ - -#pragma once - -//============================================================================== -// [BEGIN_USER_CODE_SECTION] - -// (You can add your own code in this section, and the Projucer will not overwrite it) - -// [END_USER_CODE_SECTION] - -/* - ============================================================================== - - In accordance with the terms of the JUCE 5 End-Use License Agreement, the - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered - ineffective unless you have a JUCE Indie or Pro license, or are using JUCE - under the GPL v3 license. - - End User License Agreement: www.juce.com/juce-5-licence - - ============================================================================== -*/ - -// BEGIN SECTION A - -#ifndef JUCE_DISPLAY_SPLASH_SCREEN - #define JUCE_DISPLAY_SPLASH_SCREEN 0 -#endif - -#ifndef JUCE_REPORT_APP_USAGE - #define JUCE_REPORT_APP_USAGE 0 -#endif - -// END SECTION A - -#define JUCE_USE_DARK_SPLASH_SCREEN 1 - -#define JUCE_PROJUCER_VERSION 0x60000 - -//============================================================================== -#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_devices 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_formats 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_processors 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_utils 1 -#define JUCE_MODULE_AVAILABLE_juce_core 1 -#define JUCE_MODULE_AVAILABLE_juce_data_structures 1 -#define JUCE_MODULE_AVAILABLE_juce_events 1 -#define JUCE_MODULE_AVAILABLE_juce_graphics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1 - -#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 - -//============================================================================== -// juce_audio_devices flags: - -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - -#ifndef JUCE_ASIO - //#define JUCE_ASIO 0 -#endif - -#ifndef JUCE_WASAPI - //#define JUCE_WASAPI 1 -#endif - -#ifndef JUCE_WASAPI_EXCLUSIVE - //#define JUCE_WASAPI_EXCLUSIVE 0 -#endif - -#ifndef JUCE_DIRECTSOUND - //#define JUCE_DIRECTSOUND 1 -#endif - -#ifndef JUCE_ALSA - //#define JUCE_ALSA 1 -#endif - -#ifndef JUCE_JACK - //#define JUCE_JACK 0 -#endif - -#ifndef JUCE_BELA - //#define JUCE_BELA 0 -#endif - -#ifndef JUCE_USE_ANDROID_OBOE - //#define JUCE_USE_ANDROID_OBOE 0 -#endif - -#ifndef JUCE_USE_ANDROID_OPENSLES - //#define JUCE_USE_ANDROID_OPENSLES 0 -#endif - -#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS - //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 -#endif - -//============================================================================== -// juce_audio_formats flags: - -#ifndef JUCE_USE_FLAC - //#define JUCE_USE_FLAC 1 -#endif - -#ifndef JUCE_USE_OGGVORBIS - //#define JUCE_USE_OGGVORBIS 1 -#endif - -#ifndef JUCE_USE_MP3AUDIOFORMAT - //#define JUCE_USE_MP3AUDIOFORMAT 0 -#endif - -#ifndef JUCE_USE_LAME_AUDIO_FORMAT - //#define JUCE_USE_LAME_AUDIO_FORMAT 0 -#endif - -#ifndef JUCE_USE_WINDOWS_MEDIA_FORMAT - //#define JUCE_USE_WINDOWS_MEDIA_FORMAT 1 -#endif - -//============================================================================== -// juce_audio_processors flags: - -#ifndef JUCE_PLUGINHOST_VST - //#define JUCE_PLUGINHOST_VST 0 -#endif - -#ifndef JUCE_PLUGINHOST_VST3 - //#define JUCE_PLUGINHOST_VST3 0 -#endif - -#ifndef JUCE_PLUGINHOST_AU - //#define JUCE_PLUGINHOST_AU 0 -#endif - -#ifndef JUCE_PLUGINHOST_LADSPA - //#define JUCE_PLUGINHOST_LADSPA 0 -#endif - -//============================================================================== -// juce_audio_utils flags: - -#ifndef JUCE_USE_CDREADER - //#define JUCE_USE_CDREADER 0 -#endif - -#ifndef JUCE_USE_CDBURNER - //#define JUCE_USE_CDBURNER 0 -#endif - -//============================================================================== -// juce_core flags: - -#ifndef JUCE_FORCE_DEBUG - //#define JUCE_FORCE_DEBUG 0 -#endif - -#ifndef JUCE_LOG_ASSERTIONS - //#define JUCE_LOG_ASSERTIONS 0 -#endif - -#ifndef JUCE_CHECK_MEMORY_LEAKS - //#define JUCE_CHECK_MEMORY_LEAKS 1 -#endif - -#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES - //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0 -#endif - -#ifndef JUCE_INCLUDE_ZLIB_CODE - //#define JUCE_INCLUDE_ZLIB_CODE 1 -#endif - -#ifndef JUCE_USE_CURL - //#define JUCE_USE_CURL 1 -#endif - -#ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY - //#define JUCE_LOAD_CURL_SYMBOLS_LAZILY 0 -#endif - -#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS - //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 -#endif - -#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES - //#define JUCE_ALLOW_STATIC_NULL_VARIABLES 0 -#endif - -#ifndef JUCE_STRICT_REFCOUNTEDPOINTER - //#define JUCE_STRICT_REFCOUNTEDPOINTER 0 -#endif - -//============================================================================== -// juce_events flags: - -#ifndef JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK - //#define JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK 0 -#endif - -//============================================================================== -// juce_graphics flags: - -#ifndef JUCE_USE_COREIMAGE_LOADER - //#define JUCE_USE_COREIMAGE_LOADER 1 -#endif - -#ifndef JUCE_USE_DIRECTWRITE - //#define JUCE_USE_DIRECTWRITE 1 -#endif - -#ifndef JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING - //#define JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING 0 -#endif - -//============================================================================== -// juce_gui_basics flags: - -#ifndef JUCE_ENABLE_REPAINT_DEBUGGING - //#define JUCE_ENABLE_REPAINT_DEBUGGING 0 -#endif - -#ifndef JUCE_USE_XRANDR - //#define JUCE_USE_XRANDR 1 -#endif - -#ifndef JUCE_USE_XINERAMA - //#define JUCE_USE_XINERAMA 1 -#endif - -#ifndef JUCE_USE_XSHM - //#define JUCE_USE_XSHM 1 -#endif - -#ifndef JUCE_USE_XRENDER - //#define JUCE_USE_XRENDER 0 -#endif - -#ifndef JUCE_USE_XCURSOR - //#define JUCE_USE_XCURSOR 1 -#endif - -#ifndef JUCE_WIN_PER_MONITOR_DPI_AWARE - //#define JUCE_WIN_PER_MONITOR_DPI_AWARE 1 -#endif - -//============================================================================== -// juce_gui_extra flags: - -#ifndef JUCE_WEB_BROWSER - //#define JUCE_WEB_BROWSER 1 -#endif - -#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR - //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 0 -#endif - -//============================================================================== -#ifndef JUCE_STANDALONE_APPLICATION - #if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone) - #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone - #else - #define JUCE_STANDALONE_APPLICATION 1 - #endif -#endif diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/JuceHeader.h b/extras/AudioPerformanceTest/JuceLibraryCode/JuceHeader.h index 1368bac8be..2251265da7 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/JuceHeader.h +++ b/extras/AudioPerformanceTest/JuceLibraryCode/JuceHeader.h @@ -12,7 +12,6 @@ #pragma once -#include "AppConfig.h" #include #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_basics.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_basics.cpp index 418694873c..e5c3ae92d6 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_basics.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_basics.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_basics.mm index e0e6c577cc..c7f36c6467 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_basics.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_devices.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_devices.cpp index fb5c2219d7..29b774fdbe 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_devices.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_devices.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_devices.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_devices.mm index e58b67ea49..287da26e86 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_devices.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_devices.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_formats.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_formats.cpp index a3c61170eb..8dac33250a 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_formats.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_formats.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_formats.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_formats.mm index f325b8fb67..79e6a22f66 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_formats.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_formats.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_processors.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_processors.cpp index bfe172edd0..217d330a9b 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_processors.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_processors.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_processors.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_processors.mm index b80ae9017f..1f7cc419da 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_processors.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_processors.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_utils.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_utils.cpp index 97bd2c568c..046bf31d94 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_utils.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_utils.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_utils.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_utils.mm index 8eae7c6e2f..a3f746dcac 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_utils.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_audio_utils.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_core.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_core.cpp index d0ce1636f0..84fe988cb2 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_core.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_core.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_core.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_core.mm index 72b10bf817..9ee67bf662 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_core.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_core.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_data_structures.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_data_structures.cpp index 9315aa1686..152980aeb6 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_data_structures.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_data_structures.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_data_structures.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_data_structures.mm index 695ec43925..02b9711c65 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_data_structures.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_data_structures.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_events.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_events.cpp index 1bba110a97..39268e2b3e 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_events.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_events.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_events.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_events.mm index 4cc34fc401..191a998705 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_events.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_events.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_graphics.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_graphics.cpp index 319c76de0e..8ccabef94f 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_graphics.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_graphics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_graphics.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_graphics.mm index b28e6dd056..6bb7456da9 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_graphics.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_graphics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_basics.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_basics.cpp index 216c76bb05..71d04b2432 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_basics.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_basics.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_basics.mm index 6a9726fa5f..e449e0b733 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_basics.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_extra.cpp b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_extra.cpp index 7226e19833..a33ece0061 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_extra.cpp +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_extra.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_extra.mm b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_extra.mm index c9b6c3bfc6..6dacee3a6a 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_extra.mm +++ b/extras/AudioPerformanceTest/JuceLibraryCode/include_juce_gui_extra.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/AudioPluginHost.jucer b/extras/AudioPluginHost/AudioPluginHost.jucer index 0bade3fb00..954eb3566e 100644 --- a/extras/AudioPluginHost/AudioPluginHost.jucer +++ b/extras/AudioPluginHost/AudioPluginHost.jucer @@ -3,7 +3,8 @@ + reportAppUsage="0" companyCopyright="ROLI Ltd." useAppConfig="0" + addUsingNamespaceToJuceHeader="1"> Disabled ProgramDatabase ..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_WASAPI=1;JUCE_DIRECTSOUND=1;JUCE_ALSA=1;JUCE_USE_FLAC=0;JUCE_USE_OGGVORBIS=0;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_AU=1;JUCE_PLUGINHOST_LADSPA=1;JUCE_USE_CDREADER=0;JUCE_USE_CDBURNER=0;JUCE_WEB_BROWSER=0;JUCE_USE_CAMERA=0;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -106,7 +106,7 @@ Full ..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_WASAPI=1;JUCE_DIRECTSOUND=1;JUCE_ALSA=1;JUCE_USE_FLAC=0;JUCE_USE_OGGVORBIS=0;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_AU=1;JUCE_PLUGINHOST_LADSPA=1;JUCE_USE_CDREADER=0;JUCE_USE_CDBURNER=0;JUCE_WEB_BROWSER=0;JUCE_USE_CAMERA=0;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -2625,7 +2625,6 @@ - diff --git a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters index f0c6cf3367..6ee9688c2c 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters @@ -4479,9 +4479,6 @@ JUCE Modules\juce_video - - JUCE Library Code - JUCE Library Code diff --git a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj index 33e5961ed8..17a156476d 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_WASAPI=1;JUCE_DIRECTSOUND=1;JUCE_ALSA=1;JUCE_USE_FLAC=0;JUCE_USE_OGGVORBIS=0;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_AU=1;JUCE_PLUGINHOST_LADSPA=1;JUCE_USE_CDREADER=0;JUCE_USE_CDBURNER=0;JUCE_WEB_BROWSER=0;JUCE_USE_CAMERA=0;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -106,7 +106,7 @@ Full ..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_WASAPI=1;JUCE_DIRECTSOUND=1;JUCE_ALSA=1;JUCE_USE_FLAC=0;JUCE_USE_OGGVORBIS=0;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_AU=1;JUCE_PLUGINHOST_LADSPA=1;JUCE_USE_CDREADER=0;JUCE_USE_CDBURNER=0;JUCE_WEB_BROWSER=0;JUCE_USE_CAMERA=0;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -2625,7 +2625,6 @@ - diff --git a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters index 460c20f892..dfb6a85a22 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters @@ -4479,9 +4479,6 @@ JUCE Modules\juce_video - - JUCE Library Code - JUCE Library Code diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj index fe7896c327..dc297038f4 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_WASAPI=1;JUCE_DIRECTSOUND=1;JUCE_ALSA=1;JUCE_USE_FLAC=0;JUCE_USE_OGGVORBIS=0;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_AU=1;JUCE_PLUGINHOST_LADSPA=1;JUCE_USE_CDREADER=0;JUCE_USE_CDBURNER=0;JUCE_WEB_BROWSER=0;JUCE_USE_CAMERA=0;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -106,7 +106,7 @@ Full ..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_WASAPI=1;JUCE_DIRECTSOUND=1;JUCE_ALSA=1;JUCE_USE_FLAC=0;JUCE_USE_OGGVORBIS=0;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_AU=1;JUCE_PLUGINHOST_LADSPA=1;JUCE_USE_CDREADER=0;JUCE_USE_CDBURNER=0;JUCE_WEB_BROWSER=0;JUCE_USE_CAMERA=0;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -2625,7 +2625,6 @@ - diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters index 649eb2a925..0ee21ed5f4 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters @@ -4479,9 +4479,6 @@ JUCE Modules\juce_video - - JUCE Library Code - JUCE Library Code diff --git a/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj b/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj index 39a4d757a5..70f13a4a31 100644 --- a/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj +++ b/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj @@ -239,13 +239,6 @@ path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 30F22843EFEBF7AA841EB4D6 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = AppConfig.h; - path = ../../JuceLibraryCode/AppConfig.h; - sourceTree = "SOURCE_ROOT"; - }; 31D55A751C790CB81F58DDB7 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; @@ -699,7 +692,6 @@ 7E30376DDAD775FEFE64944C = { isa = PBXGroup; children = ( - 30F22843EFEBF7AA841EB4D6, 6D107D7946DC5976B766345B, 1DADAD8E34AAF4AFF1C69DC4, 4C7D82F9274A4F9DBF11235C, @@ -804,6 +796,38 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_video=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_WASAPI=1", + "JUCE_DIRECTSOUND=1", + "JUCE_ALSA=1", + "JUCE_USE_FLAC=0", + "JUCE_USE_OGGVORBIS=0", + "JUCE_PLUGINHOST_VST3=1", + "JUCE_PLUGINHOST_AU=1", + "JUCE_PLUGINHOST_LADSPA=1", + "JUCE_USE_CDREADER=0", + "JUCE_USE_CDBURNER=0", + "JUCE_WEB_BROWSER=0", + "JUCE_USE_CAMERA=0", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( @@ -850,6 +874,38 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_video=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_WASAPI=1", + "JUCE_DIRECTSOUND=1", + "JUCE_ALSA=1", + "JUCE_USE_FLAC=0", + "JUCE_USE_OGGVORBIS=0", + "JUCE_PLUGINHOST_VST3=1", + "JUCE_PLUGINHOST_AU=1", + "JUCE_PLUGINHOST_LADSPA=1", + "JUCE_USE_CDREADER=0", + "JUCE_USE_CDBURNER=0", + "JUCE_WEB_BROWSER=0", + "JUCE_USE_CAMERA=0", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( diff --git a/extras/AudioPluginHost/JuceLibraryCode/AppConfig.h b/extras/AudioPluginHost/JuceLibraryCode/AppConfig.h deleted file mode 100644 index 2418f5c778..0000000000 --- a/extras/AudioPluginHost/JuceLibraryCode/AppConfig.h +++ /dev/null @@ -1,297 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - - There's a section below where you can add your own custom code safely, and the - Projucer will preserve the contents of that block, but the best way to change - any of these definitions is by using the Projucer's project settings. - - Any commented-out settings will assume their default values. - -*/ - -#pragma once - -//============================================================================== -// [BEGIN_USER_CODE_SECTION] - -#ifndef JUCE_ANDROID - #define JUCE_MODAL_LOOPS_PERMITTED (! JUCE_IOS) -#endif - -// [END_USER_CODE_SECTION] - -/* - ============================================================================== - - In accordance with the terms of the JUCE 5 End-Use License Agreement, the - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered - ineffective unless you have a JUCE Indie or Pro license, or are using JUCE - under the GPL v3 license. - - End User License Agreement: www.juce.com/juce-5-licence - - ============================================================================== -*/ - -// BEGIN SECTION A - -#ifndef JUCE_DISPLAY_SPLASH_SCREEN - #define JUCE_DISPLAY_SPLASH_SCREEN 0 -#endif - -#ifndef JUCE_REPORT_APP_USAGE - #define JUCE_REPORT_APP_USAGE 0 -#endif - -// END SECTION A - -#define JUCE_USE_DARK_SPLASH_SCREEN 1 - -#define JUCE_PROJUCER_VERSION 0x60000 - -//============================================================================== -#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_devices 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_formats 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_processors 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_utils 1 -#define JUCE_MODULE_AVAILABLE_juce_core 1 -#define JUCE_MODULE_AVAILABLE_juce_cryptography 1 -#define JUCE_MODULE_AVAILABLE_juce_data_structures 1 -#define JUCE_MODULE_AVAILABLE_juce_events 1 -#define JUCE_MODULE_AVAILABLE_juce_graphics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1 -#define JUCE_MODULE_AVAILABLE_juce_opengl 1 -#define JUCE_MODULE_AVAILABLE_juce_video 1 - -#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 - -//============================================================================== -// juce_audio_devices flags: - -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - -#ifndef JUCE_ASIO - //#define JUCE_ASIO 0 -#endif - -#ifndef JUCE_WASAPI - #define JUCE_WASAPI 1 -#endif - -#ifndef JUCE_WASAPI_EXCLUSIVE - //#define JUCE_WASAPI_EXCLUSIVE 0 -#endif - -#ifndef JUCE_DIRECTSOUND - #define JUCE_DIRECTSOUND 1 -#endif - -#ifndef JUCE_ALSA - #define JUCE_ALSA 1 -#endif - -#ifndef JUCE_JACK - //#define JUCE_JACK 0 -#endif - -#ifndef JUCE_BELA - //#define JUCE_BELA 0 -#endif - -#ifndef JUCE_USE_ANDROID_OBOE - //#define JUCE_USE_ANDROID_OBOE 0 -#endif - -#ifndef JUCE_USE_ANDROID_OPENSLES - //#define JUCE_USE_ANDROID_OPENSLES 0 -#endif - -#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS - //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 -#endif - -//============================================================================== -// juce_audio_formats flags: - -#ifndef JUCE_USE_FLAC - #define JUCE_USE_FLAC 0 -#endif - -#ifndef JUCE_USE_OGGVORBIS - #define JUCE_USE_OGGVORBIS 0 -#endif - -#ifndef JUCE_USE_MP3AUDIOFORMAT - //#define JUCE_USE_MP3AUDIOFORMAT 0 -#endif - -#ifndef JUCE_USE_LAME_AUDIO_FORMAT - //#define JUCE_USE_LAME_AUDIO_FORMAT 0 -#endif - -#ifndef JUCE_USE_WINDOWS_MEDIA_FORMAT - //#define JUCE_USE_WINDOWS_MEDIA_FORMAT 1 -#endif - -//============================================================================== -// juce_audio_processors flags: - -#ifndef JUCE_PLUGINHOST_VST - //#define JUCE_PLUGINHOST_VST 0 -#endif - -#ifndef JUCE_PLUGINHOST_VST3 - #define JUCE_PLUGINHOST_VST3 1 -#endif - -#ifndef JUCE_PLUGINHOST_AU - #define JUCE_PLUGINHOST_AU 1 -#endif - -#ifndef JUCE_PLUGINHOST_LADSPA - #define JUCE_PLUGINHOST_LADSPA 1 -#endif - -//============================================================================== -// juce_audio_utils flags: - -#ifndef JUCE_USE_CDREADER - #define JUCE_USE_CDREADER 0 -#endif - -#ifndef JUCE_USE_CDBURNER - #define JUCE_USE_CDBURNER 0 -#endif - -//============================================================================== -// juce_core flags: - -#ifndef JUCE_FORCE_DEBUG - //#define JUCE_FORCE_DEBUG 0 -#endif - -#ifndef JUCE_LOG_ASSERTIONS - //#define JUCE_LOG_ASSERTIONS 0 -#endif - -#ifndef JUCE_CHECK_MEMORY_LEAKS - //#define JUCE_CHECK_MEMORY_LEAKS 1 -#endif - -#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES - //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0 -#endif - -#ifndef JUCE_INCLUDE_ZLIB_CODE - //#define JUCE_INCLUDE_ZLIB_CODE 1 -#endif - -#ifndef JUCE_USE_CURL - //#define JUCE_USE_CURL 1 -#endif - -#ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY - //#define JUCE_LOAD_CURL_SYMBOLS_LAZILY 0 -#endif - -#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS - //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 -#endif - -#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES - //#define JUCE_ALLOW_STATIC_NULL_VARIABLES 0 -#endif - -#ifndef JUCE_STRICT_REFCOUNTEDPOINTER - //#define JUCE_STRICT_REFCOUNTEDPOINTER 0 -#endif - -//============================================================================== -// juce_events flags: - -#ifndef JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK - //#define JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK 0 -#endif - -//============================================================================== -// juce_graphics flags: - -#ifndef JUCE_USE_COREIMAGE_LOADER - //#define JUCE_USE_COREIMAGE_LOADER 1 -#endif - -#ifndef JUCE_USE_DIRECTWRITE - //#define JUCE_USE_DIRECTWRITE 1 -#endif - -#ifndef JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING - //#define JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING 0 -#endif - -//============================================================================== -// juce_gui_basics flags: - -#ifndef JUCE_ENABLE_REPAINT_DEBUGGING - //#define JUCE_ENABLE_REPAINT_DEBUGGING 0 -#endif - -#ifndef JUCE_USE_XRANDR - //#define JUCE_USE_XRANDR 1 -#endif - -#ifndef JUCE_USE_XINERAMA - //#define JUCE_USE_XINERAMA 1 -#endif - -#ifndef JUCE_USE_XSHM - //#define JUCE_USE_XSHM 1 -#endif - -#ifndef JUCE_USE_XRENDER - //#define JUCE_USE_XRENDER 0 -#endif - -#ifndef JUCE_USE_XCURSOR - //#define JUCE_USE_XCURSOR 1 -#endif - -#ifndef JUCE_WIN_PER_MONITOR_DPI_AWARE - //#define JUCE_WIN_PER_MONITOR_DPI_AWARE 1 -#endif - -//============================================================================== -// juce_gui_extra flags: - -#ifndef JUCE_WEB_BROWSER - #define JUCE_WEB_BROWSER 0 -#endif - -#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR - //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 0 -#endif - -//============================================================================== -// juce_video flags: - -#ifndef JUCE_USE_CAMERA - #define JUCE_USE_CAMERA 0 -#endif - -#ifndef JUCE_SYNC_VIDEO_VOLUME_WITH_OS_MEDIA_VOLUME - //#define JUCE_SYNC_VIDEO_VOLUME_WITH_OS_MEDIA_VOLUME 1 -#endif - -//============================================================================== -#ifndef JUCE_STANDALONE_APPLICATION - #if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone) - #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone - #else - #define JUCE_STANDALONE_APPLICATION 1 - #endif -#endif diff --git a/extras/AudioPluginHost/JuceLibraryCode/JuceHeader.h b/extras/AudioPluginHost/JuceLibraryCode/JuceHeader.h index 5b63c7a0c8..7501b2830b 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/JuceHeader.h +++ b/extras/AudioPluginHost/JuceLibraryCode/JuceHeader.h @@ -12,7 +12,6 @@ #pragma once -#include "AppConfig.h" #include #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_basics.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_basics.cpp index 418694873c..e5c3ae92d6 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_basics.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_basics.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_basics.mm index e0e6c577cc..c7f36c6467 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_basics.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_devices.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_devices.cpp index fb5c2219d7..29b774fdbe 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_devices.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_devices.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_devices.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_devices.mm index e58b67ea49..287da26e86 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_devices.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_devices.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_formats.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_formats.cpp index a3c61170eb..8dac33250a 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_formats.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_formats.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_formats.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_formats.mm index f325b8fb67..79e6a22f66 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_formats.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_formats.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_processors.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_processors.cpp index bfe172edd0..217d330a9b 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_processors.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_processors.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_processors.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_processors.mm index b80ae9017f..1f7cc419da 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_processors.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_processors.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_utils.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_utils.cpp index 97bd2c568c..046bf31d94 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_utils.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_utils.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_utils.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_utils.mm index 8eae7c6e2f..a3f746dcac 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_utils.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_audio_utils.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_core.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_core.cpp index d0ce1636f0..84fe988cb2 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_core.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_core.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_core.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_core.mm index 72b10bf817..9ee67bf662 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_core.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_core.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_cryptography.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_cryptography.cpp index 10b3401dbe..ee7d9085f0 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_cryptography.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_cryptography.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_cryptography.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_cryptography.mm index 9311ea0ffe..03ee05f466 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_cryptography.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_cryptography.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_data_structures.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_data_structures.cpp index 9315aa1686..152980aeb6 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_data_structures.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_data_structures.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_data_structures.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_data_structures.mm index 695ec43925..02b9711c65 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_data_structures.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_data_structures.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_events.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_events.cpp index 1bba110a97..39268e2b3e 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_events.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_events.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_events.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_events.mm index 4cc34fc401..191a998705 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_events.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_events.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_graphics.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_graphics.cpp index 319c76de0e..8ccabef94f 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_graphics.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_graphics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_graphics.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_graphics.mm index b28e6dd056..6bb7456da9 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_graphics.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_graphics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_basics.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_basics.cpp index 216c76bb05..71d04b2432 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_basics.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_basics.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_basics.mm index 6a9726fa5f..e449e0b733 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_basics.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_extra.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_extra.cpp index 7226e19833..a33ece0061 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_extra.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_extra.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_extra.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_extra.mm index c9b6c3bfc6..6dacee3a6a 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_extra.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_gui_extra.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_opengl.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_opengl.cpp index d9895bce92..e6541a4249 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_opengl.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_opengl.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_opengl.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_opengl.mm index 6c2c32d095..793619ea4c 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_opengl.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_opengl.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_video.cpp b/extras/AudioPluginHost/JuceLibraryCode/include_juce_video.cpp index bdf22ee131..29c128359d 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_video.cpp +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_video.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/AudioPluginHost/JuceLibraryCode/include_juce_video.mm b/extras/AudioPluginHost/JuceLibraryCode/include_juce_video.mm index 3da705bccd..082e1adb22 100644 --- a/extras/AudioPluginHost/JuceLibraryCode/include_juce_video.mm +++ b/extras/AudioPluginHost/JuceLibraryCode/include_juce_video.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/BinaryBuilder/BinaryBuilder.jucer b/extras/BinaryBuilder/BinaryBuilder.jucer index 0e35e494e1..717d43cd17 100644 --- a/extras/BinaryBuilder/BinaryBuilder.jucer +++ b/extras/BinaryBuilder/BinaryBuilder.jucer @@ -3,7 +3,7 @@ + companyCopyright="ROLI Ltd." useAppConfig="0" addUsingNamespaceToJuceHeader="1"> diff --git a/extras/BinaryBuilder/Builds/LinuxMakefile/Makefile b/extras/BinaryBuilder/Builds/LinuxMakefile/Makefile index 2a976b5674..636f664d24 100644 --- a/extras/BinaryBuilder/Builds/LinuxMakefile/Makefile +++ b/extras/BinaryBuilder/Builds/LinuxMakefile/Makefile @@ -35,8 +35,8 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) - JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 + 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" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS_CONSOLEAPP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_CONSOLEAPP := BinaryBuilder JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -56,8 +56,8 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) - JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS_CONSOLEAPP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_CONSOLEAPP := BinaryBuilder JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -Os $(CFLAGS) diff --git a/extras/BinaryBuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj b/extras/BinaryBuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj index b0bf9aa68b..d048b73393 100644 --- a/extras/BinaryBuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj +++ b/extras/BinaryBuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj @@ -57,13 +57,6 @@ path = BinaryBuilder; sourceTree = "BUILT_PRODUCTS_DIR"; }; - 7E86227B01E504302C234A04 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = AppConfig.h; - path = ../../JuceLibraryCode/AppConfig.h; - sourceTree = "SOURCE_ROOT"; - }; 8702176D2368B6F785546D2B = { isa = PBXFileReference; lastKnownFileType = file; @@ -119,7 +112,6 @@ 8905BD956C24F83087634C3A = { isa = PBXGroup; children = ( - 7E86227B01E504302C234A04, D186E2D509765FAE0758F17D, D6C3594C8BEC94040AF108FE, ); @@ -190,6 +182,13 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( @@ -231,6 +230,13 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( diff --git a/extras/BinaryBuilder/Builds/VisualStudio2019/BinaryBuilder_ConsoleApp.vcxproj b/extras/BinaryBuilder/Builds/VisualStudio2019/BinaryBuilder_ConsoleApp.vcxproj index 7e82363995..2f9f287210 100644 --- a/extras/BinaryBuilder/Builds/VisualStudio2019/BinaryBuilder_ConsoleApp.vcxproj +++ b/extras/BinaryBuilder/Builds/VisualStudio2019/BinaryBuilder_ConsoleApp.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -105,7 +105,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -581,7 +581,6 @@ - diff --git a/extras/BinaryBuilder/Builds/VisualStudio2019/BinaryBuilder_ConsoleApp.vcxproj.filters b/extras/BinaryBuilder/Builds/VisualStudio2019/BinaryBuilder_ConsoleApp.vcxproj.filters index 98e8371458..39e7627c8c 100644 --- a/extras/BinaryBuilder/Builds/VisualStudio2019/BinaryBuilder_ConsoleApp.vcxproj.filters +++ b/extras/BinaryBuilder/Builds/VisualStudio2019/BinaryBuilder_ConsoleApp.vcxproj.filters @@ -813,9 +813,6 @@ JUCE Modules\juce_core - - JUCE Library Code - JUCE Library Code diff --git a/extras/BinaryBuilder/JuceLibraryCode/AppConfig.h b/extras/BinaryBuilder/JuceLibraryCode/AppConfig.h deleted file mode 100644 index 9c20afb1c0..0000000000 --- a/extras/BinaryBuilder/JuceLibraryCode/AppConfig.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - - There's a section below where you can add your own custom code safely, and the - Projucer will preserve the contents of that block, but the best way to change - any of these definitions is by using the Projucer's project settings. - - Any commented-out settings will assume their default values. - -*/ - -#pragma once - -//============================================================================== -// [BEGIN_USER_CODE_SECTION] - -// (You can add your own code in this section, and the Projucer will not overwrite it) - -// [END_USER_CODE_SECTION] - -/* - ============================================================================== - - In accordance with the terms of the JUCE 5 End-Use License Agreement, the - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered - ineffective unless you have a JUCE Indie or Pro license, or are using JUCE - under the GPL v3 license. - - End User License Agreement: www.juce.com/juce-5-licence - - ============================================================================== -*/ - -// BEGIN SECTION A - -#ifndef JUCE_DISPLAY_SPLASH_SCREEN - #define JUCE_DISPLAY_SPLASH_SCREEN 0 -#endif - -#ifndef JUCE_REPORT_APP_USAGE - #define JUCE_REPORT_APP_USAGE 0 -#endif - -// END SECTION A - -#define JUCE_USE_DARK_SPLASH_SCREEN 1 - -#define JUCE_PROJUCER_VERSION 0x60000 - -//============================================================================== -#define JUCE_MODULE_AVAILABLE_juce_core 1 - -#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 - -//============================================================================== -// juce_core flags: - -#ifndef JUCE_FORCE_DEBUG - //#define JUCE_FORCE_DEBUG 0 -#endif - -#ifndef JUCE_LOG_ASSERTIONS - //#define JUCE_LOG_ASSERTIONS 0 -#endif - -#ifndef JUCE_CHECK_MEMORY_LEAKS - //#define JUCE_CHECK_MEMORY_LEAKS 1 -#endif - -#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES - //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0 -#endif - -#ifndef JUCE_INCLUDE_ZLIB_CODE - //#define JUCE_INCLUDE_ZLIB_CODE 1 -#endif - -#ifndef JUCE_USE_CURL - //#define JUCE_USE_CURL 1 -#endif - -#ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY - //#define JUCE_LOAD_CURL_SYMBOLS_LAZILY 0 -#endif - -#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS - //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 -#endif - -#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES - //#define JUCE_ALLOW_STATIC_NULL_VARIABLES 0 -#endif - -#ifndef JUCE_STRICT_REFCOUNTEDPOINTER - //#define JUCE_STRICT_REFCOUNTEDPOINTER 0 -#endif - -//============================================================================== -#ifndef JUCE_STANDALONE_APPLICATION - #if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone) - #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone - #else - #define JUCE_STANDALONE_APPLICATION 1 - #endif -#endif diff --git a/extras/BinaryBuilder/JuceLibraryCode/JuceHeader.h b/extras/BinaryBuilder/JuceLibraryCode/JuceHeader.h index 990925e65a..95490d8e3d 100644 --- a/extras/BinaryBuilder/JuceLibraryCode/JuceHeader.h +++ b/extras/BinaryBuilder/JuceLibraryCode/JuceHeader.h @@ -12,7 +12,6 @@ #pragma once -#include "AppConfig.h" #include diff --git a/extras/BinaryBuilder/JuceLibraryCode/include_juce_core.cpp b/extras/BinaryBuilder/JuceLibraryCode/include_juce_core.cpp index d0ce1636f0..84fe988cb2 100644 --- a/extras/BinaryBuilder/JuceLibraryCode/include_juce_core.cpp +++ b/extras/BinaryBuilder/JuceLibraryCode/include_juce_core.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/BinaryBuilder/JuceLibraryCode/include_juce_core.mm b/extras/BinaryBuilder/JuceLibraryCode/include_juce_core.mm index 72b10bf817..9ee67bf662 100644 --- a/extras/BinaryBuilder/JuceLibraryCode/include_juce_core.mm +++ b/extras/BinaryBuilder/JuceLibraryCode/include_juce_core.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake index aa90534b30..81030b929a 100644 --- a/extras/Build/CMake/JUCEUtils.cmake +++ b/extras/Build/CMake/JUCEUtils.cmake @@ -315,7 +315,7 @@ function(_juce_add_au_resource_fork shared_code_target au_target) get_target_property(juce_library_code ${shared_code_target} JUCE_GENERATED_SOURCES_DIRECTORY) # We don't want our AU AppConfig.h to end up on peoples' include paths if we can help it set(secret_au_resource_dir "${juce_library_code}/${au_target}/secret") - set(secret_au_appconfig "${secret_au_resource_dir}/AppConfig.h") + set(secret_au_plugindefines "${secret_au_resource_dir}/JucePluginDefines.h") set(au_rez_output "${secret_au_resource_dir}/${product_name}.rsrc") @@ -334,8 +334,8 @@ function(_juce_add_au_resource_fork shared_code_target au_target) # in a custom command. # In the end, it's simplest to generate a special single-purpose appconfig just for the # resource compiler. - add_custom_command(OUTPUT "${secret_au_appconfig}" - COMMAND juce::juceaide auappconfig "${defs_file}" "${secret_au_appconfig}" + add_custom_command(OUTPUT "${secret_au_plugindefines}" + COMMAND juce::juceaide auplugindefines "${defs_file}" "${secret_au_plugindefines}" DEPENDS "${defs_file}" VERBATIM) @@ -349,7 +349,7 @@ function(_juce_add_au_resource_fork shared_code_target au_target) -isysroot "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" "${au_rez_sources}" -o "${au_rez_output}" - DEPENDS "${au_rez_input}" "${secret_au_appconfig}" + DEPENDS "${au_rez_input}" "${secret_au_plugindefines}" VERBATIM) endfunction() diff --git a/extras/Build/CMake/PIPComponent.cpp.in b/extras/Build/CMake/PIPComponent.cpp.in index 52347dd8c2..6c6953ef9e 100644 --- a/extras/Build/CMake/PIPComponent.cpp.in +++ b/extras/Build/CMake/PIPComponent.cpp.in @@ -1,68 +1,68 @@ -/* - ============================================================================== - - This file was auto-generated and contains the startup code for a PIP. - - ============================================================================== -*/ - -#include -#include "${JUCE_PIP_HEADER}" - -class Application : public JUCEApplication -{ -public: - //============================================================================== - Application() {} - - const String getApplicationName() override { return "${JUCE_PIP_NAME}"; } - const String getApplicationVersion() override { return "${PROJECT_VERSION}"; } - - void initialise (const String&) override - { - mainWindow.reset (new MainWindow ("${JUCE_PIP_NAME}", new ${JUCE_PIP_MAIN_CLASS}, *this)); - } - - void shutdown() override { mainWindow = nullptr; } - -private: - class MainWindow : public DocumentWindow - { - public: - MainWindow (const String& name, Component* c, JUCEApplication& a) - : DocumentWindow (name, Desktop::getInstance().getDefaultLookAndFeel() - .findColour (ResizableWindow::backgroundColourId), - DocumentWindow::allButtons), - app (a) - { - setUsingNativeTitleBar (true); - setContentOwned (c, true); - - #if JUCE_ANDROID || JUCE_IOS - setFullScreen (true); - #else - setResizable (true, false); - setResizeLimits (300, 250, 10000, 10000); - centreWithSize (getWidth(), getHeight()); - #endif - - setVisible (true); - } - - void closeButtonPressed() override - { - app.systemRequestedQuit(); - } - - private: - JUCEApplication& app; - - //============================================================================== - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindow) - }; - - std::unique_ptr mainWindow; -}; - -//============================================================================== -START_JUCE_APPLICATION (Application) +/* + ============================================================================== + + This file contains the startup code for a PIP. + + ============================================================================== +*/ + +#include +#include "${JUCE_PIP_HEADER}" + +class Application : public JUCEApplication +{ +public: + //============================================================================== + Application() {} + + const String getApplicationName() override { return "${JUCE_PIP_NAME}"; } + const String getApplicationVersion() override { return "${PROJECT_VERSION}"; } + + void initialise (const String&) override + { + mainWindow.reset (new MainWindow ("${JUCE_PIP_NAME}", new ${JUCE_PIP_MAIN_CLASS}, *this)); + } + + void shutdown() override { mainWindow = nullptr; } + +private: + class MainWindow : public DocumentWindow + { + public: + MainWindow (const String& name, Component* c, JUCEApplication& a) + : DocumentWindow (name, Desktop::getInstance().getDefaultLookAndFeel() + .findColour (ResizableWindow::backgroundColourId), + DocumentWindow::allButtons), + app (a) + { + setUsingNativeTitleBar (true); + setContentOwned (c, true); + + #if JUCE_ANDROID || JUCE_IOS + setFullScreen (true); + #else + setResizable (true, false); + setResizeLimits (300, 250, 10000, 10000); + centreWithSize (getWidth(), getHeight()); + #endif + + setVisible (true); + } + + void closeButtonPressed() override + { + app.systemRequestedQuit(); + } + + private: + JUCEApplication& app; + + //============================================================================== + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindow) + }; + + std::unique_ptr mainWindow; +}; + +//============================================================================== +START_JUCE_APPLICATION (Application) diff --git a/extras/Build/juceaide/Main.cpp b/extras/Build/juceaide/Main.cpp index 5d6570443c..69864f1e59 100644 --- a/extras/Build/juceaide/Main.cpp +++ b/extras/Build/juceaide/Main.cpp @@ -402,6 +402,9 @@ juce::String createDefineStatements (juce::StringRef definitions) for (const auto& def : split) { + if (! def.startsWith ("JucePlugin_")) + continue; + const auto defineName = def.upToFirstOccurrenceOf ("=", false, false); const auto defineValue = def.fromFirstOccurrenceOf ("=", false, false); defineStatements += "#define " + defineName + " " + defineValue + '\n'; @@ -410,7 +413,7 @@ juce::String createDefineStatements (juce::StringRef definitions) return defineStatements; } -int writeAuAppConfig (juce::ArgumentList&& args) +int writeAuPluginDefines (juce::ArgumentList&& args) { args.checkMinNumArguments (2); const auto input = args.arguments.removeAndReturn (0); @@ -483,16 +486,16 @@ int main (int argc, char** argv) const std::unordered_map commands { - { "auappconfig", writeAuAppConfig }, - { "binarydata", writeBinaryData }, - { "entitlements", writeEntitlements }, - { "header", writeHeader }, - { "iosassets", writeiOSAssets }, - { "macicon", writeMacIcon }, - { "pkginfo", writePkgInfo }, - { "plist", writePlist }, - { "rcfile", writeRcFile }, - { "winicon", writeWinIcon } + { "auplugindefines", writeAuPluginDefines }, + { "binarydata", writeBinaryData }, + { "entitlements", writeEntitlements }, + { "header", writeHeader }, + { "iosassets", writeiOSAssets }, + { "macicon", writeMacIcon }, + { "pkginfo", writePkgInfo }, + { "plist", writePlist }, + { "rcfile", writeRcFile }, + { "winicon", writeWinIcon } }; argumentList.checkMinNumArguments (1); diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index a14940dbbb..7b7a0535aa 100644 --- a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -19,9 +19,9 @@ include_directories( AFTER enable_language(ASM) IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") - add_definitions("-DJUCE_DEBUG=0" "-DDEBUG=1" "-D_DEBUG=1") + add_definitions("-DJUCE_DEBUG=0" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STANDALONE_APPLICATION=1" "-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") - add_definitions("-DNDEBUG=1") + add_definitions("-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STANDALONE_APPLICATION=1" "-DNDEBUG=1") ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") @@ -1376,7 +1376,6 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_osc/osc/juce_OSCTypes.h" "../../../../../modules/juce_osc/juce_osc.cpp" "../../../../../modules/juce_osc/juce_osc.h" - "../../../JuceLibraryCode/AppConfig.h" "../../../JuceLibraryCode/BinaryData.cpp" "../../../JuceLibraryCode/BinaryData.h" "../../../JuceLibraryCode/include_juce_audio_basics.cpp" @@ -2741,7 +2740,6 @@ set_source_files_properties("../../../../../modules/juce_osc/osc/juce_OSCTypes.c set_source_files_properties("../../../../../modules/juce_osc/osc/juce_OSCTypes.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_osc/juce_osc.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_osc/juce_osc.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../JuceLibraryCode/AppConfig.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../JuceLibraryCode/BinaryData.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../JuceLibraryCode/JuceHeader.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile b/extras/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile index 0213a92ed5..a7f079b543 100644 --- a/extras/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile +++ b/extras/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile @@ -35,8 +35,8 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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 -DJucePlugin_Build_Unity=0 + 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" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := JUCE\ Network\ Graphics\ Demo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -56,8 +56,8 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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 -DJucePlugin_Build_Unity=0 + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -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" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := JUCE\ Network\ Graphics\ Demo JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) diff --git a/extras/NetworkGraphicsDemo/Builds/MacOSX/NetworkGraphicsDemo.xcodeproj/project.pbxproj b/extras/NetworkGraphicsDemo/Builds/MacOSX/NetworkGraphicsDemo.xcodeproj/project.pbxproj index c64f2a2335..7d29a6f8db 100644 --- a/extras/NetworkGraphicsDemo/Builds/MacOSX/NetworkGraphicsDemo.xcodeproj/project.pbxproj +++ b/extras/NetworkGraphicsDemo/Builds/MacOSX/NetworkGraphicsDemo.xcodeproj/project.pbxproj @@ -136,13 +136,6 @@ path = "../../JuceLibraryCode/include_juce_core.mm"; sourceTree = "SOURCE_ROOT"; }; - 0555BAE6156EAF15CA77A2D8 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = AppConfig.h; - path = ../../JuceLibraryCode/AppConfig.h; - sourceTree = "SOURCE_ROOT"; - }; 0ADF0DECFCB1DB4D3A847EB5 = { isa = PBXFileReference; lastKnownFileType = image.png; @@ -552,7 +545,6 @@ C20D4DECE1291BF6AF8711DC = { isa = PBXGroup; children = ( - 0555BAE6156EAF15CA77A2D8, 74711D7544168CCAC4969A07, 92800676AF753D1A60108F11, 6D1F9E505D20C09647124F0A, @@ -650,6 +642,26 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_osc=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( @@ -693,6 +705,26 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_osc=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj b/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj index 158d4fb924..5188dbe076 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -105,7 +105,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -2633,7 +2633,6 @@ - diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj.filters b/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj.filters index 027b765c3a..86db98d8bc 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj.filters +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj.filters @@ -4458,9 +4458,6 @@ JUCE Modules\juce_osc - - JUCE Library Code - JUCE Library Code diff --git a/extras/NetworkGraphicsDemo/Builds/iOS/NetworkGraphicsDemo.xcodeproj/project.pbxproj b/extras/NetworkGraphicsDemo/Builds/iOS/NetworkGraphicsDemo.xcodeproj/project.pbxproj index 96f2f64b87..d57d9a00ef 100644 --- a/extras/NetworkGraphicsDemo/Builds/iOS/NetworkGraphicsDemo.xcodeproj/project.pbxproj +++ b/extras/NetworkGraphicsDemo/Builds/iOS/NetworkGraphicsDemo.xcodeproj/project.pbxproj @@ -148,13 +148,6 @@ path = "../../JuceLibraryCode/include_juce_core.mm"; sourceTree = "SOURCE_ROOT"; }; - 0555BAE6156EAF15CA77A2D8 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = AppConfig.h; - path = ../../JuceLibraryCode/AppConfig.h; - sourceTree = "SOURCE_ROOT"; - }; 080961C54C58ECF2346B4C23 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; @@ -585,7 +578,6 @@ C20D4DECE1291BF6AF8711DC = { isa = PBXGroup; children = ( - 0555BAE6156EAF15CA77A2D8, 74711D7544168CCAC4969A07, 92800676AF753D1A60108F11, 6D1F9E505D20C09647124F0A, @@ -688,6 +680,26 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_osc=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( @@ -732,6 +744,26 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_osc=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h b/extras/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h deleted file mode 100644 index 0a768d4ee0..0000000000 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h +++ /dev/null @@ -1,284 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - - There's a section below where you can add your own custom code safely, and the - Projucer will preserve the contents of that block, but the best way to change - any of these definitions is by using the Projucer's project settings. - - Any commented-out settings will assume their default values. - -*/ - -#pragma once - -//============================================================================== -// [BEGIN_USER_CODE_SECTION] - -// (You can add your own code in this section, and the Projucer will not overwrite it) - -// [END_USER_CODE_SECTION] - -/* - ============================================================================== - - In accordance with the terms of the JUCE 5 End-Use License Agreement, the - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered - ineffective unless you have a JUCE Indie or Pro license, or are using JUCE - under the GPL v3 license. - - End User License Agreement: www.juce.com/juce-5-licence - - ============================================================================== -*/ - -// BEGIN SECTION A - -#ifndef JUCE_DISPLAY_SPLASH_SCREEN - #define JUCE_DISPLAY_SPLASH_SCREEN 0 -#endif - -#ifndef JUCE_REPORT_APP_USAGE - #define JUCE_REPORT_APP_USAGE 0 -#endif - -// END SECTION A - -#define JUCE_USE_DARK_SPLASH_SCREEN 1 - -#define JUCE_PROJUCER_VERSION 0x60000 - -//============================================================================== -#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_devices 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_formats 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_processors 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_utils 1 -#define JUCE_MODULE_AVAILABLE_juce_core 1 -#define JUCE_MODULE_AVAILABLE_juce_cryptography 1 -#define JUCE_MODULE_AVAILABLE_juce_data_structures 1 -#define JUCE_MODULE_AVAILABLE_juce_events 1 -#define JUCE_MODULE_AVAILABLE_juce_graphics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1 -#define JUCE_MODULE_AVAILABLE_juce_opengl 1 -#define JUCE_MODULE_AVAILABLE_juce_osc 1 - -#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 - -//============================================================================== -// juce_audio_devices flags: - -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - -#ifndef JUCE_ASIO - //#define JUCE_ASIO 0 -#endif - -#ifndef JUCE_WASAPI - //#define JUCE_WASAPI 1 -#endif - -#ifndef JUCE_WASAPI_EXCLUSIVE - //#define JUCE_WASAPI_EXCLUSIVE 0 -#endif - -#ifndef JUCE_DIRECTSOUND - //#define JUCE_DIRECTSOUND 1 -#endif - -#ifndef JUCE_ALSA - //#define JUCE_ALSA 1 -#endif - -#ifndef JUCE_JACK - //#define JUCE_JACK 0 -#endif - -#ifndef JUCE_BELA - //#define JUCE_BELA 0 -#endif - -#ifndef JUCE_USE_ANDROID_OBOE - //#define JUCE_USE_ANDROID_OBOE 0 -#endif - -#ifndef JUCE_USE_ANDROID_OPENSLES - //#define JUCE_USE_ANDROID_OPENSLES 0 -#endif - -#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS - //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 -#endif - -//============================================================================== -// juce_audio_formats flags: - -#ifndef JUCE_USE_FLAC - //#define JUCE_USE_FLAC 1 -#endif - -#ifndef JUCE_USE_OGGVORBIS - //#define JUCE_USE_OGGVORBIS 1 -#endif - -#ifndef JUCE_USE_MP3AUDIOFORMAT - //#define JUCE_USE_MP3AUDIOFORMAT 0 -#endif - -#ifndef JUCE_USE_LAME_AUDIO_FORMAT - //#define JUCE_USE_LAME_AUDIO_FORMAT 0 -#endif - -#ifndef JUCE_USE_WINDOWS_MEDIA_FORMAT - //#define JUCE_USE_WINDOWS_MEDIA_FORMAT 1 -#endif - -//============================================================================== -// juce_audio_processors flags: - -#ifndef JUCE_PLUGINHOST_VST - //#define JUCE_PLUGINHOST_VST 0 -#endif - -#ifndef JUCE_PLUGINHOST_VST3 - //#define JUCE_PLUGINHOST_VST3 0 -#endif - -#ifndef JUCE_PLUGINHOST_AU - //#define JUCE_PLUGINHOST_AU 0 -#endif - -#ifndef JUCE_PLUGINHOST_LADSPA - //#define JUCE_PLUGINHOST_LADSPA 0 -#endif - -//============================================================================== -// juce_audio_utils flags: - -#ifndef JUCE_USE_CDREADER - //#define JUCE_USE_CDREADER 0 -#endif - -#ifndef JUCE_USE_CDBURNER - //#define JUCE_USE_CDBURNER 0 -#endif - -//============================================================================== -// juce_core flags: - -#ifndef JUCE_FORCE_DEBUG - //#define JUCE_FORCE_DEBUG 0 -#endif - -#ifndef JUCE_LOG_ASSERTIONS - //#define JUCE_LOG_ASSERTIONS 0 -#endif - -#ifndef JUCE_CHECK_MEMORY_LEAKS - //#define JUCE_CHECK_MEMORY_LEAKS 1 -#endif - -#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES - //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0 -#endif - -#ifndef JUCE_INCLUDE_ZLIB_CODE - //#define JUCE_INCLUDE_ZLIB_CODE 1 -#endif - -#ifndef JUCE_USE_CURL - //#define JUCE_USE_CURL 1 -#endif - -#ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY - //#define JUCE_LOAD_CURL_SYMBOLS_LAZILY 0 -#endif - -#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS - //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 -#endif - -#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES - //#define JUCE_ALLOW_STATIC_NULL_VARIABLES 0 -#endif - -#ifndef JUCE_STRICT_REFCOUNTEDPOINTER - //#define JUCE_STRICT_REFCOUNTEDPOINTER 0 -#endif - -//============================================================================== -// juce_events flags: - -#ifndef JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK - //#define JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK 0 -#endif - -//============================================================================== -// juce_graphics flags: - -#ifndef JUCE_USE_COREIMAGE_LOADER - //#define JUCE_USE_COREIMAGE_LOADER 1 -#endif - -#ifndef JUCE_USE_DIRECTWRITE - //#define JUCE_USE_DIRECTWRITE 1 -#endif - -#ifndef JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING - //#define JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING 0 -#endif - -//============================================================================== -// juce_gui_basics flags: - -#ifndef JUCE_ENABLE_REPAINT_DEBUGGING - //#define JUCE_ENABLE_REPAINT_DEBUGGING 0 -#endif - -#ifndef JUCE_USE_XRANDR - //#define JUCE_USE_XRANDR 1 -#endif - -#ifndef JUCE_USE_XINERAMA - //#define JUCE_USE_XINERAMA 1 -#endif - -#ifndef JUCE_USE_XSHM - //#define JUCE_USE_XSHM 1 -#endif - -#ifndef JUCE_USE_XRENDER - //#define JUCE_USE_XRENDER 0 -#endif - -#ifndef JUCE_USE_XCURSOR - //#define JUCE_USE_XCURSOR 1 -#endif - -#ifndef JUCE_WIN_PER_MONITOR_DPI_AWARE - //#define JUCE_WIN_PER_MONITOR_DPI_AWARE 1 -#endif - -//============================================================================== -// juce_gui_extra flags: - -#ifndef JUCE_WEB_BROWSER - //#define JUCE_WEB_BROWSER 1 -#endif - -#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR - //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 0 -#endif - -//============================================================================== -#ifndef JUCE_STANDALONE_APPLICATION - #if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone) - #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone - #else - #define JUCE_STANDALONE_APPLICATION 1 - #endif -#endif diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/JuceHeader.h b/extras/NetworkGraphicsDemo/JuceLibraryCode/JuceHeader.h index e7443e5872..802d41cd28 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/JuceHeader.h +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/JuceHeader.h @@ -12,7 +12,6 @@ #pragma once -#include "AppConfig.h" #include #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_basics.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_basics.cpp index 418694873c..e5c3ae92d6 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_basics.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_basics.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_basics.mm index e0e6c577cc..c7f36c6467 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_basics.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_devices.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_devices.cpp index fb5c2219d7..29b774fdbe 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_devices.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_devices.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_devices.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_devices.mm index e58b67ea49..287da26e86 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_devices.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_devices.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_formats.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_formats.cpp index a3c61170eb..8dac33250a 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_formats.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_formats.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_formats.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_formats.mm index f325b8fb67..79e6a22f66 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_formats.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_formats.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_processors.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_processors.cpp index bfe172edd0..217d330a9b 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_processors.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_processors.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_processors.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_processors.mm index b80ae9017f..1f7cc419da 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_processors.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_processors.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_utils.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_utils.cpp index 97bd2c568c..046bf31d94 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_utils.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_utils.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_utils.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_utils.mm index 8eae7c6e2f..a3f746dcac 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_utils.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_audio_utils.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_core.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_core.cpp index d0ce1636f0..84fe988cb2 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_core.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_core.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_core.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_core.mm index 72b10bf817..9ee67bf662 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_core.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_core.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_cryptography.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_cryptography.cpp index 10b3401dbe..ee7d9085f0 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_cryptography.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_cryptography.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_cryptography.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_cryptography.mm index 9311ea0ffe..03ee05f466 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_cryptography.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_cryptography.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_data_structures.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_data_structures.cpp index 9315aa1686..152980aeb6 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_data_structures.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_data_structures.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_data_structures.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_data_structures.mm index 695ec43925..02b9711c65 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_data_structures.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_data_structures.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_events.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_events.cpp index 1bba110a97..39268e2b3e 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_events.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_events.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_events.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_events.mm index 4cc34fc401..191a998705 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_events.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_events.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_graphics.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_graphics.cpp index 319c76de0e..8ccabef94f 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_graphics.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_graphics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_graphics.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_graphics.mm index b28e6dd056..6bb7456da9 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_graphics.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_graphics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_basics.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_basics.cpp index 216c76bb05..71d04b2432 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_basics.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_basics.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_basics.mm index 6a9726fa5f..e449e0b733 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_basics.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_extra.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_extra.cpp index 7226e19833..a33ece0061 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_extra.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_extra.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_extra.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_extra.mm index c9b6c3bfc6..6dacee3a6a 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_extra.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_gui_extra.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_opengl.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_opengl.cpp index d9895bce92..e6541a4249 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_opengl.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_opengl.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_opengl.mm b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_opengl.mm index 6c2c32d095..793619ea4c 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_opengl.mm +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_opengl.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_osc.cpp b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_osc.cpp index 0c3b9ae974..7eadead5c8 100644 --- a/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_osc.cpp +++ b/extras/NetworkGraphicsDemo/JuceLibraryCode/include_juce_osc.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer b/extras/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer index e0bd4edc08..0a1cc36e03 100644 --- a/extras/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer +++ b/extras/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer @@ -2,7 +2,8 @@ + companyName="ROLI Ltd." companyCopyright="ROLI Ltd." useAppConfig="0" + addUsingNamespaceToJuceHeader="1"> diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile index b3bb9a3457..70df6d1cb4 100644 --- a/extras/Projucer/Builds/LinuxMakefile/Makefile +++ b/extras/Projucer/Builds/LinuxMakefile/Makefile @@ -35,8 +35,8 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=6.0.0 -DJUCE_APP_VERSION_HEX=0x60000 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules -I../../../Build $(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 -DJucePlugin_Build_Unity=0 + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules -I../../../Build $(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" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := Projucer JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -56,8 +56,8 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=6.0.0 -DJUCE_APP_VERSION_HEX=0x60000 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules -I../../../Build $(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 -DJucePlugin_Build_Unity=0 + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.0" "-DJUCE_APP_VERSION_HEX=0x60000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules -I../../../Build $(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" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := Projucer JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index 6b6c425856..e1c53e8372 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -1505,13 +1505,6 @@ path = "../../Source/ComponentEditor/Components/jucer_TextEditorHandler.h"; sourceTree = "SOURCE_ROOT"; }; - 8702F43110E4CCA5E5F827F5 = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = AppConfig.h; - path = ../../JuceLibraryCode/AppConfig.h; - sourceTree = "SOURCE_ROOT"; - }; 8A82061A978B03745485C3AC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; @@ -3178,7 +3171,6 @@ 2C6746F66EF4444F53B3221F = { isa = PBXGroup; children = ( - 8702F43110E4CCA5E5F827F5, 472F9A90F685220D730EBF6C, 4F687965FBE86EAFDB3ACFEC, 805A3A5FBA3B9E28363DD77B, @@ -3274,6 +3266,26 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_analytics=1", + "JUCE_MODULE_AVAILABLE_juce_build_tools=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_LOG_ASSERTIONS=1", + "JUCE_USE_CURL=1", + "JUCE_LOAD_CURL_SYMBOLS_LAZILY=1", + "JUCE_ALLOW_STATIC_NULL_VARIABLES=0", + "JUCE_STRICT_REFCOUNTEDPOINTER=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( @@ -3319,6 +3331,26 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_analytics=1", + "JUCE_MODULE_AVAILABLE_juce_build_tools=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_LOG_ASSERTIONS=1", + "JUCE_USE_CURL=1", + "JUCE_LOAD_CURL_SYMBOLS_LAZILY=1", + "JUCE_ALLOW_STATIC_NULL_VARIABLES=0", + "JUCE_STRICT_REFCOUNTEDPOINTER=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj index abd4b3fee9..604e07683a 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -106,7 +106,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreaded true @@ -2097,7 +2097,6 @@ - diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters index 5e4ad5f4ed..04bd2bdb74 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters @@ -3702,9 +3702,6 @@ JUCE Modules\juce_gui_extra - - JUCE Library Code - JUCE Library Code diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj index af2f0fc8bf..cfb85d01ea 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -106,7 +106,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreaded true @@ -2097,7 +2097,6 @@ - diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters index 41c98e79c0..568d0c2fbf 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters @@ -3702,9 +3702,6 @@ JUCE Modules\juce_gui_extra - - JUCE Library Code - JUCE Library Code diff --git a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj index 5be97d0395..fa04d83271 100644 --- a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -106,7 +106,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;..\..\..\Build;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=6.0.0;JUCE_APP_VERSION_HEX=0x60000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_build_tools=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_LOG_ASSERTIONS=1;JUCE_USE_CURL=1;JUCE_LOAD_CURL_SYMBOLS_LAZILY=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreaded true @@ -2097,7 +2097,6 @@ - diff --git a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters index 232cec7208..fcca2f08e9 100644 --- a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters @@ -3702,9 +3702,6 @@ JUCE Modules\juce_gui_extra - - JUCE Library Code - JUCE Library Code diff --git a/extras/Projucer/JuceLibraryCode/AppConfig.h b/extras/Projucer/JuceLibraryCode/AppConfig.h deleted file mode 100644 index 30a713c38a..0000000000 --- a/extras/Projucer/JuceLibraryCode/AppConfig.h +++ /dev/null @@ -1,198 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - - There's a section below where you can add your own custom code safely, and the - Projucer will preserve the contents of that block, but the best way to change - any of these definitions is by using the Projucer's project settings. - - Any commented-out settings will assume their default values. - -*/ - -#pragma once - -//============================================================================== -// [BEGIN_USER_CODE_SECTION] - -/* - ============================================================================== - - In accordance with the terms of the JUCE 5 End-Use License Agreement, the - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered - ineffective unless you have a JUCE Indie or Pro license, or are using JUCE - under the GPL v3 license. - - End User License Agreement: www.juce.com/juce-5-licence - - ============================================================================== -*/ - -// BEGIN SECTION A - -#ifndef JUCER_ENABLE_GPL_MODE - #define JUCER_ENABLE_GPL_MODE 0 -#endif - -// END SECTION A - -// [END_USER_CODE_SECTION] - -/* - ============================================================================== - - In accordance with the terms of the JUCE 5 End-Use License Agreement, the - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered - ineffective unless you have a JUCE Indie or Pro license, or are using JUCE - under the GPL v3 license. - - End User License Agreement: www.juce.com/juce-5-licence - - ============================================================================== -*/ - -// BEGIN SECTION A - -#ifndef JUCE_DISPLAY_SPLASH_SCREEN - #define JUCE_DISPLAY_SPLASH_SCREEN 0 -#endif - -#ifndef JUCE_REPORT_APP_USAGE - #define JUCE_REPORT_APP_USAGE 0 -#endif - -// END SECTION A - -#define JUCE_USE_DARK_SPLASH_SCREEN 1 - -#define JUCE_PROJUCER_VERSION 0x60000 - -//============================================================================== -#define JUCE_MODULE_AVAILABLE_juce_analytics 1 -#define JUCE_MODULE_AVAILABLE_juce_build_tools 1 -#define JUCE_MODULE_AVAILABLE_juce_core 1 -#define JUCE_MODULE_AVAILABLE_juce_cryptography 1 -#define JUCE_MODULE_AVAILABLE_juce_data_structures 1 -#define JUCE_MODULE_AVAILABLE_juce_events 1 -#define JUCE_MODULE_AVAILABLE_juce_graphics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1 - -#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 - -//============================================================================== -// juce_core flags: - -#ifndef JUCE_FORCE_DEBUG - //#define JUCE_FORCE_DEBUG 0 -#endif - -#ifndef JUCE_LOG_ASSERTIONS - #define JUCE_LOG_ASSERTIONS 1 -#endif - -#ifndef JUCE_CHECK_MEMORY_LEAKS - //#define JUCE_CHECK_MEMORY_LEAKS 1 -#endif - -#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES - //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0 -#endif - -#ifndef JUCE_INCLUDE_ZLIB_CODE - //#define JUCE_INCLUDE_ZLIB_CODE 1 -#endif - -#ifndef JUCE_USE_CURL - #define JUCE_USE_CURL 1 -#endif - -#ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY - #define JUCE_LOAD_CURL_SYMBOLS_LAZILY 1 -#endif - -#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS - //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 -#endif - -#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES - #define JUCE_ALLOW_STATIC_NULL_VARIABLES 0 -#endif - -#ifndef JUCE_STRICT_REFCOUNTEDPOINTER - #define JUCE_STRICT_REFCOUNTEDPOINTER 1 -#endif - -//============================================================================== -// juce_events flags: - -#ifndef JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK - //#define JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK 0 -#endif - -//============================================================================== -// juce_graphics flags: - -#ifndef JUCE_USE_COREIMAGE_LOADER - //#define JUCE_USE_COREIMAGE_LOADER 1 -#endif - -#ifndef JUCE_USE_DIRECTWRITE - //#define JUCE_USE_DIRECTWRITE 1 -#endif - -#ifndef JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING - //#define JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING 0 -#endif - -//============================================================================== -// juce_gui_basics flags: - -#ifndef JUCE_ENABLE_REPAINT_DEBUGGING - //#define JUCE_ENABLE_REPAINT_DEBUGGING 0 -#endif - -#ifndef JUCE_USE_XRANDR - //#define JUCE_USE_XRANDR 1 -#endif - -#ifndef JUCE_USE_XINERAMA - //#define JUCE_USE_XINERAMA 1 -#endif - -#ifndef JUCE_USE_XSHM - //#define JUCE_USE_XSHM 1 -#endif - -#ifndef JUCE_USE_XRENDER - //#define JUCE_USE_XRENDER 0 -#endif - -#ifndef JUCE_USE_XCURSOR - //#define JUCE_USE_XCURSOR 1 -#endif - -#ifndef JUCE_WIN_PER_MONITOR_DPI_AWARE - //#define JUCE_WIN_PER_MONITOR_DPI_AWARE 1 -#endif - -//============================================================================== -// juce_gui_extra flags: - -#ifndef JUCE_WEB_BROWSER - //#define JUCE_WEB_BROWSER 1 -#endif - -#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR - //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 0 -#endif - -//============================================================================== -#ifndef JUCE_STANDALONE_APPLICATION - #if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone) - #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone - #else - #define JUCE_STANDALONE_APPLICATION 1 - #endif -#endif diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp index 5a5a3509e3..07207b7ea1 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp +++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp @@ -52,74 +52,74 @@ const char* PIPAudioProcessor_cpp_in = (const char*) temp_binary_data_1; //================== PIPComponent.cpp.in ================== static const unsigned char temp_binary_data_2[] = -"/*\n" -" ==============================================================================\n" -"\n" -" This file was auto-generated and contains the startup code for a PIP.\n" -"\n" -" ==============================================================================\n" -"*/\n" -"\n" -"#include \n" -"#include \"${JUCE_PIP_HEADER}\"\n" -"\n" -"class Application : public JUCEApplication\n" -"{\n" -"public:\n" -" //==============================================================================\n" -" Application() {}\n" -"\n" -" const String getApplicationName() override { return \"${JUCE_PIP_NAME}\"; }\n" -" const String getApplicationVersion() override { return \"${PROJECT_VERSION}\"; }\n" -"\n" -" void initialise (const String&) override\n" -" {\n" -" mainWindow.reset (new MainWindow (\"${JUCE_PIP_NAME}\", new ${JUCE_PIP_MAIN_CLASS}, *this));\n" -" }\n" -"\n" -" void shutdown() override { mainWindow = nullptr; }\n" -"\n" -"private:\n" -" class MainWindow : public DocumentWindow\n" -" {\n" -" public:\n" -" MainWindow (const String& name, Component* c, JUCEApplication& a)\n" -" : DocumentWindow (name, Desktop::getInstance().getDefaultLookAndFeel()\n" -" .findColour (ResizableWindow::backgroundColourId),\n" -" DocumentWindow::allButtons),\n" -" app (a)\n" -" {\n" -" setUsingNativeTitleBar (true);\n" -" setContentOwned (c, true);\n" -"\n" -" #if JUCE_ANDROID || JUCE_IOS\n" -" setFullScreen (true);\n" -" #else\n" -" setResizable (true, false);\n" -" setResizeLimits (300, 250, 10000, 10000);\n" -" centreWithSize (getWidth(), getHeight());\n" -" #endif\n" -"\n" -" setVisible (true);\n" -" }\n" -"\n" -" void closeButtonPressed() override\n" -" {\n" -" app.systemRequestedQuit();\n" -" }\n" -"\n" -" private:\n" -" JUCEApplication& app;\n" -"\n" -" //==============================================================================\n" -" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindow)\n" -" };\n" -"\n" -" std::unique_ptr mainWindow;\n" -"};\n" -"\n" -"//==============================================================================\n" -"START_JUCE_APPLICATION (Application)\n"; +"/*\r\n" +" ==============================================================================\r\n" +"\r\n" +" This file contains the startup code for a PIP.\r\n" +"\r\n" +" ==============================================================================\r\n" +"*/\r\n" +"\r\n" +"#include \r\n" +"#include \"${JUCE_PIP_HEADER}\"\r\n" +"\r\n" +"class Application : public JUCEApplication\r\n" +"{\r\n" +"public:\r\n" +" //==============================================================================\r\n" +" Application() {}\r\n" +"\r\n" +" const String getApplicationName() override { return \"${JUCE_PIP_NAME}\"; }\r\n" +" const String getApplicationVersion() override { return \"${PROJECT_VERSION}\"; }\r\n" +"\r\n" +" void initialise (const String&) override\r\n" +" {\r\n" +" mainWindow.reset (new MainWindow (\"${JUCE_PIP_NAME}\", new ${JUCE_PIP_MAIN_CLASS}, *this));\r\n" +" }\r\n" +"\r\n" +" void shutdown() override { mainWindow = nullptr; }\r\n" +"\r\n" +"private:\r\n" +" class MainWindow : public DocumentWindow\r\n" +" {\r\n" +" public:\r\n" +" MainWindow (const String& name, Component* c, JUCEApplication& a)\r\n" +" : DocumentWindow (name, Desktop::getInstance().getDefaultLookAndFeel()\r\n" +" .findColour (ResizableWindow::backgroundColourId),\r\n" +" DocumentWindow::allButtons),\r\n" +" app (a)\r\n" +" {\r\n" +" setUsingNativeTitleBar (true);\r\n" +" setContentOwned (c, true);\r\n" +"\r\n" +" #if JUCE_ANDROID || JUCE_IOS\r\n" +" setFullScreen (true);\r\n" +" #else\r\n" +" setResizable (true, false);\r\n" +" setResizeLimits (300, 250, 10000, 10000);\r\n" +" centreWithSize (getWidth(), getHeight());\r\n" +" #endif\r\n" +"\r\n" +" setVisible (true);\r\n" +" }\r\n" +"\r\n" +" void closeButtonPressed() override\r\n" +" {\r\n" +" app.systemRequestedQuit();\r\n" +" }\r\n" +"\r\n" +" private:\r\n" +" JUCEApplication& app;\r\n" +"\r\n" +" //==============================================================================\r\n" +" JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindow)\r\n" +" };\r\n" +"\r\n" +" std::unique_ptr mainWindow;\r\n" +"};\r\n" +"\r\n" +"//==============================================================================\r\n" +"START_JUCE_APPLICATION (Application)\r\n"; const char* PIPComponent_cpp_in = (const char*) temp_binary_data_2; @@ -5682,14 +5682,6 @@ const char* wizard_StaticLibrary_svg = (const char*) temp_binary_data_29; //================== jucer_AnimatedComponentSimpleTemplate.h ================== static const unsigned char temp_binary_data_30[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "#pragma once\r\n" "\r\n" "%%include_juce%%\r\n" @@ -5699,7 +5691,7 @@ static const unsigned char temp_binary_data_30[] = " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class %%content_component_class%% : public AnimatedAppComponent\r\n" +"class %%content_component_class%% : public juce::AnimatedAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" @@ -5723,10 +5715,10 @@ static const unsigned char temp_binary_data_30[] = " }\r\n" "\r\n" " //==============================================================================\r\n" -" void paint (Graphics& g) override\r\n" +" void paint (juce::Graphics& g) override\r\n" " {\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" -" g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" +" g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId));\r\n" "\r\n" " // You can add your drawing code here!\r\n" " }\r\n" @@ -5751,14 +5743,6 @@ const char* jucer_AnimatedComponentSimpleTemplate_h = (const char*) temp_binary_ //================== jucer_AnimatedComponentTemplate.cpp ================== static const unsigned char temp_binary_data_31[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "%%include_corresponding_header%%\r\n" "\r\n" "//==============================================================================\r\n" @@ -5782,10 +5766,10 @@ static const unsigned char temp_binary_data_31[] = "}\r\n" "\r\n" "//==============================================================================\r\n" -"void %%content_component_class%%::paint (Graphics& g)\r\n" +"void %%content_component_class%%::paint (juce::Graphics& g)\r\n" "{\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" -" g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" +" g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId));\r\n" "\r\n" " // You can add your drawing code here!\r\n" "}\r\n" @@ -5801,14 +5785,6 @@ const char* jucer_AnimatedComponentTemplate_cpp = (const char*) temp_binary_data //================== jucer_AnimatedComponentTemplate.h ================== static const unsigned char temp_binary_data_32[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "#pragma once\r\n" "\r\n" "%%include_juce%%\r\n" @@ -5818,7 +5794,7 @@ static const unsigned char temp_binary_data_32[] = " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class %%content_component_class%% : public AnimatedAppComponent\r\n" +"class %%content_component_class%% : public juce::AnimatedAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" @@ -5829,7 +5805,7 @@ static const unsigned char temp_binary_data_32[] = " void update() override;\r\n" "\r\n" " //==============================================================================\r\n" -" void paint (Graphics& g) override;\r\n" +" void paint (juce::Graphics& g) override;\r\n" " void resized() override;\r\n" "\r\n" "private:\r\n" @@ -5844,14 +5820,6 @@ const char* jucer_AnimatedComponentTemplate_h = (const char*) temp_binary_data_3 //================== jucer_AudioComponentSimpleTemplate.h ================== static const unsigned char temp_binary_data_33[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "#pragma once\r\n" "\r\n" "%%include_juce%%\r\n" @@ -5861,7 +5829,7 @@ static const unsigned char temp_binary_data_33[] = " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class %%content_component_class%% : public AudioAppComponent\r\n" +"class %%content_component_class%% : public juce::AudioAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" @@ -5872,11 +5840,11 @@ static const unsigned char temp_binary_data_33[] = " setSize (800, 600);\r\n" "\r\n" " // Some platforms require permissions to open input channels so request that here\r\n" -" if (RuntimePermissions::isRequired (RuntimePermissions::recordAudio)\r\n" -" && ! RuntimePermissions::isGranted (RuntimePermissions::recordAudio))\r\n" +" if (juce::RuntimePermissions::isRequired (juce::RuntimePermissions::recordAudio)\r\n" +" && ! juce::RuntimePermissions::isGranted (juce::RuntimePermissions::recordAudio))\r\n" " {\r\n" -" RuntimePermissions::request (RuntimePermissions::recordAudio,\r\n" -" [&] (bool granted) { setAudioChannels (granted ? 2 : 0, 2); });\r\n" +" juce::RuntimePermissions::request (juce::RuntimePermissions::recordAudio,\r\n" +" [&] (bool granted) { setAudioChannels (granted ? 2 : 0, 2); });\r\n" " }\r\n" " else\r\n" " {\r\n" @@ -5903,7 +5871,7 @@ static const unsigned char temp_binary_data_33[] = " // For more details, see the help for AudioProcessor::prepareToPlay()\r\n" " }\r\n" "\r\n" -" void getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill) override\r\n" +" void getNextAudioBlock (const juce::AudioSourceChannelInfo& bufferToFill) override\r\n" " {\r\n" " // Your audio-processing code goes here!\r\n" "\r\n" @@ -5923,10 +5891,10 @@ static const unsigned char temp_binary_data_33[] = " }\r\n" "\r\n" " //==============================================================================\r\n" -" void paint (Graphics& g) override\r\n" +" void paint (juce::Graphics& g) override\r\n" " {\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" -" g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" +" g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId));\r\n" "\r\n" " // You can add your drawing code here!\r\n" " }\r\n" @@ -5951,14 +5919,6 @@ const char* jucer_AudioComponentSimpleTemplate_h = (const char*) temp_binary_dat //================== jucer_AudioComponentTemplate.cpp ================== static const unsigned char temp_binary_data_34[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "%%include_corresponding_header%%\r\n" "\r\n" "//==============================================================================\r\n" @@ -5969,11 +5929,11 @@ static const unsigned char temp_binary_data_34[] = " setSize (800, 600);\r\n" "\r\n" " // Some platforms require permissions to open input channels so request that here\r\n" -" if (RuntimePermissions::isRequired (RuntimePermissions::recordAudio)\r\n" -" && ! RuntimePermissions::isGranted (RuntimePermissions::recordAudio))\r\n" +" if (juce::RuntimePermissions::isRequired (juce::RuntimePermissions::recordAudio)\r\n" +" && ! juce::RuntimePermissions::isGranted (juce::RuntimePermissions::recordAudio))\r\n" " {\r\n" -" RuntimePermissions::request (RuntimePermissions::recordAudio,\r\n" -" [&] (bool granted) { setAudioChannels (granted ? 2 : 0, 2); });\r\n" +" juce::RuntimePermissions::request (juce::RuntimePermissions::recordAudio,\r\n" +" [&] (bool granted) { setAudioChannels (granted ? 2 : 0, 2); });\r\n" " }\r\n" " else\r\n" " {\r\n" @@ -6000,7 +5960,7 @@ static const unsigned char temp_binary_data_34[] = " // For more details, see the help for AudioProcessor::prepareToPlay()\r\n" "}\r\n" "\r\n" -"void %%content_component_class%%::getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill)\r\n" +"void %%content_component_class%%::getNextAudioBlock (const juce::AudioSourceChannelInfo& bufferToFill)\r\n" "{\r\n" " // Your audio-processing code goes here!\r\n" "\r\n" @@ -6020,10 +5980,10 @@ static const unsigned char temp_binary_data_34[] = "}\r\n" "\r\n" "//==============================================================================\r\n" -"void %%content_component_class%%::paint (Graphics& g)\r\n" +"void %%content_component_class%%::paint (juce::Graphics& g)\r\n" "{\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" -" g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" +" g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId));\r\n" "\r\n" " // You can add your drawing code here!\r\n" "}\r\n" @@ -6039,14 +5999,6 @@ const char* jucer_AudioComponentTemplate_cpp = (const char*) temp_binary_data_34 //================== jucer_AudioComponentTemplate.h ================== static const unsigned char temp_binary_data_35[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "#pragma once\r\n" "\r\n" "%%include_juce%%\r\n" @@ -6056,7 +6008,7 @@ static const unsigned char temp_binary_data_35[] = " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class %%content_component_class%% : public AudioAppComponent\r\n" +"class %%content_component_class%% : public juce::AudioAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" @@ -6065,11 +6017,11 @@ static const unsigned char temp_binary_data_35[] = "\r\n" " //==============================================================================\r\n" " void prepareToPlay (int samplesPerBlockExpected, double sampleRate) override;\r\n" -" void getNextAudioBlock (const AudioSourceChannelInfo& bufferToFill) override;\r\n" +" void getNextAudioBlock (const juce::AudioSourceChannelInfo& bufferToFill) override;\r\n" " void releaseResources() override;\r\n" "\r\n" " //==============================================================================\r\n" -" void paint (Graphics& g) override;\r\n" +" void paint (juce::Graphics& g) override;\r\n" " void resized() override;\r\n" "\r\n" "private:\r\n" @@ -6087,9 +6039,7 @@ static const unsigned char temp_binary_data_36[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" It contains the basic framework code for a JUCE plugin editor.\r\n" +" This file contains the basic framework code for a JUCE plugin editor.\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" @@ -6110,14 +6060,14 @@ static const unsigned char temp_binary_data_36[] = "}\r\n" "\r\n" "//==============================================================================\r\n" -"void %%editor_class_name%%::paint (Graphics& g)\r\n" +"void %%editor_class_name%%::paint (juce::Graphics& g)\r\n" "{\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" -" g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" +" g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId));\r\n" "\r\n" -" g.setColour (Colours::white);\r\n" +" g.setColour (juce::Colours::white);\r\n" " g.setFont (15.0f);\r\n" -" g.drawFittedText (\"Hello World!\", getLocalBounds(), Justification::centred, 1);\r\n" +" g.drawFittedText (\"Hello World!\", getLocalBounds(), juce::Justification::centred, 1);\r\n" "}\r\n" "\r\n" "void %%editor_class_name%%::resized()\r\n" @@ -6133,9 +6083,7 @@ static const unsigned char temp_binary_data_37[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" It contains the basic framework code for a JUCE plugin editor.\r\n" +" This file contains the basic framework code for a JUCE plugin editor.\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" @@ -6147,14 +6095,14 @@ static const unsigned char temp_binary_data_37[] = "//==============================================================================\r\n" "/**\r\n" "*/\r\n" -"class %%editor_class_name%% : public AudioProcessorEditor\r\n" +"class %%editor_class_name%% : public juce::AudioProcessorEditor\r\n" "{\r\n" "public:\r\n" " %%editor_class_name%% (%%filter_class_name%%&);\r\n" " ~%%editor_class_name%%();\r\n" "\r\n" " //==============================================================================\r\n" -" void paint (Graphics&) override;\r\n" +" void paint (juce::Graphics&) override;\r\n" " void resized() override;\r\n" "\r\n" "private:\r\n" @@ -6172,9 +6120,7 @@ static const unsigned char temp_binary_data_38[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" It contains the basic framework code for a JUCE plugin processor.\r\n" +" This file contains the basic framework code for a JUCE plugin processor.\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" @@ -6187,9 +6133,9 @@ static const unsigned char temp_binary_data_38[] = " : AudioProcessor (BusesProperties()\r\n" " #if ! JucePlugin_IsMidiEffect\r\n" " #if ! JucePlugin_IsSynth\r\n" -" .withInput (\"Input\", AudioChannelSet::stereo(), true)\r\n" +" .withInput (\"Input\", juce::AudioChannelSet::stereo(), true)\r\n" " #endif\r\n" -" .withOutput (\"Output\", AudioChannelSet::stereo(), true)\r\n" +" .withOutput (\"Output\", juce::AudioChannelSet::stereo(), true)\r\n" " #endif\r\n" " )\r\n" "#endif\r\n" @@ -6201,7 +6147,7 @@ static const unsigned char temp_binary_data_38[] = "}\r\n" "\r\n" "//==============================================================================\r\n" -"const String %%filter_class_name%%::getName() const\r\n" +"const juce::String %%filter_class_name%%::getName() const\r\n" "{\r\n" " return JucePlugin_Name;\r\n" "}\r\n" @@ -6253,12 +6199,12 @@ static const unsigned char temp_binary_data_38[] = "{\r\n" "}\r\n" "\r\n" -"const String %%filter_class_name%%::getProgramName (int index)\r\n" +"const juce::String %%filter_class_name%%::getProgramName (int index)\r\n" "{\r\n" " return {};\r\n" "}\r\n" "\r\n" -"void %%filter_class_name%%::changeProgramName (int index, const String& newName)\r\n" +"void %%filter_class_name%%::changeProgramName (int index, const juce::String& newName)\r\n" "{\r\n" "}\r\n" "\r\n" @@ -6279,13 +6225,13 @@ static const unsigned char temp_binary_data_38[] = "bool %%filter_class_name%%::isBusesLayoutSupported (const BusesLayout& layouts) const\r\n" "{\r\n" " #if JucePlugin_IsMidiEffect\r\n" -" ignoreUnused (layouts);\r\n" +" juce::ignoreUnused (layouts);\r\n" " return true;\r\n" " #else\r\n" " // This is the place where you check if the layout is supported.\r\n" " // In this template code we only support mono or stereo.\r\n" -" if (layouts.getMainOutputChannelSet() != AudioChannelSet::mono()\r\n" -" && layouts.getMainOutputChannelSet() != AudioChannelSet::stereo())\r\n" +" if (layouts.getMainOutputChannelSet() != juce::AudioChannelSet::mono()\r\n" +" && layouts.getMainOutputChannelSet() != juce::AudioChannelSet::stereo())\r\n" " return false;\r\n" "\r\n" " // This checks if the input layout matches the output layout\r\n" @@ -6299,9 +6245,9 @@ static const unsigned char temp_binary_data_38[] = "}\r\n" "#endif\r\n" "\r\n" -"void %%filter_class_name%%::processBlock (AudioBuffer& buffer, MidiBuffer& midiMessages)\r\n" +"void %%filter_class_name%%::processBlock (juce::AudioBuffer& buffer, juce::MidiBuffer& midiMessages)\r\n" "{\r\n" -" ScopedNoDenormals noDenormals;\r\n" +" juce::ScopedNoDenormals noDenormals;\r\n" " auto totalNumInputChannels = getTotalNumInputChannels();\r\n" " auto totalNumOutputChannels = getTotalNumOutputChannels();\r\n" "\r\n" @@ -6334,13 +6280,13 @@ static const unsigned char temp_binary_data_38[] = " return true; // (change this to false if you choose to not supply an editor)\r\n" "}\r\n" "\r\n" -"AudioProcessorEditor* %%filter_class_name%%::createEditor()\r\n" +"juce::AudioProcessorEditor* %%filter_class_name%%::createEditor()\r\n" "{\r\n" " return new %%editor_class_name%% (*this);\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"void %%filter_class_name%%::getStateInformation (MemoryBlock& destData)\r\n" +"void %%filter_class_name%%::getStateInformation (juce::MemoryBlock& destData)\r\n" "{\r\n" " // You should use this method to store your parameters in the memory block.\r\n" " // You could do that either as raw data, or use the XML or ValueTree classes\r\n" @@ -6355,7 +6301,7 @@ static const unsigned char temp_binary_data_38[] = "\r\n" "//==============================================================================\r\n" "// This creates new instances of the plugin..\r\n" -"AudioProcessor* JUCE_CALLTYPE createPluginFilter()\r\n" +"juce::AudioProcessor* JUCE_CALLTYPE createPluginFilter()\r\n" "{\r\n" " return new %%filter_class_name%%();\r\n" "}\r\n"; @@ -6367,9 +6313,7 @@ static const unsigned char temp_binary_data_39[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" It contains the basic framework code for a JUCE plugin processor.\r\n" +" This file contains the basic framework code for a JUCE plugin processor.\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" @@ -6381,7 +6325,7 @@ static const unsigned char temp_binary_data_39[] = "//==============================================================================\r\n" "/**\r\n" "*/\r\n" -"class %%filter_class_name%% : public AudioProcessor\r\n" +"class %%filter_class_name%% : public juce::AudioProcessor\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" @@ -6396,14 +6340,14 @@ static const unsigned char temp_binary_data_39[] = " bool isBusesLayoutSupported (const BusesLayout& layouts) const override;\r\n" " #endif\r\n" "\r\n" -" void processBlock (AudioBuffer&, MidiBuffer&) override;\r\n" +" void processBlock (juce::AudioBuffer&, juce::MidiBuffer&) override;\r\n" "\r\n" " //==============================================================================\r\n" -" AudioProcessorEditor* createEditor() override;\r\n" +" juce::AudioProcessorEditor* createEditor() override;\r\n" " bool hasEditor() const override;\r\n" "\r\n" " //==============================================================================\r\n" -" const String getName() const override;\r\n" +" const juce::String getName() const override;\r\n" "\r\n" " bool acceptsMidi() const override;\r\n" " bool producesMidi() const override;\r\n" @@ -6414,11 +6358,11 @@ static const unsigned char temp_binary_data_39[] = " int getNumPrograms() override;\r\n" " int getCurrentProgram() override;\r\n" " void setCurrentProgram (int index) override;\r\n" -" const String getProgramName (int index) override;\r\n" -" void changeProgramName (int index, const String& newName) override;\r\n" +" const juce::String getProgramName (int index) override;\r\n" +" void changeProgramName (int index, const juce::String& newName) override;\r\n" "\r\n" " //==============================================================================\r\n" -" void getStateInformation (MemoryBlock& destData) override;\r\n" +" void getStateInformation (juce::MemoryBlock& destData) override;\r\n" " void setStateInformation (const void* data, int sizeInBytes) override;\r\n" "\r\n" "private:\r\n" @@ -6575,14 +6519,6 @@ const char* jucer_ComponentTemplate_h = (const char*) temp_binary_data_41; //================== jucer_ContentCompSimpleTemplate.h ================== static const unsigned char temp_binary_data_42[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "#pragma once\r\n" "\r\n" "%%include_juce%%\r\n" @@ -6592,7 +6528,7 @@ static const unsigned char temp_binary_data_42[] = " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class %%content_component_class%% : public Component\r\n" +"class %%content_component_class%% : public juce::Component\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" @@ -6606,14 +6542,14 @@ static const unsigned char temp_binary_data_42[] = " }\r\n" "\r\n" " //==============================================================================\r\n" -" void paint (Graphics& g) override\r\n" +" void paint (juce::Graphics& g) override\r\n" " {\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" -" g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" +" g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId));\r\n" "\r\n" -" g.setFont (Font (16.0f));\r\n" -" g.setColour (Colours::white);\r\n" -" g.drawText (\"Hello World!\", getLocalBounds(), Justification::centred, true);\r\n" +" g.setFont (juce::Font (16.0f));\r\n" +" g.setColour (juce::Colours::white);\r\n" +" g.drawText (\"Hello World!\", getLocalBounds(), juce::Justification::centred, true);\r\n" " }\r\n" "\r\n" " void resized() override\r\n" @@ -6636,14 +6572,6 @@ const char* jucer_ContentCompSimpleTemplate_h = (const char*) temp_binary_data_4 //================== jucer_ContentCompTemplate.cpp ================== static const unsigned char temp_binary_data_43[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "%%include_corresponding_header%%\r\n" "\r\n" "//==============================================================================\r\n" @@ -6657,14 +6585,14 @@ static const unsigned char temp_binary_data_43[] = "}\r\n" "\r\n" "//==============================================================================\r\n" -"void %%content_component_class%%::paint (Graphics& g)\r\n" +"void %%content_component_class%%::paint (juce::Graphics& g)\r\n" "{\r\n" " // (Our component is opaque, so we must completely fill the background with a solid colour)\r\n" -" g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId));\r\n" +" g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId));\r\n" "\r\n" -" g.setFont (Font (16.0f));\r\n" -" g.setColour (Colours::white);\r\n" -" g.drawText (\"Hello World!\", getLocalBounds(), Justification::centred, true);\r\n" +" g.setFont (juce::Font (16.0f));\r\n" +" g.setColour (juce::Colours::white);\r\n" +" g.drawText (\"Hello World!\", getLocalBounds(), juce::Justification::centred, true);\r\n" "}\r\n" "\r\n" "void %%content_component_class%%::resized()\r\n" @@ -6678,14 +6606,6 @@ const char* jucer_ContentCompTemplate_cpp = (const char*) temp_binary_data_43; //================== jucer_ContentCompTemplate.h ================== static const unsigned char temp_binary_data_44[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "#pragma once\r\n" "\r\n" "%%include_juce%%\r\n" @@ -6695,7 +6615,7 @@ static const unsigned char temp_binary_data_44[] = " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class %%content_component_class%% : public Component\r\n" +"class %%content_component_class%% : public juce::Component\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" @@ -6703,7 +6623,7 @@ static const unsigned char temp_binary_data_44[] = " ~%%content_component_class%%();\r\n" "\r\n" " //==============================================================================\r\n" -" void paint (Graphics&) override;\r\n" +" void paint (juce::Graphics&) override;\r\n" " void resized() override;\r\n" "\r\n" "private:\r\n" @@ -6719,7 +6639,7 @@ const char* jucer_ContentCompTemplate_h = (const char*) temp_binary_data_44; //================== jucer_InlineComponentTemplate.h ================== static const unsigned char temp_binary_data_45[] = "//==============================================================================\r\n" -"class %%component_class%% : public Component\r\n" +"class %%component_class%% : public juce::Component\r\n" "{\r\n" "public:\r\n" " %%component_class%%()\r\n" @@ -6733,19 +6653,19 @@ static const unsigned char temp_binary_data_45[] = " {\r\n" " }\r\n" "\r\n" -" void paint (Graphics& g) override\r\n" +" void paint (juce::Graphics& g) override\r\n" " {\r\n" " // You should replace everything in this method with your own drawing code..\r\n" "\r\n" -" g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); // clear the background\r\n" +" g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId)); // clear the background\r\n" "\r\n" -" g.setColour (Colours::grey);\r\n" +" g.setColour (juce::Colours::grey);\r\n" " g.drawRect (getLocalBounds(), 1); // draw an outline around the component\r\n" "\r\n" -" g.setColour (Colours::white);\r\n" +" g.setColour (juce::Colours::white);\r\n" " g.setFont (14.0f);\r\n" " g.drawText (\"%%component_class%%\", getLocalBounds(),\r\n" -" Justification::centred, true); // draw some placeholder text\r\n" +" juce::Justification::centred, true); // draw some placeholder text\r\n" " }\r\n" "\r\n" " void resized() override\r\n" @@ -6766,9 +6686,7 @@ static const unsigned char temp_binary_data_46[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" It contains the basic startup code for a JUCE application.\r\n" +" This file contains the basic startup code for a JUCE application.\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" @@ -6792,9 +6710,7 @@ static const unsigned char temp_binary_data_47[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" It contains the basic startup code for a JUCE application.\r\n" +" This file contains the basic startup code for a JUCE application.\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" @@ -6802,18 +6718,18 @@ static const unsigned char temp_binary_data_47[] = "%%app_headers%%\r\n" "\r\n" "//==============================================================================\r\n" -"class %%app_class_name%% : public JUCEApplication\r\n" +"class %%app_class_name%% : public juce::JUCEApplication\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" " %%app_class_name%%() {}\r\n" "\r\n" -" const String getApplicationName() override { return ProjectInfo::projectName; }\r\n" -" const String getApplicationVersion() override { return ProjectInfo::versionString; }\r\n" -" bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; }\r\n" +" const juce::String getApplicationName() override { return ProjectInfo::projectName; }\r\n" +" const juce::String getApplicationVersion() override { return ProjectInfo::versionString; }\r\n" +" bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; }\r\n" "\r\n" " //==============================================================================\r\n" -" void initialise (const String& commandLine) override\r\n" +" void initialise (const juce::String& commandLine) override\r\n" " {\r\n" " // Add your application's initialisation code here..\r\n" " }\r\n" @@ -6831,7 +6747,7 @@ static const unsigned char temp_binary_data_47[] = " quit();\r\n" " }\r\n" "\r\n" -" void anotherInstanceStarted (const String& commandLine) override\r\n" +" void anotherInstanceStarted (const juce::String& commandLine) override\r\n" " {\r\n" " // When another instance of the app is launched while this one is running,\r\n" " // this method is invoked, and the commandLine parameter tells you what\r\n" @@ -6850,9 +6766,7 @@ static const unsigned char temp_binary_data_48[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" It contains the basic startup code for a JUCE application.\r\n" +" This file contains the basic startup code for a JUCE application.\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" @@ -6860,18 +6774,18 @@ static const unsigned char temp_binary_data_48[] = "%%app_headers%%\r\n" "\r\n" "//==============================================================================\r\n" -"class %%app_class_name%% : public JUCEApplication\r\n" +"class %%app_class_name%% : public juce::JUCEApplication\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" " %%app_class_name%%() {}\r\n" "\r\n" -" const String getApplicationName() override { return ProjectInfo::projectName; }\r\n" -" const String getApplicationVersion() override { return ProjectInfo::versionString; }\r\n" -" bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; }\r\n" +" const juce::String getApplicationName() override { return ProjectInfo::projectName; }\r\n" +" const juce::String getApplicationVersion() override { return ProjectInfo::versionString; }\r\n" +" bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; }\r\n" "\r\n" " //==============================================================================\r\n" -" void initialise (const String& commandLine) override\r\n" +" void initialise (const juce::String& commandLine) override\r\n" " {\r\n" " // This method is where you should put your application's initialisation code..\r\n" "\r\n" @@ -6893,7 +6807,7 @@ static const unsigned char temp_binary_data_48[] = " quit();\r\n" " }\r\n" "\r\n" -" void anotherInstanceStarted (const String& commandLine) override\r\n" +" void anotherInstanceStarted (const juce::String& commandLine) override\r\n" " {\r\n" " // When another instance of the app is launched while this one is running,\r\n" " // this method is invoked, and the commandLine parameter tells you what\r\n" @@ -6905,13 +6819,14 @@ static const unsigned char temp_binary_data_48[] = " This class implements the desktop window that contains an instance of\r\n" " our %%content_component_class%% class.\r\n" " */\r\n" -" class MainWindow : public DocumentWindow\r\n" +" class MainWindow : public juce::DocumentWindow\r\n" " {\r\n" " public:\r\n" -" MainWindow (String name) : DocumentWindow (name,\r\n" -" Desktop::getInstance().getDefaultLookAndFeel()\r\n" -" .findColour (ResizableWindow::backgroundColourId),\r\n" -" DocumentWindow::allButtons)\r\n" +" MainWindow (juce::String name)\r\n" +" : DocumentWindow (name,\r\n" +" juce::Desktop::getInstance().getDefaultLookAndFeel()\r\n" +" .findColour (juce::ResizableWindow::backgroundColourId),\r\n" +" DocumentWindow::allButtons)\r\n" " {\r\n" " setUsingNativeTitleBar (true);\r\n" " setContentOwned (new %%content_component_class%%(), true);\r\n" @@ -6931,7 +6846,7 @@ static const unsigned char temp_binary_data_48[] = " // This is called when the user tries to close this window. Here, we'll just\r\n" " // ask the app to quit when this happens, but you can change this to do\r\n" " // whatever you need.\r\n" -" JUCEApplication::getInstance()->systemRequestedQuit();\r\n" +" juce::JUCEApplication::getInstance()->systemRequestedQuit();\r\n" " }\r\n" "\r\n" " /* Note: Be careful if you override any DocumentWindow methods - the base\r\n" @@ -6960,9 +6875,7 @@ static const unsigned char temp_binary_data_49[] = "/*\r\n" " ==============================================================================\r\n" "\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" It contains the basic startup code for a JUCE application.\r\n" +" This file contains the basic startup code for a JUCE application.\r\n" "\r\n" " ==============================================================================\r\n" "*/\r\n" @@ -6970,18 +6883,18 @@ static const unsigned char temp_binary_data_49[] = "%%app_headers%%\r\n" "\r\n" "//==============================================================================\r\n" -"class %%app_class_name%% : public JUCEApplication\r\n" +"class %%app_class_name%% : public juce::JUCEApplication\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" " %%app_class_name%%() {}\r\n" "\r\n" -" const String getApplicationName() override { return ProjectInfo::projectName; }\r\n" -" const String getApplicationVersion() override { return ProjectInfo::versionString; }\r\n" -" bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; }\r\n" +" const juce::String getApplicationName() override { return ProjectInfo::projectName; }\r\n" +" const juce::String getApplicationVersion() override { return ProjectInfo::versionString; }\r\n" +" bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; }\r\n" "\r\n" " //==============================================================================\r\n" -" void initialise (const String& commandLine) override\r\n" +" void initialise (const juce::String& commandLine) override\r\n" " {\r\n" " // This method is where you should put your application's initialisation code..\r\n" "\r\n" @@ -7003,7 +6916,7 @@ static const unsigned char temp_binary_data_49[] = " quit();\r\n" " }\r\n" "\r\n" -" void anotherInstanceStarted (const String& commandLine) override\r\n" +" void anotherInstanceStarted (const juce::String& commandLine) override\r\n" " {\r\n" " // When another instance of the app is launched while this one is running,\r\n" " // this method is invoked, and the commandLine parameter tells you what\r\n" @@ -7015,13 +6928,14 @@ static const unsigned char temp_binary_data_49[] = " This class implements the desktop window that contains an instance of\r\n" " our %%content_component_class%% class.\r\n" " */\r\n" -" class MainWindow : public DocumentWindow\r\n" +" class MainWindow : public juce::DocumentWindow\r\n" " {\r\n" " public:\r\n" -" MainWindow (String name) : DocumentWindow (name,\r\n" -" Desktop::getInstance().getDefaultLookAndFeel()\r\n" -" .findColour (ResizableWindow::backgroundColourId),\r\n" -" DocumentWindow::allButtons)\r\n" +" MainWindow (juce::String name)\r\n" +" : DocumentWindow (name,\r\n" +" juce::Desktop::getInstance().getDefaultLookAndFeel()\r\n" +" .findColour (juce::ResizableWindow::backgroundColourId),\r\n" +" DocumentWindow::allButtons)\r\n" " {\r\n" " setUsingNativeTitleBar (true);\r\n" " setContentOwned (new %%content_component_class%%(), true);\r\n" @@ -7092,7 +7006,7 @@ static const unsigned char temp_binary_data_50[] = "{\r\n" "}\r\n" "\r\n" -"void %%component_class%%::paint (Graphics& g)\r\n" +"void %%component_class%%::paint (juce::Graphics& g)\r\n" "{\r\n" " /* This demo code just fills the component's background and\r\n" " draws some placeholder text to get you started.\r\n" @@ -7101,15 +7015,15 @@ static const unsigned char temp_binary_data_50[] = " drawing code..\r\n" " */\r\n" "\r\n" -" g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); // clear the background\r\n" +" g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId)); // clear the background\r\n" "\r\n" -" g.setColour (Colours::grey);\r\n" +" g.setColour (juce::Colours::grey);\r\n" " g.drawRect (getLocalBounds(), 1); // draw an outline around the component\r\n" "\r\n" -" g.setColour (Colours::white);\r\n" +" g.setColour (juce::Colours::white);\r\n" " g.setFont (14.0f);\r\n" " g.drawText (\"%%component_class%%\", getLocalBounds(),\r\n" -" Justification::centred, true); // draw some placeholder text\r\n" +" juce::Justification::centred, true); // draw some placeholder text\r\n" "}\r\n" "\r\n" "void %%component_class%%::resized()\r\n" @@ -7140,13 +7054,13 @@ static const unsigned char temp_binary_data_51[] = "//==============================================================================\r\n" "/*\r\n" "*/\r\n" -"class %%component_class%% : public Component\r\n" +"class %%component_class%% : public juce::Component\r\n" "{\r\n" "public:\r\n" " %%component_class%%();\r\n" " ~%%component_class%%();\r\n" "\r\n" -" void paint (Graphics&) override;\r\n" +" void paint (juce::Graphics&) override;\r\n" " void resized() override;\r\n" "\r\n" "private:\r\n" @@ -7206,7 +7120,7 @@ static const unsigned char temp_binary_data_54[] = "//==============================================================================\r\n" "/*\r\n" "*/\r\n" -"class %%component_class%% : public Component\r\n" +"class %%component_class%% : public juce::Component\r\n" "{\r\n" "public:\r\n" " %%component_class%%()\r\n" @@ -7220,7 +7134,7 @@ static const unsigned char temp_binary_data_54[] = " {\r\n" " }\r\n" "\r\n" -" void paint (Graphics& g) override\r\n" +" void paint (juce::Graphics& g) override\r\n" " {\r\n" " /* This demo code just fills the component's background and\r\n" " draws some placeholder text to get you started.\r\n" @@ -7229,15 +7143,15 @@ static const unsigned char temp_binary_data_54[] = " drawing code..\r\n" " */\r\n" "\r\n" -" g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); // clear the background\r\n" +" g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId)); // clear the background\r\n" "\r\n" -" g.setColour (Colours::grey);\r\n" +" g.setColour (juce::Colours::grey);\r\n" " g.drawRect (getLocalBounds(), 1); // draw an outline around the component\r\n" "\r\n" -" g.setColour (Colours::white);\r\n" +" g.setColour (juce::Colours::white);\r\n" " g.setFont (14.0f);\r\n" " g.drawText (\"%%component_class%%\", getLocalBounds(),\r\n" -" Justification::centred, true); // draw some placeholder text\r\n" +" juce::Justification::centred, true); // draw some placeholder text\r\n" " }\r\n" "\r\n" " void resized() override\r\n" @@ -7255,14 +7169,6 @@ const char* jucer_NewInlineComponentTemplate_h = (const char*) temp_binary_data_ //================== jucer_OpenGLComponentSimpleTemplate.h ================== static const unsigned char temp_binary_data_55[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "#pragma once\r\n" "\r\n" "%%include_juce%%\r\n" @@ -7272,7 +7178,7 @@ static const unsigned char temp_binary_data_55[] = " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class %%content_component_class%% : public OpenGLAppComponent\r\n" +"class %%content_component_class%% : public juce::OpenGLAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" @@ -7303,13 +7209,13 @@ static const unsigned char temp_binary_data_55[] = " void render() override\r\n" " {\r\n" " // This clears the context with a black background.\r\n" -" OpenGLHelpers::clear (Colours::black);\r\n" +" juce::OpenGLHelpers::clear (Colours::black);\r\n" "\r\n" " // Add your rendering code here...\r\n" " }\r\n" "\r\n" " //==============================================================================\r\n" -" void paint (Graphics& g) override\r\n" +" void paint (juce::Graphics& g) override\r\n" " {\r\n" " // You can add your component specific drawing code here!\r\n" " // This will draw over the top of the openGL background.\r\n" @@ -7335,14 +7241,6 @@ const char* jucer_OpenGLComponentSimpleTemplate_h = (const char*) temp_binary_da //================== jucer_OpenGLComponentTemplate.cpp ================== static const unsigned char temp_binary_data_56[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "%%include_corresponding_header%%\r\n" "\r\n" "//==============================================================================\r\n" @@ -7373,13 +7271,13 @@ static const unsigned char temp_binary_data_56[] = "void %%content_component_class%%::render()\r\n" "{\r\n" " // This clears the context with a black background.\r\n" -" OpenGLHelpers::clear (Colours::black);\r\n" +" juce::OpenGLHelpers::clear (juce::Colours::black);\r\n" "\r\n" " // Add your rendering code here...\r\n" "}\r\n" "\r\n" "//==============================================================================\r\n" -"void %%content_component_class%%::paint (Graphics& g)\r\n" +"void %%content_component_class%%::paint (juce::Graphics& g)\r\n" "{\r\n" " // You can add your component specific drawing code here!\r\n" " // This will draw over the top of the openGL background.\r\n" @@ -7396,14 +7294,6 @@ const char* jucer_OpenGLComponentTemplate_cpp = (const char*) temp_binary_data_5 //================== jucer_OpenGLComponentTemplate.h ================== static const unsigned char temp_binary_data_57[] = -"/*\r\n" -" ==============================================================================\r\n" -"\r\n" -" This file was auto-generated!\r\n" -"\r\n" -" ==============================================================================\r\n" -"*/\r\n" -"\r\n" "#pragma once\r\n" "\r\n" "%%include_juce%%\r\n" @@ -7413,7 +7303,7 @@ static const unsigned char temp_binary_data_57[] = " This component lives inside our window, and this is where you should put all\r\n" " your controls and content.\r\n" "*/\r\n" -"class %%content_component_class%% : public OpenGLAppComponent\r\n" +"class %%content_component_class%% : public juce::OpenGLAppComponent\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" @@ -7426,7 +7316,7 @@ static const unsigned char temp_binary_data_57[] = " void render() override;\r\n" "\r\n" " //==============================================================================\r\n" -" void paint (Graphics& g) override;\r\n" +" void paint (juce::Graphics& g) override;\r\n" " void resized() override;\r\n" "\r\n" "private:\r\n" @@ -7441,13 +7331,13 @@ const char* jucer_OpenGLComponentTemplate_h = (const char*) temp_binary_data_57; //================== jucer_PIPAudioProcessorTemplate.h ================== static const unsigned char temp_binary_data_58[] = -"class %%class_name%% : public AudioProcessor\r\n" +"class %%class_name%% : public juce::AudioProcessor\r\n" "{\r\n" "public:\r\n" " //==============================================================================\r\n" " %%class_name%%()\r\n" -" : AudioProcessor (BusesProperties().withInput (\"Input\", AudioChannelSet::stereo())\r\n" -" .withOutput (\"Output\", AudioChannelSet::stereo()))\r\n" +" : AudioProcessor (BusesProperties().withInput (\"Input\", juce::AudioChannelSet::stereo())\r\n" +" .withOutput (\"Output\", juce::AudioChannelSet::stereo()))\r\n" " {\r\n" " }\r\n" "\r\n" @@ -7468,9 +7358,9 @@ static const unsigned char temp_binary_data_58[] = " // spare memory, etc.\r\n" " }\r\n" "\r\n" -" void processBlock (AudioBuffer& buffer, MidiBuffer&) override\r\n" +" void processBlock (juce::AudioBuffer& buffer, juce::MidiBuffer&) override\r\n" " {\r\n" -" ScopedNoDenormals noDenormals;\r\n" +" juce::ScopedNoDenormals noDenormals;\r\n" " auto totalNumInputChannels = getTotalNumInputChannels();\r\n" " auto totalNumOutputChannels = getTotalNumOutputChannels();\r\n" "\r\n" @@ -7498,24 +7388,24 @@ static const unsigned char temp_binary_data_58[] = " }\r\n" "\r\n" " //==============================================================================\r\n" -" AudioProcessorEditor* createEditor() override { return nullptr; }\r\n" -" bool hasEditor() const override { return false; }\r\n" +" juce::AudioProcessorEditor* createEditor() override { return nullptr; }\r\n" +" bool hasEditor() const override { return false; }\r\n" "\r\n" " //==============================================================================\r\n" -" const String getName() const override { return \"%%name%%\"; }\r\n" -" bool acceptsMidi() const override { return false; }\r\n" -" bool producesMidi() const override { return false; }\r\n" -" double getTailLengthSeconds() const override { return 0; }\r\n" +" const juce::String getName() const override { return \"%%name%%\"; }\r\n" +" bool acceptsMidi() const override { return false; }\r\n" +" bool producesMidi() const override { return false; }\r\n" +" double getTailLengthSeconds() const override { return 0; }\r\n" "\r\n" " //==============================================================================\r\n" -" int getNumPrograms() override { return 1; }\r\n" -" int getCurrentProgram() override { return 0; }\r\n" -" void setCurrentProgram (int) override {}\r\n" -" const String getProgramName (int) override { return {}; }\r\n" -" void changeProgramName (int, const String&) override {}\r\n" +" int getNumPrograms() override { return 1; }\r\n" +" int getCurrentProgram() override { return 0; }\r\n" +" void setCurrentProgram (int) override {}\r\n" +" const juce::String getProgramName (int) override { return {}; }\r\n" +" void changeProgramName (int, const juce::String&) override {}\r\n" "\r\n" " //==============================================================================\r\n" -" void getStateInformation (MemoryBlock& destData) override\r\n" +" void getStateInformation (juce::MemoryBlock& destData) override\r\n" " {\r\n" " // You should use this method to store your parameters in the memory block.\r\n" " // You could do that either as raw data, or use the XML or ValueTree classes\r\n" @@ -7533,8 +7423,8 @@ static const unsigned char temp_binary_data_58[] = " {\r\n" " // This is the place where you check if the layout is supported.\r\n" " // In this template code we only support mono or stereo.\r\n" -" if (layouts.getMainOutputChannelSet() != AudioChannelSet::mono()\r\n" -" && layouts.getMainOutputChannelSet() != AudioChannelSet::stereo())\r\n" +" if (layouts.getMainOutputChannelSet() != juce::AudioChannelSet::mono()\r\n" +" && layouts.getMainOutputChannelSet() != juce::AudioChannelSet::stereo())\r\n" " return false;\r\n" "\r\n" " // This checks if the input layout matches the output layout\r\n" @@ -7862,7 +7752,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) { case 0x31d21131: numBytes = 1042; return LaunchScreen_storyboard; case 0x24e5a04d: numBytes = 477; return PIPAudioProcessor_cpp_in; - case 0xd572ce5a: numBytes = 2162; return PIPComponent_cpp_in; + case 0xd572ce5a: numBytes = 2207; return PIPComponent_cpp_in; case 0x1a77c680: numBytes = 299; return PIPConsole_cpp_in; case 0xa41e649d: numBytes = 2842; return RecentFilesMenuTemplate_nib; case 0x667fbbb3: numBytes = 6424; return UnityPluginGUIScript_cs_in; @@ -7890,35 +7780,35 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) case 0x52a8dfdf: numBytes = 1859; return wizard_Openfile_svg; case 0x58e2ae48: numBytes = 4551; return wizard_OpenGL_svg; case 0xb1da6f9e: numBytes = 7488; return wizard_StaticLibrary_svg; - case 0xd11e6d35: numBytes = 2085; return jucer_AnimatedComponentSimpleTemplate_h; - case 0x6cf2645e: numBytes = 1563; return jucer_AnimatedComponentTemplate_cpp; - case 0x97b055e3: numBytes = 1201; return jucer_AnimatedComponentTemplate_h; - case 0xfb6f6d96: numBytes = 3702; return jucer_AudioComponentSimpleTemplate_h; - case 0xafccbd3f: numBytes = 3094; return jucer_AudioComponentTemplate_cpp; - case 0x915d7304: numBytes = 1383; return jucer_AudioComponentTemplate_h; - case 0x27c5a93a: numBytes = 1356; return jucer_AudioPluginEditorTemplate_cpp; - case 0x4d0721bf: numBytes = 977; return jucer_AudioPluginEditorTemplate_h; - case 0x51b49ac5: numBytes = 6036; return jucer_AudioPluginFilterTemplate_cpp; - case 0x488afa0a: numBytes = 2272; return jucer_AudioPluginFilterTemplate_h; + case 0xd11e6d35: numBytes = 1890; return jucer_AnimatedComponentSimpleTemplate_h; + case 0x6cf2645e: numBytes = 1362; return jucer_AnimatedComponentTemplate_cpp; + case 0x97b055e3: numBytes = 1000; return jucer_AnimatedComponentTemplate_h; + case 0xfb6f6d96: numBytes = 3555; return jucer_AudioComponentSimpleTemplate_h; + case 0xafccbd3f: numBytes = 2941; return jucer_AudioComponentTemplate_cpp; + case 0x915d7304: numBytes = 1188; return jucer_AudioComponentTemplate_h; + case 0x27c5a93a: numBytes = 1350; return jucer_AudioPluginEditorTemplate_cpp; + case 0x4d0721bf: numBytes = 959; return jucer_AudioPluginEditorTemplate_h; + case 0x51b49ac5: numBytes = 6090; return jucer_AudioPluginFilterTemplate_cpp; + case 0x488afa0a: numBytes = 2290; return jucer_AudioPluginFilterTemplate_h; case 0xabad7041: numBytes = 2126; return jucer_ComponentTemplate_cpp; case 0xfc72fe86: numBytes = 2044; return jucer_ComponentTemplate_h; - case 0x1657b643: numBytes = 1693; return jucer_ContentCompSimpleTemplate_h; - case 0x0b66646c: numBytes = 1190; return jucer_ContentCompTemplate_cpp; - case 0x6fa10171: numBytes = 1071; return jucer_ContentCompTemplate_h; - case 0x28d496ad: numBytes = 1233; return jucer_InlineComponentTemplate_h; - case 0x8905395b: numBytes = 473; return jucer_MainConsoleAppTemplate_cpp; - case 0x5e5ea047: numBytes = 2021; return jucer_MainTemplate_NoWindow_cpp; - case 0xda2391f8: numBytes = 4127; return jucer_MainTemplate_SimpleWindow_cpp; - case 0x400bc026: numBytes = 4127; return jucer_MainTemplate_Window_cpp; - case 0xf4842835: numBytes = 1491; return jucer_NewComponentTemplate_cpp; - case 0xe7bf237a: numBytes = 646; return jucer_NewComponentTemplate_h; + case 0x1657b643: numBytes = 1516; return jucer_ContentCompSimpleTemplate_h; + case 0x0b66646c: numBytes = 1007; return jucer_ContentCompTemplate_cpp; + case 0x6fa10171: numBytes = 870; return jucer_ContentCompTemplate_h; + case 0x28d496ad: numBytes = 1269; return jucer_InlineComponentTemplate_h; + case 0x8905395b: numBytes = 443; return jucer_MainConsoleAppTemplate_cpp; + case 0x5e5ea047: numBytes = 2027; return jucer_MainTemplate_NoWindow_cpp; + case 0xda2391f8: numBytes = 4115; return jucer_MainTemplate_SimpleWindow_cpp; + case 0x400bc026: numBytes = 4109; return jucer_MainTemplate_Window_cpp; + case 0xf4842835: numBytes = 1521; return jucer_NewComponentTemplate_cpp; + case 0xe7bf237a: numBytes = 658; return jucer_NewComponentTemplate_h; case 0x02a2a077: numBytes = 278; return jucer_NewCppFileTemplate_cpp; case 0x0842c43c: numBytes = 258; return jucer_NewCppFileTemplate_h; - case 0x36e634a1: numBytes = 1676; return jucer_NewInlineComponentTemplate_h; - case 0x6bdeb129: numBytes = 2174; return jucer_OpenGLComponentSimpleTemplate_h; - case 0x7fbac252: numBytes = 1665; return jucer_OpenGLComponentTemplate_cpp; - case 0x491fa0d7: numBytes = 1263; return jucer_OpenGLComponentTemplate_h; - case 0xbc050edc: numBytes = 4926; return jucer_PIPAudioProcessorTemplate_h; + case 0x36e634a1: numBytes = 1712; return jucer_NewInlineComponentTemplate_h; + case 0x6bdeb129: numBytes = 1979; return jucer_OpenGLComponentSimpleTemplate_h; + case 0x7fbac252: numBytes = 1470; return jucer_OpenGLComponentTemplate_cpp; + case 0x491fa0d7: numBytes = 1062; return jucer_OpenGLComponentTemplate_h; + case 0xbc050edc: numBytes = 5046; return jucer_PIPAudioProcessorTemplate_h; case 0x0b16e320: numBytes = 517; return jucer_PIPTemplate_h; case 0x763d39dc: numBytes = 1050; return colourscheme_dark_xml; case 0xe8b08520: numBytes = 1050; return colourscheme_light_xml; diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.h b/extras/Projucer/JuceLibraryCode/BinaryData.h index 9cbe060742..b8dde0c080 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.h +++ b/extras/Projucer/JuceLibraryCode/BinaryData.h @@ -15,7 +15,7 @@ namespace BinaryData const int PIPAudioProcessor_cpp_inSize = 477; extern const char* PIPComponent_cpp_in; - const int PIPComponent_cpp_inSize = 2162; + const int PIPComponent_cpp_inSize = 2207; extern const char* PIPConsole_cpp_in; const int PIPConsole_cpp_inSize = 299; @@ -99,34 +99,34 @@ namespace BinaryData const int wizard_StaticLibrary_svgSize = 7488; extern const char* jucer_AnimatedComponentSimpleTemplate_h; - const int jucer_AnimatedComponentSimpleTemplate_hSize = 2085; + const int jucer_AnimatedComponentSimpleTemplate_hSize = 1890; extern const char* jucer_AnimatedComponentTemplate_cpp; - const int jucer_AnimatedComponentTemplate_cppSize = 1563; + const int jucer_AnimatedComponentTemplate_cppSize = 1362; extern const char* jucer_AnimatedComponentTemplate_h; - const int jucer_AnimatedComponentTemplate_hSize = 1201; + const int jucer_AnimatedComponentTemplate_hSize = 1000; extern const char* jucer_AudioComponentSimpleTemplate_h; - const int jucer_AudioComponentSimpleTemplate_hSize = 3702; + const int jucer_AudioComponentSimpleTemplate_hSize = 3555; extern const char* jucer_AudioComponentTemplate_cpp; - const int jucer_AudioComponentTemplate_cppSize = 3094; + const int jucer_AudioComponentTemplate_cppSize = 2941; extern const char* jucer_AudioComponentTemplate_h; - const int jucer_AudioComponentTemplate_hSize = 1383; + const int jucer_AudioComponentTemplate_hSize = 1188; extern const char* jucer_AudioPluginEditorTemplate_cpp; - const int jucer_AudioPluginEditorTemplate_cppSize = 1356; + const int jucer_AudioPluginEditorTemplate_cppSize = 1350; extern const char* jucer_AudioPluginEditorTemplate_h; - const int jucer_AudioPluginEditorTemplate_hSize = 977; + const int jucer_AudioPluginEditorTemplate_hSize = 959; extern const char* jucer_AudioPluginFilterTemplate_cpp; - const int jucer_AudioPluginFilterTemplate_cppSize = 6036; + const int jucer_AudioPluginFilterTemplate_cppSize = 6090; extern const char* jucer_AudioPluginFilterTemplate_h; - const int jucer_AudioPluginFilterTemplate_hSize = 2272; + const int jucer_AudioPluginFilterTemplate_hSize = 2290; extern const char* jucer_ComponentTemplate_cpp; const int jucer_ComponentTemplate_cppSize = 2126; @@ -135,34 +135,34 @@ namespace BinaryData const int jucer_ComponentTemplate_hSize = 2044; extern const char* jucer_ContentCompSimpleTemplate_h; - const int jucer_ContentCompSimpleTemplate_hSize = 1693; + const int jucer_ContentCompSimpleTemplate_hSize = 1516; extern const char* jucer_ContentCompTemplate_cpp; - const int jucer_ContentCompTemplate_cppSize = 1190; + const int jucer_ContentCompTemplate_cppSize = 1007; extern const char* jucer_ContentCompTemplate_h; - const int jucer_ContentCompTemplate_hSize = 1071; + const int jucer_ContentCompTemplate_hSize = 870; extern const char* jucer_InlineComponentTemplate_h; - const int jucer_InlineComponentTemplate_hSize = 1233; + const int jucer_InlineComponentTemplate_hSize = 1269; extern const char* jucer_MainConsoleAppTemplate_cpp; - const int jucer_MainConsoleAppTemplate_cppSize = 473; + const int jucer_MainConsoleAppTemplate_cppSize = 443; extern const char* jucer_MainTemplate_NoWindow_cpp; - const int jucer_MainTemplate_NoWindow_cppSize = 2021; + const int jucer_MainTemplate_NoWindow_cppSize = 2027; extern const char* jucer_MainTemplate_SimpleWindow_cpp; - const int jucer_MainTemplate_SimpleWindow_cppSize = 4127; + const int jucer_MainTemplate_SimpleWindow_cppSize = 4115; extern const char* jucer_MainTemplate_Window_cpp; - const int jucer_MainTemplate_Window_cppSize = 4127; + const int jucer_MainTemplate_Window_cppSize = 4109; extern const char* jucer_NewComponentTemplate_cpp; - const int jucer_NewComponentTemplate_cppSize = 1491; + const int jucer_NewComponentTemplate_cppSize = 1521; extern const char* jucer_NewComponentTemplate_h; - const int jucer_NewComponentTemplate_hSize = 646; + const int jucer_NewComponentTemplate_hSize = 658; extern const char* jucer_NewCppFileTemplate_cpp; const int jucer_NewCppFileTemplate_cppSize = 278; @@ -171,19 +171,19 @@ namespace BinaryData const int jucer_NewCppFileTemplate_hSize = 258; extern const char* jucer_NewInlineComponentTemplate_h; - const int jucer_NewInlineComponentTemplate_hSize = 1676; + const int jucer_NewInlineComponentTemplate_hSize = 1712; extern const char* jucer_OpenGLComponentSimpleTemplate_h; - const int jucer_OpenGLComponentSimpleTemplate_hSize = 2174; + const int jucer_OpenGLComponentSimpleTemplate_hSize = 1979; extern const char* jucer_OpenGLComponentTemplate_cpp; - const int jucer_OpenGLComponentTemplate_cppSize = 1665; + const int jucer_OpenGLComponentTemplate_cppSize = 1470; extern const char* jucer_OpenGLComponentTemplate_h; - const int jucer_OpenGLComponentTemplate_hSize = 1263; + const int jucer_OpenGLComponentTemplate_hSize = 1062; extern const char* jucer_PIPAudioProcessorTemplate_h; - const int jucer_PIPAudioProcessorTemplate_hSize = 4926; + const int jucer_PIPAudioProcessorTemplate_hSize = 5046; extern const char* jucer_PIPTemplate_h; const int jucer_PIPTemplate_hSize = 517; diff --git a/extras/Projucer/JuceLibraryCode/JuceHeader.h b/extras/Projucer/JuceLibraryCode/JuceHeader.h index 6a729fdfb7..9de5242f54 100644 --- a/extras/Projucer/JuceLibraryCode/JuceHeader.h +++ b/extras/Projucer/JuceLibraryCode/JuceHeader.h @@ -12,7 +12,6 @@ #pragma once -#include "AppConfig.h" #include #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_analytics.cpp b/extras/Projucer/JuceLibraryCode/include_juce_analytics.cpp index 3dfd4d2179..cda0f9390a 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_analytics.cpp +++ b/extras/Projucer/JuceLibraryCode/include_juce_analytics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_build_tools.cpp b/extras/Projucer/JuceLibraryCode/include_juce_build_tools.cpp index 37e445f792..e87b735176 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_build_tools.cpp +++ b/extras/Projucer/JuceLibraryCode/include_juce_build_tools.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_core.cpp b/extras/Projucer/JuceLibraryCode/include_juce_core.cpp index d0ce1636f0..84fe988cb2 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_core.cpp +++ b/extras/Projucer/JuceLibraryCode/include_juce_core.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_core.mm b/extras/Projucer/JuceLibraryCode/include_juce_core.mm index 72b10bf817..9ee67bf662 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_core.mm +++ b/extras/Projucer/JuceLibraryCode/include_juce_core.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_cryptography.cpp b/extras/Projucer/JuceLibraryCode/include_juce_cryptography.cpp index 10b3401dbe..ee7d9085f0 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_cryptography.cpp +++ b/extras/Projucer/JuceLibraryCode/include_juce_cryptography.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_cryptography.mm b/extras/Projucer/JuceLibraryCode/include_juce_cryptography.mm index 9311ea0ffe..03ee05f466 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_cryptography.mm +++ b/extras/Projucer/JuceLibraryCode/include_juce_cryptography.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_data_structures.cpp b/extras/Projucer/JuceLibraryCode/include_juce_data_structures.cpp index 9315aa1686..152980aeb6 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_data_structures.cpp +++ b/extras/Projucer/JuceLibraryCode/include_juce_data_structures.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_data_structures.mm b/extras/Projucer/JuceLibraryCode/include_juce_data_structures.mm index 695ec43925..02b9711c65 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_data_structures.mm +++ b/extras/Projucer/JuceLibraryCode/include_juce_data_structures.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_events.cpp b/extras/Projucer/JuceLibraryCode/include_juce_events.cpp index 1bba110a97..39268e2b3e 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_events.cpp +++ b/extras/Projucer/JuceLibraryCode/include_juce_events.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_events.mm b/extras/Projucer/JuceLibraryCode/include_juce_events.mm index 4cc34fc401..191a998705 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_events.mm +++ b/extras/Projucer/JuceLibraryCode/include_juce_events.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_graphics.cpp b/extras/Projucer/JuceLibraryCode/include_juce_graphics.cpp index 319c76de0e..8ccabef94f 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_graphics.cpp +++ b/extras/Projucer/JuceLibraryCode/include_juce_graphics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_graphics.mm b/extras/Projucer/JuceLibraryCode/include_juce_graphics.mm index b28e6dd056..6bb7456da9 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_graphics.mm +++ b/extras/Projucer/JuceLibraryCode/include_juce_graphics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_gui_basics.cpp b/extras/Projucer/JuceLibraryCode/include_juce_gui_basics.cpp index 216c76bb05..71d04b2432 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_gui_basics.cpp +++ b/extras/Projucer/JuceLibraryCode/include_juce_gui_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_gui_basics.mm b/extras/Projucer/JuceLibraryCode/include_juce_gui_basics.mm index 6a9726fa5f..e449e0b733 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_gui_basics.mm +++ b/extras/Projucer/JuceLibraryCode/include_juce_gui_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_gui_extra.cpp b/extras/Projucer/JuceLibraryCode/include_juce_gui_extra.cpp index 7226e19833..a33ece0061 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_gui_extra.cpp +++ b/extras/Projucer/JuceLibraryCode/include_juce_gui_extra.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/JuceLibraryCode/include_juce_gui_extra.mm b/extras/Projucer/JuceLibraryCode/include_juce_gui_extra.mm index c9b6c3bfc6..6dacee3a6a 100644 --- a/extras/Projucer/JuceLibraryCode/include_juce_gui_extra.mm +++ b/extras/Projucer/JuceLibraryCode/include_juce_gui_extra.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/Projucer/Projucer.jucer b/extras/Projucer/Projucer.jucer index 5507008446..1ef3ee02da 100644 --- a/extras/Projucer/Projucer.jucer +++ b/extras/Projucer/Projucer.jucer @@ -3,7 +3,8 @@ + companyName="ROLI Ltd." companyCopyright="ROLI Ltd." cppLanguageStandard="11" + useAppConfig="0" addUsingNamespaceToJuceHeader="1"> & buffer, MidiBuffer& midiMessages) +void %%filter_class_name%%::processBlock (juce::AudioBuffer& buffer, juce::MidiBuffer& midiMessages) { - ScopedNoDenormals noDenormals; + juce::ScopedNoDenormals noDenormals; auto totalNumInputChannels = getTotalNumInputChannels(); auto totalNumOutputChannels = getTotalNumOutputChannels(); @@ -163,13 +161,13 @@ bool %%filter_class_name%%::hasEditor() const return true; // (change this to false if you choose to not supply an editor) } -AudioProcessorEditor* %%filter_class_name%%::createEditor() +juce::AudioProcessorEditor* %%filter_class_name%%::createEditor() { return new %%editor_class_name%% (*this); } //============================================================================== -void %%filter_class_name%%::getStateInformation (MemoryBlock& destData) +void %%filter_class_name%%::getStateInformation (juce::MemoryBlock& destData) { // You should use this method to store your parameters in the memory block. // You could do that either as raw data, or use the XML or ValueTree classes @@ -184,7 +182,7 @@ void %%filter_class_name%%::setStateInformation (const void* data, int sizeInByt //============================================================================== // This creates new instances of the plugin.. -AudioProcessor* JUCE_CALLTYPE createPluginFilter() +juce::AudioProcessor* JUCE_CALLTYPE createPluginFilter() { return new %%filter_class_name%%(); } diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.h index d1668e9596..7198924ffa 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_AudioPluginFilterTemplate.h @@ -1,9 +1,7 @@ /* ============================================================================== - This file was auto-generated! - - It contains the basic framework code for a JUCE plugin processor. + This file contains the basic framework code for a JUCE plugin processor. ============================================================================== */ @@ -15,7 +13,7 @@ //============================================================================== /** */ -class %%filter_class_name%% : public AudioProcessor +class %%filter_class_name%% : public juce::AudioProcessor { public: //============================================================================== @@ -30,14 +28,14 @@ public: bool isBusesLayoutSupported (const BusesLayout& layouts) const override; #endif - void processBlock (AudioBuffer&, MidiBuffer&) override; + void processBlock (juce::AudioBuffer&, juce::MidiBuffer&) override; //============================================================================== - AudioProcessorEditor* createEditor() override; + juce::AudioProcessorEditor* createEditor() override; bool hasEditor() const override; //============================================================================== - const String getName() const override; + const juce::String getName() const override; bool acceptsMidi() const override; bool producesMidi() const override; @@ -48,11 +46,11 @@ public: int getNumPrograms() override; int getCurrentProgram() override; void setCurrentProgram (int index) override; - const String getProgramName (int index) override; - void changeProgramName (int index, const String& newName) override; + const juce::String getProgramName (int index) override; + void changeProgramName (int index, const juce::String& newName) override; //============================================================================== - void getStateInformation (MemoryBlock& destData) override; + void getStateInformation (juce::MemoryBlock& destData) override; void setStateInformation (const void* data, int sizeInBytes) override; private: diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompSimpleTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompSimpleTemplate.h index 8178bea4f4..a7514aa114 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompSimpleTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompSimpleTemplate.h @@ -1,11 +1,3 @@ -/* - ============================================================================== - - This file was auto-generated! - - ============================================================================== -*/ - #pragma once %%include_juce%% @@ -15,7 +7,7 @@ This component lives inside our window, and this is where you should put all your controls and content. */ -class %%content_component_class%% : public Component +class %%content_component_class%% : public juce::Component { public: //============================================================================== @@ -29,14 +21,14 @@ public: } //============================================================================== - void paint (Graphics& g) override + void paint (juce::Graphics& g) override { // (Our component is opaque, so we must completely fill the background with a solid colour) - g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); + g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId)); - g.setFont (Font (16.0f)); - g.setColour (Colours::white); - g.drawText ("Hello World!", getLocalBounds(), Justification::centred, true); + g.setFont (juce::Font (16.0f)); + g.setColour (juce::Colours::white); + g.drawText ("Hello World!", getLocalBounds(), juce::Justification::centred, true); } void resized() override diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.cpp index a55ad08889..59e3da349b 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.cpp @@ -1,11 +1,3 @@ -/* - ============================================================================== - - This file was auto-generated! - - ============================================================================== -*/ - %%include_corresponding_header%% //============================================================================== @@ -19,14 +11,14 @@ } //============================================================================== -void %%content_component_class%%::paint (Graphics& g) +void %%content_component_class%%::paint (juce::Graphics& g) { // (Our component is opaque, so we must completely fill the background with a solid colour) - g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); + g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId)); - g.setFont (Font (16.0f)); - g.setColour (Colours::white); - g.drawText ("Hello World!", getLocalBounds(), Justification::centred, true); + g.setFont (juce::Font (16.0f)); + g.setColour (juce::Colours::white); + g.drawText ("Hello World!", getLocalBounds(), juce::Justification::centred, true); } void %%content_component_class%%::resized() diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.h index 2a87c80ef6..732ca2333c 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_ContentCompTemplate.h @@ -1,11 +1,3 @@ -/* - ============================================================================== - - This file was auto-generated! - - ============================================================================== -*/ - #pragma once %%include_juce%% @@ -15,7 +7,7 @@ This component lives inside our window, and this is where you should put all your controls and content. */ -class %%content_component_class%% : public Component +class %%content_component_class%% : public juce::Component { public: //============================================================================== @@ -23,7 +15,7 @@ public: ~%%content_component_class%%(); //============================================================================== - void paint (Graphics&) override; + void paint (juce::Graphics&) override; void resized() override; private: diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_InlineComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_InlineComponentTemplate.h index cd73fcf50c..9844a3b6bb 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_InlineComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_InlineComponentTemplate.h @@ -1,5 +1,5 @@ //============================================================================== -class %%component_class%% : public Component +class %%component_class%% : public juce::Component { public: %%component_class%%() @@ -13,19 +13,19 @@ public: { } - void paint (Graphics& g) override + void paint (juce::Graphics& g) override { // You should replace everything in this method with your own drawing code.. - g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); // clear the background + g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId)); // clear the background - g.setColour (Colours::grey); + g.setColour (juce::Colours::grey); g.drawRect (getLocalBounds(), 1); // draw an outline around the component - g.setColour (Colours::white); + g.setColour (juce::Colours::white); g.setFont (14.0f); g.drawText ("%%component_class%%", getLocalBounds(), - Justification::centred, true); // draw some placeholder text + juce::Justification::centred, true); // draw some placeholder text } void resized() override diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_MainConsoleAppTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_MainConsoleAppTemplate.cpp index 27987d4aa1..17a84b906e 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_MainConsoleAppTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_MainConsoleAppTemplate.cpp @@ -1,9 +1,7 @@ /* ============================================================================== - This file was auto-generated! - - It contains the basic startup code for a JUCE application. + This file contains the basic startup code for a JUCE application. ============================================================================== */ diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_NoWindow.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_NoWindow.cpp index 2409003539..bc8b804101 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_NoWindow.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_NoWindow.cpp @@ -1,9 +1,7 @@ /* ============================================================================== - This file was auto-generated! - - It contains the basic startup code for a JUCE application. + This file contains the basic startup code for a JUCE application. ============================================================================== */ @@ -11,18 +9,18 @@ %%app_headers%% //============================================================================== -class %%app_class_name%% : public JUCEApplication +class %%app_class_name%% : public juce::JUCEApplication { public: //============================================================================== %%app_class_name%%() {} - const String getApplicationName() override { return ProjectInfo::projectName; } - const String getApplicationVersion() override { return ProjectInfo::versionString; } - bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; } + const juce::String getApplicationName() override { return ProjectInfo::projectName; } + const juce::String getApplicationVersion() override { return ProjectInfo::versionString; } + bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; } //============================================================================== - void initialise (const String& commandLine) override + void initialise (const juce::String& commandLine) override { // Add your application's initialisation code here.. } @@ -40,7 +38,7 @@ public: quit(); } - void anotherInstanceStarted (const String& commandLine) override + void anotherInstanceStarted (const juce::String& commandLine) override { // When another instance of the app is launched while this one is running, // this method is invoked, and the commandLine parameter tells you what diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_SimpleWindow.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_SimpleWindow.cpp index 926eb48a29..8e199ab876 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_SimpleWindow.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_SimpleWindow.cpp @@ -1,9 +1,7 @@ /* ============================================================================== - This file was auto-generated! - - It contains the basic startup code for a JUCE application. + This file contains the basic startup code for a JUCE application. ============================================================================== */ @@ -11,18 +9,18 @@ %%app_headers%% //============================================================================== -class %%app_class_name%% : public JUCEApplication +class %%app_class_name%% : public juce::JUCEApplication { public: //============================================================================== %%app_class_name%%() {} - const String getApplicationName() override { return ProjectInfo::projectName; } - const String getApplicationVersion() override { return ProjectInfo::versionString; } - bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; } + const juce::String getApplicationName() override { return ProjectInfo::projectName; } + const juce::String getApplicationVersion() override { return ProjectInfo::versionString; } + bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; } //============================================================================== - void initialise (const String& commandLine) override + void initialise (const juce::String& commandLine) override { // This method is where you should put your application's initialisation code.. @@ -44,7 +42,7 @@ public: quit(); } - void anotherInstanceStarted (const String& commandLine) override + void anotherInstanceStarted (const juce::String& commandLine) override { // When another instance of the app is launched while this one is running, // this method is invoked, and the commandLine parameter tells you what @@ -56,13 +54,14 @@ public: This class implements the desktop window that contains an instance of our %%content_component_class%% class. */ - class MainWindow : public DocumentWindow + class MainWindow : public juce::DocumentWindow { public: - MainWindow (String name) : DocumentWindow (name, - Desktop::getInstance().getDefaultLookAndFeel() - .findColour (ResizableWindow::backgroundColourId), - DocumentWindow::allButtons) + MainWindow (juce::String name) + : DocumentWindow (name, + juce::Desktop::getInstance().getDefaultLookAndFeel() + .findColour (juce::ResizableWindow::backgroundColourId), + DocumentWindow::allButtons) { setUsingNativeTitleBar (true); setContentOwned (new %%content_component_class%%(), true); @@ -82,7 +81,7 @@ public: // This is called when the user tries to close this window. Here, we'll just // ask the app to quit when this happens, but you can change this to do // whatever you need. - JUCEApplication::getInstance()->systemRequestedQuit(); + juce::JUCEApplication::getInstance()->systemRequestedQuit(); } /* Note: Be careful if you override any DocumentWindow methods - the base diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_Window.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_Window.cpp index 926eb48a29..a1d2913f73 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_Window.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_MainTemplate_Window.cpp @@ -1,9 +1,7 @@ /* ============================================================================== - This file was auto-generated! - - It contains the basic startup code for a JUCE application. + This file contains the basic startup code for a JUCE application. ============================================================================== */ @@ -11,18 +9,18 @@ %%app_headers%% //============================================================================== -class %%app_class_name%% : public JUCEApplication +class %%app_class_name%% : public juce::JUCEApplication { public: //============================================================================== %%app_class_name%%() {} - const String getApplicationName() override { return ProjectInfo::projectName; } - const String getApplicationVersion() override { return ProjectInfo::versionString; } - bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; } + const juce::String getApplicationName() override { return ProjectInfo::projectName; } + const juce::String getApplicationVersion() override { return ProjectInfo::versionString; } + bool moreThanOneInstanceAllowed() override { return %%allow_more_than_one_instance%%; } //============================================================================== - void initialise (const String& commandLine) override + void initialise (const juce::String& commandLine) override { // This method is where you should put your application's initialisation code.. @@ -44,7 +42,7 @@ public: quit(); } - void anotherInstanceStarted (const String& commandLine) override + void anotherInstanceStarted (const juce::String& commandLine) override { // When another instance of the app is launched while this one is running, // this method is invoked, and the commandLine parameter tells you what @@ -56,13 +54,14 @@ public: This class implements the desktop window that contains an instance of our %%content_component_class%% class. */ - class MainWindow : public DocumentWindow + class MainWindow : public juce::DocumentWindow { public: - MainWindow (String name) : DocumentWindow (name, - Desktop::getInstance().getDefaultLookAndFeel() - .findColour (ResizableWindow::backgroundColourId), - DocumentWindow::allButtons) + MainWindow (juce::String name) + : DocumentWindow (name, + juce::Desktop::getInstance().getDefaultLookAndFeel() + .findColour (juce::ResizableWindow::backgroundColourId), + DocumentWindow::allButtons) { setUsingNativeTitleBar (true); setContentOwned (new %%content_component_class%%(), true); diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.cpp index 6b39426076..5d6fb68f2b 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.cpp @@ -23,7 +23,7 @@ { } -void %%component_class%%::paint (Graphics& g) +void %%component_class%%::paint (juce::Graphics& g) { /* This demo code just fills the component's background and draws some placeholder text to get you started. @@ -32,15 +32,15 @@ void %%component_class%%::paint (Graphics& g) drawing code.. */ - g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); // clear the background + g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId)); // clear the background - g.setColour (Colours::grey); + g.setColour (juce::Colours::grey); g.drawRect (getLocalBounds(), 1); // draw an outline around the component - g.setColour (Colours::white); + g.setColour (juce::Colours::white); g.setFont (14.0f); g.drawText ("%%component_class%%", getLocalBounds(), - Justification::centred, true); // draw some placeholder text + juce::Justification::centred, true); // draw some placeholder text } void %%component_class%%::resized() diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.h index 2cb07326cd..a858488f42 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_NewComponentTemplate.h @@ -15,13 +15,13 @@ //============================================================================== /* */ -class %%component_class%% : public Component +class %%component_class%% : public juce::Component { public: %%component_class%%(); ~%%component_class%%(); - void paint (Graphics&) override; + void paint (juce::Graphics&) override; void resized() override; private: diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_NewInlineComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_NewInlineComponentTemplate.h index 2a37648661..b00ad5adb7 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_NewInlineComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_NewInlineComponentTemplate.h @@ -15,7 +15,7 @@ //============================================================================== /* */ -class %%component_class%% : public Component +class %%component_class%% : public juce::Component { public: %%component_class%%() @@ -29,7 +29,7 @@ public: { } - void paint (Graphics& g) override + void paint (juce::Graphics& g) override { /* This demo code just fills the component's background and draws some placeholder text to get you started. @@ -38,15 +38,15 @@ public: drawing code.. */ - g.fillAll (getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); // clear the background + g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId)); // clear the background - g.setColour (Colours::grey); + g.setColour (juce::Colours::grey); g.drawRect (getLocalBounds(), 1); // draw an outline around the component - g.setColour (Colours::white); + g.setColour (juce::Colours::white); g.setFont (14.0f); g.drawText ("%%component_class%%", getLocalBounds(), - Justification::centred, true); // draw some placeholder text + juce::Justification::centred, true); // draw some placeholder text } void resized() override diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentSimpleTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentSimpleTemplate.h index e2f463f60e..03b37b966d 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentSimpleTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentSimpleTemplate.h @@ -1,11 +1,3 @@ -/* - ============================================================================== - - This file was auto-generated! - - ============================================================================== -*/ - #pragma once %%include_juce%% @@ -15,7 +7,7 @@ This component lives inside our window, and this is where you should put all your controls and content. */ -class %%content_component_class%% : public OpenGLAppComponent +class %%content_component_class%% : public juce::OpenGLAppComponent { public: //============================================================================== @@ -46,13 +38,13 @@ public: void render() override { // This clears the context with a black background. - OpenGLHelpers::clear (Colours::black); + juce::OpenGLHelpers::clear (Colours::black); // Add your rendering code here... } //============================================================================== - void paint (Graphics& g) override + void paint (juce::Graphics& g) override { // You can add your component specific drawing code here! // This will draw over the top of the openGL background. diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.cpp b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.cpp index 1a53e14c9d..e21fa1d8e1 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.cpp +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.cpp @@ -1,11 +1,3 @@ -/* - ============================================================================== - - This file was auto-generated! - - ============================================================================== -*/ - %%include_corresponding_header%% //============================================================================== @@ -36,13 +28,13 @@ void %%content_component_class%%::shutdown() void %%content_component_class%%::render() { // This clears the context with a black background. - OpenGLHelpers::clear (Colours::black); + juce::OpenGLHelpers::clear (juce::Colours::black); // Add your rendering code here... } //============================================================================== -void %%content_component_class%%::paint (Graphics& g) +void %%content_component_class%%::paint (juce::Graphics& g) { // You can add your component specific drawing code here! // This will draw over the top of the openGL background. diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.h index c5ad25da1d..3ed743d915 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_OpenGLComponentTemplate.h @@ -1,11 +1,3 @@ -/* - ============================================================================== - - This file was auto-generated! - - ============================================================================== -*/ - #pragma once %%include_juce%% @@ -15,7 +7,7 @@ This component lives inside our window, and this is where you should put all your controls and content. */ -class %%content_component_class%% : public OpenGLAppComponent +class %%content_component_class%% : public juce::OpenGLAppComponent { public: //============================================================================== @@ -28,7 +20,7 @@ public: void render() override; //============================================================================== - void paint (Graphics& g) override; + void paint (juce::Graphics& g) override; void resized() override; private: diff --git a/extras/Projucer/Source/BinaryData/Templates/jucer_PIPAudioProcessorTemplate.h b/extras/Projucer/Source/BinaryData/Templates/jucer_PIPAudioProcessorTemplate.h index 32f6b8a8e8..4674214d97 100644 --- a/extras/Projucer/Source/BinaryData/Templates/jucer_PIPAudioProcessorTemplate.h +++ b/extras/Projucer/Source/BinaryData/Templates/jucer_PIPAudioProcessorTemplate.h @@ -1,10 +1,10 @@ -class %%class_name%% : public AudioProcessor +class %%class_name%% : public juce::AudioProcessor { public: //============================================================================== %%class_name%%() - : AudioProcessor (BusesProperties().withInput ("Input", AudioChannelSet::stereo()) - .withOutput ("Output", AudioChannelSet::stereo())) + : AudioProcessor (BusesProperties().withInput ("Input", juce::AudioChannelSet::stereo()) + .withOutput ("Output", juce::AudioChannelSet::stereo())) { } @@ -25,9 +25,9 @@ public: // spare memory, etc. } - void processBlock (AudioBuffer& buffer, MidiBuffer&) override + void processBlock (juce::AudioBuffer& buffer, juce::MidiBuffer&) override { - ScopedNoDenormals noDenormals; + juce::ScopedNoDenormals noDenormals; auto totalNumInputChannels = getTotalNumInputChannels(); auto totalNumOutputChannels = getTotalNumOutputChannels(); @@ -55,24 +55,24 @@ public: } //============================================================================== - AudioProcessorEditor* createEditor() override { return nullptr; } - bool hasEditor() const override { return false; } + juce::AudioProcessorEditor* createEditor() override { return nullptr; } + bool hasEditor() const override { return false; } //============================================================================== - const String getName() const override { return "%%name%%"; } - bool acceptsMidi() const override { return false; } - bool producesMidi() const override { return false; } - double getTailLengthSeconds() const override { return 0; } + const juce::String getName() const override { return "%%name%%"; } + bool acceptsMidi() const override { return false; } + bool producesMidi() const override { return false; } + double getTailLengthSeconds() const override { return 0; } //============================================================================== - int getNumPrograms() override { return 1; } - int getCurrentProgram() override { return 0; } - void setCurrentProgram (int) override {} - const String getProgramName (int) override { return {}; } - void changeProgramName (int, const String&) override {} + int getNumPrograms() override { return 1; } + int getCurrentProgram() override { return 0; } + void setCurrentProgram (int) override {} + const juce::String getProgramName (int) override { return {}; } + void changeProgramName (int, const juce::String&) override {} //============================================================================== - void getStateInformation (MemoryBlock& destData) override + void getStateInformation (juce::MemoryBlock& destData) override { // You should use this method to store your parameters in the memory block. // You could do that either as raw data, or use the XML or ValueTree classes @@ -90,8 +90,8 @@ public: { // This is the place where you check if the layout is supported. // In this template code we only support mono or stereo. - if (layouts.getMainOutputChannelSet() != AudioChannelSet::mono() - && layouts.getMainOutputChannelSet() != AudioChannelSet::stereo()) + if (layouts.getMainOutputChannelSet() != juce::AudioChannelSet::mono() + && layouts.getMainOutputChannelSet() != juce::AudioChannelSet::stereo()) return false; // This checks if the input layout matches the output layout diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index f005462e7e..337c72bb12 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -186,27 +186,30 @@ void Project::initialiseMainGroup() void Project::initialiseProjectValues() { - projectNameValue.referTo (projectRoot, Ids::name, getUndoManager(), "JUCE Project"); - projectUIDValue.referTo (projectRoot, Ids::ID, getUndoManager(), createAlphaNumericUID()); + projectNameValue.referTo (projectRoot, Ids::name, getUndoManager(), "JUCE Project"); + projectUIDValue.referTo (projectRoot, Ids::ID, getUndoManager(), createAlphaNumericUID()); if (projectUIDValue.isUsingDefault()) projectUIDValue = projectUIDValue.getDefault(); - projectLineFeedValue.referTo (projectRoot, Ids::projectLineFeed, getUndoManager(), "\r\n"); + projectLineFeedValue.referTo (projectRoot, Ids::projectLineFeed, getUndoManager(), "\r\n"); - companyNameValue.referTo (projectRoot, Ids::companyName, getUndoManager()); - companyCopyrightValue.referTo (projectRoot, Ids::companyCopyright, getUndoManager()); - companyWebsiteValue.referTo (projectRoot, Ids::companyWebsite, getUndoManager()); - companyEmailValue.referTo (projectRoot, Ids::companyEmail, getUndoManager()); + companyNameValue.referTo (projectRoot, Ids::companyName, getUndoManager()); + companyCopyrightValue.referTo (projectRoot, Ids::companyCopyright, getUndoManager()); + companyWebsiteValue.referTo (projectRoot, Ids::companyWebsite, getUndoManager()); + companyEmailValue.referTo (projectRoot, Ids::companyEmail, getUndoManager()); - projectTypeValue.referTo (projectRoot, Ids::projectType, getUndoManager(), build_tools::ProjectType_GUIApp::getTypeName()); - versionValue.referTo (projectRoot, Ids::version, getUndoManager(), "1.0.0"); - bundleIdentifierValue.referTo (projectRoot, Ids::bundleIdentifier, getUndoManager(), getDefaultBundleIdentifierString()); + projectTypeValue.referTo (projectRoot, Ids::projectType, getUndoManager(), build_tools::ProjectType_GUIApp::getTypeName()); + versionValue.referTo (projectRoot, Ids::version, getUndoManager(), "1.0.0"); + bundleIdentifierValue.referTo (projectRoot, Ids::bundleIdentifier, getUndoManager(), getDefaultBundleIdentifierString()); displaySplashScreenValue.referTo (projectRoot, Ids::displaySplashScreen, getUndoManager(), ! ProjucerApplication::getApp().isPaidOrGPL()); splashScreenColourValue.referTo (projectRoot, Ids::splashScreenColour, getUndoManager(), "Dark"); reportAppUsageValue.referTo (projectRoot, Ids::reportAppUsage, getUndoManager()); + useAppConfigValue.referTo (projectRoot, Ids::useAppConfig, getUndoManager(), true); + addUsingNamespaceToJuceHeader.referTo (projectRoot, Ids::addUsingNamespaceToJuceHeader, getUndoManager(), true); + if (ProjucerApplication::getApp().isPaidOrGPL()) { reportAppUsageValue.setDefault (ProjucerApplication::getApp().licenseController->getState().applicationUsageDataState @@ -898,6 +901,17 @@ void Project::createPropertyEditors (PropertyListBuilder& props) props.add (new TextPropertyComponent (companyEmailValue, "Company E-mail", 256, false), "Your company e-mail, which will be added to the properties of the binary where possible"); + props.add (new ChoicePropertyComponent (useAppConfigValue, "Use Global AppConfig Header"), + "If enabled, the Projucer will generate module wrapper stubs which include AppConfig.h " + "and will include AppConfig.h in the JuceHeader.h. If disabled, all the settings that would " + "previously have been specified in the AppConfig.h will be injected via the build system instead, " + "which may simplify the includes in the project."); + + props.add (new ChoicePropertyComponent (addUsingNamespaceToJuceHeader, "Add \"using namespace juce\" to JuceHeader.h"), + "If enabled, the JuceHeader.h will include a \"using namepace juce\" statement. If disabled, " + "no such statement will be included. This setting used to be enabled by default, but it " + "is recommended to leave it disabled for new projects."); + { String licenseRequiredTagline ("Required for closed source applications without an Indie or Pro JUCE license"); String licenseRequiredInfo ("In accordance with the terms of the JUCE 5 End-Use License Agreement (www.juce.com/juce-5-licence), " @@ -1781,7 +1795,7 @@ int Project::getRTASCategory() const noexcept return res; } -String Project::getIAATypeCode() +String Project::getIAATypeCode() const { String s; if (pluginWantsMidiInput()) @@ -1801,7 +1815,7 @@ String Project::getIAATypeCode() return s; } -String Project::getIAAPluginName() +String Project::getIAAPluginName() const { auto s = getPluginManufacturerString(); s << ": "; @@ -2133,6 +2147,110 @@ String Project::getFileTemplate (const String& templateName) } +StringPairArray Project::getAudioPluginFlags() const +{ + if (! isAudioPluginProject()) + return {}; + + const auto boolToString = [] (bool b) { return b ? "1" : "0"; }; + + const auto toStringLiteral = [] (const String& v) + { + return CppTokeniserFunctions::addEscapeChars (v).quoted(); + }; + + const auto countMaxPluginChannels = [] (const String& configString, bool isInput) + { + auto configs = StringArray::fromTokens (configString, ", {}", {}); + configs.trim(); + configs.removeEmptyStrings(); + jassert ((configs.size() & 1) == 0); // looks like a syntax error in the configs? + + int maxVal = 0; + + for (int i = (isInput ? 0 : 1); i < configs.size(); i += 2) + maxVal = jmax (maxVal, configs[i].getIntValue()); + + return maxVal; + }; + + const auto toCharLiteral = [] (const String& v) + { + auto fourCharCode = v.substring (0, 4); + uint32 hexRepresentation = 0; + + for (int i = 0; i < 4; ++i) + hexRepresentation = (hexRepresentation << 8u) + | (static_cast (fourCharCode[i]) & 0xffu); + + return "0x" + String::toHexString (static_cast (hexRepresentation)); + }; + + StringPairArray flags; + flags.set ("JucePlugin_Build_VST", boolToString (shouldBuildVST())); + flags.set ("JucePlugin_Build_VST3", boolToString (shouldBuildVST3())); + flags.set ("JucePlugin_Build_AU", boolToString (shouldBuildAU())); + flags.set ("JucePlugin_Build_AUv3", boolToString (shouldBuildAUv3())); + flags.set ("JucePlugin_Build_RTAS", boolToString (shouldBuildRTAS())); + flags.set ("JucePlugin_Build_AAX", boolToString (shouldBuildAAX())); + flags.set ("JucePlugin_Build_Standalone", boolToString (shouldBuildStandalonePlugin())); + flags.set ("JucePlugin_Build_Unity", boolToString (shouldBuildUnityPlugin())); + flags.set ("JucePlugin_Enable_IAA", boolToString (shouldEnableIAA())); + flags.set ("JucePlugin_Name", toStringLiteral (getPluginNameString())); + flags.set ("JucePlugin_Desc", toStringLiteral (getPluginDescriptionString())); + flags.set ("JucePlugin_Manufacturer", toStringLiteral (getPluginManufacturerString())); + flags.set ("JucePlugin_ManufacturerWebsite", toStringLiteral (getCompanyWebsiteString())); + flags.set ("JucePlugin_ManufacturerEmail", toStringLiteral (getCompanyEmailString())); + flags.set ("JucePlugin_ManufacturerCode", toCharLiteral (getPluginManufacturerCodeString())); + flags.set ("JucePlugin_PluginCode", toCharLiteral (getPluginCodeString())); + flags.set ("JucePlugin_IsSynth", boolToString (isPluginSynth())); + flags.set ("JucePlugin_WantsMidiInput", boolToString (pluginWantsMidiInput())); + flags.set ("JucePlugin_ProducesMidiOutput", boolToString (pluginProducesMidiOutput())); + flags.set ("JucePlugin_IsMidiEffect", boolToString (isPluginMidiEffect())); + flags.set ("JucePlugin_EditorRequiresKeyboardFocus", boolToString (pluginEditorNeedsKeyFocus())); + flags.set ("JucePlugin_Version", getVersionString()); + flags.set ("JucePlugin_VersionCode", getVersionAsHex()); + flags.set ("JucePlugin_VersionString", toStringLiteral (getVersionString())); + flags.set ("JucePlugin_VSTUniqueID", "JucePlugin_PluginCode"); + flags.set ("JucePlugin_VSTCategory", getVSTCategoryString()); + flags.set ("JucePlugin_Vst3Category", toStringLiteral (getVST3CategoryString())); + flags.set ("JucePlugin_AUMainType", getAUMainTypeString()); + flags.set ("JucePlugin_AUSubType", "JucePlugin_PluginCode"); + flags.set ("JucePlugin_AUExportPrefix", getPluginAUExportPrefixString()); + flags.set ("JucePlugin_AUExportPrefixQuoted", toStringLiteral (getPluginAUExportPrefixString())); + flags.set ("JucePlugin_AUManufacturerCode", "JucePlugin_ManufacturerCode"); + flags.set ("JucePlugin_CFBundleIdentifier", getBundleIdentifierString()); + flags.set ("JucePlugin_RTASCategory", String (getRTASCategory())); + flags.set ("JucePlugin_RTASManufacturerCode", "JucePlugin_ManufacturerCode"); + flags.set ("JucePlugin_RTASProductId", "JucePlugin_PluginCode"); + flags.set ("JucePlugin_RTASDisableBypass", boolToString (isPluginRTASBypassDisabled())); + flags.set ("JucePlugin_RTASDisableMultiMono", boolToString (isPluginRTASMultiMonoDisabled())); + flags.set ("JucePlugin_AAXIdentifier", getAAXIdentifierString()); + flags.set ("JucePlugin_AAXManufacturerCode", "JucePlugin_ManufacturerCode"); + flags.set ("JucePlugin_AAXProductId", "JucePlugin_PluginCode"); + flags.set ("JucePlugin_AAXCategory", String (getAAXCategory())); + flags.set ("JucePlugin_AAXDisableBypass", boolToString (isPluginAAXBypassDisabled())); + flags.set ("JucePlugin_AAXDisableMultiMono", boolToString (isPluginAAXMultiMonoDisabled())); + flags.set ("JucePlugin_IAAType", toCharLiteral (getIAATypeCode())); + flags.set ("JucePlugin_IAASubType", "JucePlugin_PluginCode"); + flags.set ("JucePlugin_IAAName", getIAAPluginName().quoted()); + flags.set ("JucePlugin_VSTNumMidiInputs", getVSTNumMIDIInputsString()); + flags.set ("JucePlugin_VSTNumMidiOutputs", getVSTNumMIDIOutputsString()); + + { + String plugInChannelConfig = getPluginChannelConfigsString(); + + if (plugInChannelConfig.isNotEmpty()) + { + flags.set ("JucePlugin_MaxNumInputChannels", String (countMaxPluginChannels (plugInChannelConfig, true))); + flags.set ("JucePlugin_MaxNumOutputChannels", String (countMaxPluginChannels (plugInChannelConfig, false))); + flags.set ("JucePlugin_PreferredChannelConfigurations", plugInChannelConfig); + } + } + + return flags; +} + //============================================================================== Project::ExporterIterator::ExporterIterator (Project& p) : index (-1), project (p) {} Project::ExporterIterator::~ExporterIterator() {} diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h index a7d34ea0c5..4bb0e1a661 100644 --- a/extras/Projucer/Source/Project/jucer_Project.h +++ b/extras/Projucer/Source/Project/jucer_Project.h @@ -58,6 +58,7 @@ public: File getBinaryDataHeaderFile() const { return getBinaryDataCppFile (0).withFileExtension (".h"); } static String getAppConfigFilename() { return "AppConfig.h"; } + static String getPluginDefinesFilename() { return "JucePluginDefines.h"; } static String getJuceSourceHFilename() { return "JuceHeader.h"; } //============================================================================== @@ -125,6 +126,9 @@ public: String getPostExportShellCommandPosixString() const { return postExportShellCommandPosixValue.get(); } String getPostExportShellCommandWinString() const { return postExportShellCommandWinValue.get(); } + bool shouldUseAppConfig() const { return useAppConfigValue.get(); } + bool shouldAddUsingNamespaceToJuceHeader() const { return addUsingNamespaceToJuceHeader.get(); } + //============================================================================== String getPluginNameString() const { return pluginNameValue.get(); } String getPluginDescriptionString() const { return pluginDescriptionValue.get();} @@ -197,8 +201,8 @@ public: int getAAXCategory() const noexcept; int getRTASCategory() const noexcept; - String getIAATypeCode(); - String getIAAPluginName(); + String getIAATypeCode() const; + String getIAAPluginName() const; String getUnityScriptName() const { return addUnityPluginPrefixIfNecessary (getProjectNameString()) + "_UnityScript.cs"; } static String addUnityPluginPrefixIfNecessary (const String& name) @@ -222,6 +226,8 @@ public: //============================================================================== void updateDeprecatedProjectSettingsInteractively(); + StringPairArray getAudioPluginFlags() const; + //============================================================================== class Item { @@ -416,7 +422,7 @@ private: ValueWithDefault projectNameValue, projectUIDValue, projectLineFeedValue, projectTypeValue, versionValue, bundleIdentifierValue, companyNameValue, companyCopyrightValue, companyWebsiteValue, companyEmailValue, displaySplashScreenValue, reportAppUsageValue, splashScreenColourValue, cppStandardValue, headerSearchPathsValue, preprocessorDefsValue, userNotesValue, maxBinaryFileSizeValue, includeBinaryDataInJuceHeaderValue, binaryDataNamespaceValue, - compilerFlagSchemesValue, postExportShellCommandPosixValue, postExportShellCommandWinValue; + compilerFlagSchemesValue, postExportShellCommandPosixValue, postExportShellCommandWinValue, useAppConfigValue, addUsingNamespaceToJuceHeader; ValueWithDefault pluginFormatsValue, pluginNameValue, pluginDescriptionValue, pluginManufacturerValue, pluginManufacturerCodeValue, pluginCodeValue, pluginChannelConfigsValue, pluginCharacteristicsValue, pluginAUExportPrefixValue, pluginAAXIdentifierValue, diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h index f5c1dd0ac5..796c55b350 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h @@ -1457,7 +1457,7 @@ private: StringPairArray getConfigPreprocessorDefs (const BuildConfiguration& config) const { - auto cfgDefines = config.getUniquePreprocessorDefs(); + auto cfgDefines = getAllPreprocessorDefs (config, build_tools::ProjectType::Target::unspecified); if (config.isDebug()) { @@ -1530,7 +1530,8 @@ private: if (value.isNotEmpty()) { value = value.replace ("\"", "\\\""); - if (value.containsChar (L' ')) + + if (value.containsChar (L' ') && ! value.startsWith ("\\\"") && ! value.endsWith ("\\\"")) value = "\\\"" + value + "\\\""; escaped += ("=" + value); diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h index ad1d1084af..bb8c73f9a4 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h @@ -129,17 +129,11 @@ public: if (type == AggregateTarget) // the aggregate target should not specify any settings at all! return {}; // it just defines dependencies on the other targets. - StringArray defines; - auto defs = getDefines (config); - - for (auto& key : defs.getAllKeys()) - defines.add ("-D" + key + "=" + defs[key]); - StringArray s; auto cppflagsVarName = "JUCE_CPPFLAGS_" + getTargetVarName(); - s.add (cppflagsVarName + " := " + defines.joinIntoString (" ")); + s.add (cppflagsVarName + " := " + createGCCPreprocessorFlags (getDefines (config))); auto cflags = getCompilerFlags(); diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h index a87b1522ad..ad4a95eb81 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h @@ -1212,6 +1212,33 @@ public: return bundleIdentifier; } + StringPairArray getConfigPreprocessorDefs (const XcodeBuildConfiguration& config) const + { + StringPairArray defines; + + if (config.isDebug()) + { + defines.set ("_DEBUG", "1"); + defines.set ("DEBUG", "1"); + } + else + { + defines.set ("_NDEBUG", "1"); + defines.set ("NDEBUG", "1"); + } + + if (owner.isInAppPurchasesEnabled()) + defines.set ("JUCE_IN_APP_PURCHASES", "1"); + + if (owner.iOS && owner.isContentSharingEnabled()) + defines.set ("JUCE_CONTENT_SHARING", "1"); + + if (owner.isPushNotificationsEnabled()) + defines.set ("JUCE_PUSH_NOTIFICATIONS", "1"); + + return mergePreprocessorDefs (defines, owner.getAllPreprocessorDefs (config, type)); + } + //============================================================================== StringPairArray getTargetSettings (const XcodeBuildConfiguration& config) const { @@ -1407,54 +1434,38 @@ public: libPaths.add ("\"\\\"" + p + "\\\"\""); s.set ("LIBRARY_SEARCH_PATHS", indentParenthesisedList (libPaths, 1)); - } } - StringPairArray defines; - if (config.isDebug()) { - defines.set ("_DEBUG", "1"); - defines.set ("DEBUG", "1"); s.set ("COPY_PHASE_STRIP", "NO"); s.set ("GCC_DYNAMIC_NO_PIC", "NO"); } else { - defines.set ("_NDEBUG", "1"); - defines.set ("NDEBUG", "1"); s.set ("GCC_GENERATE_DEBUGGING_SYMBOLS", "NO"); s.set ("DEAD_CODE_STRIPPING", "YES"); } if (type != Target::SharedCodeTarget && type != Target::StaticLibrary && type != Target::DynamicLibrary - && config.isStripLocalSymbolsEnabled()) + && config.isStripLocalSymbolsEnabled()) { s.set ("STRIPFLAGS", "\"-x\""); s.set ("DEPLOYMENT_POSTPROCESSING", "YES"); s.set ("SEPARATE_STRIP", "YES"); } - if (owner.isInAppPurchasesEnabled()) - defines.set ("JUCE_IN_APP_PURCHASES", "1"); - - if (owner.iOS && owner.isContentSharingEnabled()) - defines.set ("JUCE_CONTENT_SHARING", "1"); - - if (owner.isPushNotificationsEnabled()) - defines.set ("JUCE_PUSH_NOTIFICATIONS", "1"); - - defines = mergePreprocessorDefs (defines, owner.getAllPreprocessorDefs (config, type)); - StringArray defsList; + const auto defines = getConfigPreprocessorDefs (config); + for (int i = 0; i < defines.size(); ++i) { auto def = defines.getAllKeys()[i]; auto value = defines.getAllValues()[i]; if (value.isNotEmpty()) - def << "=" << value.replace ("\"", "\\\\\\\""); + def << "=" << value.replace ("\"", "\\\\\\\"").replace (" ", "\\\\ "); defsList.add ("\"" + def + "\""); } diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp index b1abe885f0..710a96ccb9 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp @@ -465,14 +465,62 @@ StringPairArray ProjectExporter::getAllPreprocessorDefs (const BuildConfiguratio addDefaultPreprocessorDefs (defs); addTargetSpecificPreprocessorDefs (defs, targetType); + if (! project.shouldUseAppConfig()) + defs = mergePreprocessorDefs (defs, getAppConfigDefs()); + return defs; } +StringPairArray ProjectExporter::getAppConfigDefs() const +{ + StringPairArray result; + result.set ("JUCE_DISPLAY_SPLASH_SCREEN", project.shouldDisplaySplashScreen() ? "1" : "0"); + result.set ("JUCE_REPORT_APP_USAGE", project.shouldReportAppUsage() ? "1" : "0"); + result.set ("JUCE_USE_DARK_SPLASH_SCREEN", project.getSplashScreenColourString() == "Dark" ? "1" : "0"); + result.set ("JUCE_PROJUCER_VERSION", "0x" + String::toHexString (ProjectInfo::versionNumber)); + + OwnedArray modules; + project.getEnabledModules().createRequiredModules (modules); + + for (auto& m : modules) + result.set ("JUCE_MODULE_AVAILABLE_" + m->getID(), "1"); + + result.set ("JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED", "1"); + + for (auto& m : modules) + { + OwnedArray flags; + m->getConfigFlags (project, flags); + + for (auto* flag : flags) + if (! flag->value.isUsingDefault()) + result.set (flag->symbol, flag->value.get() ? "1" : "0"); + } + + result.addArray (project.getAudioPluginFlags()); + + const auto& type = project.getProjectType(); + const auto isStandaloneApplication = (! type.isAudioPlugin() && ! type.isDynamicLibrary()); + + const auto standaloneValue = [&] + { + if (result.containsKey ("JucePlugin_Name") && result.containsKey ("JucePlugin_Build_Standalone")) + return "JucePlugin_Build_Standalone"; + + return isStandaloneApplication ? "1" : "0"; + }(); + + result.set ("JUCE_STANDALONE_APPLICATION", standaloneValue); + + return result; +} + StringPairArray ProjectExporter::getAllPreprocessorDefs() const { auto defs = mergePreprocessorDefs (project.getPreprocessorDefs(), parsePreprocessorDefs (getExporterPreprocessorDefsString())); addDefaultPreprocessorDefs (defs); + return defs; } diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h index 84d4243603..d5348b6061 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.h @@ -327,8 +327,10 @@ public: // includes exporter, project + config defs StringPairArray getAllPreprocessorDefs (const BuildConfiguration& config, const build_tools::ProjectType::Target::Type targetType) const; - // includes exporter + project defs.. + // includes exporter + project defs StringPairArray getAllPreprocessorDefs() const; + // just appconfig defs + StringPairArray getAppConfigDefs() const; void addTargetSpecificPreprocessorDefs (StringPairArray& defs, const build_tools::ProjectType::Target::Type targetType) const; diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.cpp index 84230b30cc..3513601a63 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.cpp +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.cpp @@ -22,112 +22,12 @@ #include "jucer_ProjectExport_CLion.h" //============================================================================== -namespace +String ProjectSaver::getAudioPluginDefines() const { - inline int countMaxPluginChannels (const String& configString, bool isInput) - { - auto configs = StringArray::fromTokens (configString, ", {}", {}); - configs.trim(); - configs.removeEmptyStrings(); - jassert ((configs.size() & 1) == 0); // looks like a syntax error in the configs? - - int maxVal = 0; - - for (int i = (isInput ? 0 : 1); i < configs.size(); i += 2) - maxVal = jmax (maxVal, configs[i].getIntValue()); - - return maxVal; - } - - inline String boolToString (bool b) - { - return b ? "1" : "0"; - } - - inline String toStringLiteral (const String& v) - { - return CppTokeniserFunctions::addEscapeChars (v).quoted(); - } - - inline String toCharLiteral (const String& v) - { - auto fourCharCode = v.substring (0, 4); - uint32 hexRepresentation = 0; + const auto flags = project.getAudioPluginFlags(); - for (int i = 0; i < 4; ++i) - hexRepresentation = (hexRepresentation << 8u) - | (static_cast (fourCharCode[i]) & 0xffu); - - return "0x" + String::toHexString (static_cast (hexRepresentation)) - + " // " - + CppTokeniserFunctions::addEscapeChars (fourCharCode).quoted ('\''); - } -} - -//============================================================================== -void ProjectSaver::writePluginCharacteristicsFile() -{ - StringPairArray flags; - flags.set ("JucePlugin_Build_VST", boolToString (project.shouldBuildVST())); - flags.set ("JucePlugin_Build_VST3", boolToString (project.shouldBuildVST3())); - flags.set ("JucePlugin_Build_AU", boolToString (project.shouldBuildAU())); - flags.set ("JucePlugin_Build_AUv3", boolToString (project.shouldBuildAUv3())); - flags.set ("JucePlugin_Build_RTAS", boolToString (project.shouldBuildRTAS())); - flags.set ("JucePlugin_Build_AAX", boolToString (project.shouldBuildAAX())); - flags.set ("JucePlugin_Build_Standalone", boolToString (project.shouldBuildStandalonePlugin())); - flags.set ("JucePlugin_Build_Unity", boolToString (project.shouldBuildUnityPlugin())); - flags.set ("JucePlugin_Enable_IAA", boolToString (project.shouldEnableIAA())); - flags.set ("JucePlugin_Name", toStringLiteral (project.getPluginNameString())); - flags.set ("JucePlugin_Desc", toStringLiteral (project.getPluginDescriptionString())); - flags.set ("JucePlugin_Manufacturer", toStringLiteral (project.getPluginManufacturerString())); - flags.set ("JucePlugin_ManufacturerWebsite", toStringLiteral (project.getCompanyWebsiteString())); - flags.set ("JucePlugin_ManufacturerEmail", toStringLiteral (project.getCompanyEmailString())); - flags.set ("JucePlugin_ManufacturerCode", toCharLiteral (project.getPluginManufacturerCodeString())); - flags.set ("JucePlugin_PluginCode", toCharLiteral (project.getPluginCodeString())); - flags.set ("JucePlugin_IsSynth", boolToString (project.isPluginSynth())); - flags.set ("JucePlugin_WantsMidiInput", boolToString (project.pluginWantsMidiInput())); - flags.set ("JucePlugin_ProducesMidiOutput", boolToString (project.pluginProducesMidiOutput())); - flags.set ("JucePlugin_IsMidiEffect", boolToString (project.isPluginMidiEffect())); - flags.set ("JucePlugin_EditorRequiresKeyboardFocus", boolToString (project.pluginEditorNeedsKeyFocus())); - flags.set ("JucePlugin_Version", project.getVersionString()); - flags.set ("JucePlugin_VersionCode", project.getVersionAsHex()); - flags.set ("JucePlugin_VersionString", toStringLiteral (project.getVersionString())); - flags.set ("JucePlugin_VSTUniqueID", "JucePlugin_PluginCode"); - flags.set ("JucePlugin_VSTCategory", project.getVSTCategoryString()); - flags.set ("JucePlugin_Vst3Category", toStringLiteral (project.getVST3CategoryString())); - flags.set ("JucePlugin_AUMainType", project.getAUMainTypeString()); - flags.set ("JucePlugin_AUSubType", "JucePlugin_PluginCode"); - flags.set ("JucePlugin_AUExportPrefix", project.getPluginAUExportPrefixString()); - flags.set ("JucePlugin_AUExportPrefixQuoted", toStringLiteral (project.getPluginAUExportPrefixString())); - flags.set ("JucePlugin_AUManufacturerCode", "JucePlugin_ManufacturerCode"); - flags.set ("JucePlugin_CFBundleIdentifier", project.getBundleIdentifierString()); - flags.set ("JucePlugin_RTASCategory", String (project.getRTASCategory())); - flags.set ("JucePlugin_RTASManufacturerCode", "JucePlugin_ManufacturerCode"); - flags.set ("JucePlugin_RTASProductId", "JucePlugin_PluginCode"); - flags.set ("JucePlugin_RTASDisableBypass", boolToString (project.isPluginRTASBypassDisabled())); - flags.set ("JucePlugin_RTASDisableMultiMono", boolToString (project.isPluginRTASMultiMonoDisabled())); - flags.set ("JucePlugin_AAXIdentifier", project.getAAXIdentifierString()); - flags.set ("JucePlugin_AAXManufacturerCode", "JucePlugin_ManufacturerCode"); - flags.set ("JucePlugin_AAXProductId", "JucePlugin_PluginCode"); - flags.set ("JucePlugin_AAXCategory", String (project.getAAXCategory())); - flags.set ("JucePlugin_AAXDisableBypass", boolToString (project.isPluginAAXBypassDisabled())); - flags.set ("JucePlugin_AAXDisableMultiMono", boolToString (project.isPluginAAXMultiMonoDisabled())); - flags.set ("JucePlugin_IAAType", toCharLiteral (project.getIAATypeCode())); - flags.set ("JucePlugin_IAASubType", "JucePlugin_PluginCode"); - flags.set ("JucePlugin_IAAName", project.getIAAPluginName().quoted()); - flags.set ("JucePlugin_VSTNumMidiInputs", project.getVSTNumMIDIInputsString()); - flags.set ("JucePlugin_VSTNumMidiOutputs", project.getVSTNumMIDIOutputsString()); - - { - String plugInChannelConfig = project.getPluginChannelConfigsString(); - - if (plugInChannelConfig.isNotEmpty()) - { - flags.set ("JucePlugin_MaxNumInputChannels", String (countMaxPluginChannels (plugInChannelConfig, true))); - flags.set ("JucePlugin_MaxNumOutputChannels", String (countMaxPluginChannels (plugInChannelConfig, false))); - flags.set ("JucePlugin_PreferredChannelConfigurations", plugInChannelConfig); - } - } + if (flags.size() == 0) + return {}; MemoryOutputStream mem; mem.setNewLineString (projectLineFeed); @@ -144,7 +44,7 @@ void ProjectSaver::writePluginCharacteristicsFile() << "#endif" << newLine; } - setExtraAppConfigFileContent (mem.toString()); + return mem.toString().trim(); } void ProjectSaver::writeProjects (const OwnedArray& modules, const String& specifiedExporterToSave, bool isCommandLineApp) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h index de0b4161ae..a642445bd8 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h @@ -89,16 +89,11 @@ public: if (project.isAudioPluginProject()) { - writePluginCharacteristicsFile(); - if (project.shouldBuildUnityPlugin()) writeUnityScriptFile(); } - writeAppConfigFile (modules, appConfigUserContent); - writeBinaryDataFiles(); - writeAppHeader (modules); - writeModuleCppWrappers (modules); + saveBasicProjectItems (modules, appConfigUserContent); writeProjects (modules, specifiedExporterToSave, ! showProgressBox); runPostExportScript(); @@ -140,6 +135,15 @@ public: return Result::ok(); } + void saveBasicProjectItems (const OwnedArray& modules, const String& appConfigUserContent) + { + writePluginDefines(); + writeAppConfigFile (modules, appConfigUserContent); + writeBinaryDataFiles(); + writeAppHeader (modules); + writeModuleCppWrappers (modules); + } + Result saveContentNeededForLiveBuild() { OwnedArray modules; @@ -149,13 +153,7 @@ public: if (errors.size() == 0) { - if (project.isAudioPluginProject()) - writePluginCharacteristicsFile(); - - writeAppConfigFile (modules, loadUserContentFromAppConfig()); - writeBinaryDataFiles(); - writeAppHeader (modules); - writeModuleCppWrappers (modules); + saveBasicProjectItems (modules, loadUserContentFromAppConfig()); return Result::ok(); } @@ -190,11 +188,6 @@ public: return generatedFilesGroup.findItemForFile (file); } - void setExtraAppConfigFileContent (const String& content) - { - extraAppConfigContent = content; - } - static void writeAutoGenWarningComment (OutputStream& out) { out << "/*" << newLine << newLine @@ -258,11 +251,9 @@ public: private: const File projectFile, generatedCodeFolder; Project::Item generatedFilesGroup; - String extraAppConfigContent; StringArray errors; CriticalSection errorLock; - File appConfigFile; bool hasBinaryData = false; String projectLineFeed = "\r\n"; @@ -340,7 +331,8 @@ private: return longest; } - File getAppConfigFile() const { return generatedCodeFolder.getChildFile (Project::getAppConfigFilename()); } + File getAppConfigFile() const { return generatedCodeFolder.getChildFile (Project::getAppConfigFilename()); } + File getPluginDefinesFile() const { return generatedCodeFolder.getChildFile (Project::getPluginDefinesFilename()); } String loadUserContentFromAppConfig() const { @@ -405,8 +397,24 @@ private: } } + void writePluginDefines (MemoryOutputStream& out) const + { + const auto pluginDefines = getAudioPluginDefines(); + + if (pluginDefines.isEmpty()) + return; + + writeAutoGenWarningComment (out); + out << "*/" << newLine << newLine + << "#pragma once" << newLine << newLine + << pluginDefines << newLine; + } + void writeAppConfig (MemoryOutputStream& out, const OwnedArray& modules, const String& userContent) { + if (! project.shouldUseAppConfig()) + return; + writeAutoGenWarningComment (out); out << " There's a section below where you can add your own custom code safely, and the" << newLine << " Projucer will preserve the contents of that block, but the best way to change" << newLine @@ -424,6 +432,9 @@ private: << userContent << "// [END_USER_CODE_SECTION]" << newLine; + if (getPluginDefinesFile().existsAsFile() && getAudioPluginDefines().isNotEmpty()) + out << newLine << CodeHelpers::createIncludeStatement (Project::getPluginDefinesFilename()) << newLine; + out << newLine << "/*" << newLine << " ==============================================================================" << newLine @@ -489,9 +500,6 @@ private: } } - if (extraAppConfigContent.isNotEmpty()) - out << newLine << extraAppConfigContent.trimEnd() << newLine; - { auto& type = project.getProjectType(); @@ -509,15 +517,43 @@ private: } } - void writeAppConfigFile (const OwnedArray& modules, const String& userContent) + template + void writeOrRemoveGeneratedFile (const String& name, WriterCallback&& writerCallback) { - appConfigFile = getAppConfigFile(); - MemoryOutputStream mem; mem.setNewLineString (projectLineFeed); - writeAppConfig (mem, modules, userContent); - saveGeneratedFile (Project::getAppConfigFilename(), mem); + writerCallback (mem); + + if (mem.getDataSize() != 0) + { + saveGeneratedFile (name, mem); + return; + } + + const auto destFile = generatedCodeFolder.getChildFile (name); + + if (destFile.existsAsFile()) + { + if (! destFile.deleteFile()) + addError ("Couldn't remove unnecessary file: " + destFile.getFullPathName()); + } + } + + void writePluginDefines() + { + writeOrRemoveGeneratedFile (Project::getPluginDefinesFilename(), [&] (MemoryOutputStream& mem) + { + writePluginDefines (mem); + }); + } + + void writeAppConfigFile (const OwnedArray& modules, const String& userContent) + { + writeOrRemoveGeneratedFile (Project::getAppConfigFilename(), [&] (MemoryOutputStream& mem) + { + writeAppConfig (mem, modules, userContent); + }); } void writeAppHeader (MemoryOutputStream& out, const OwnedArray& modules) @@ -533,7 +569,7 @@ private: out << "#pragma once" << newLine << newLine; - if (appConfigFile.exists()) + if (getAppConfigFile().exists() && project.shouldUseAppConfig()) out << CodeHelpers::createIncludeStatement (Project::getAppConfigFilename()) << newLine; if (modules.size() > 0) @@ -547,7 +583,7 @@ private: } if (hasBinaryData && project.shouldIncludeBinaryInJuceHeader()) - out << CodeHelpers::createIncludeStatement (project.getBinaryDataHeaderFile(), appConfigFile) << newLine; + out << CodeHelpers::createIncludeStatement (project.getBinaryDataHeaderFile(), getAppConfigFile()) << newLine; out << newLine << "#if defined (JUCE_PROJUCER_VERSION) && JUCE_PROJUCER_VERSION < JUCE_VERSION" << newLine @@ -558,14 +594,17 @@ private: << " */" << newLine << " #error \"This project was last saved using an outdated version of the Projucer! Re-save this project with the latest version to fix this error.\"" << newLine << "#endif" << newLine - << newLine - << "#if ! DONT_SET_USING_JUCE_NAMESPACE" << newLine - << " // If your code uses a lot of JUCE classes, then this will obviously save you" << newLine - << " // a lot of typing, but can be disabled by setting DONT_SET_USING_JUCE_NAMESPACE." << newLine - << " using namespace juce;" << newLine - << "#endif" << newLine - << newLine - << "#if ! JUCE_DONT_DECLARE_PROJECTINFO" << newLine + << newLine; + + if (project.shouldAddUsingNamespaceToJuceHeader()) + out << "#if ! DONT_SET_USING_JUCE_NAMESPACE" << newLine + << " // If your code uses a lot of JUCE classes, then this will obviously save you" << newLine + << " // a lot of typing, but can be disabled by setting DONT_SET_USING_JUCE_NAMESPACE." << newLine + << " using namespace juce;" << newLine + << "#endif" << newLine + << newLine; + + out << "#if ! JUCE_DONT_DECLARE_PROJECTINFO" << newLine << "namespace ProjectInfo" << newLine << "{" << newLine << " const char* const projectName = " << CppTokeniserFunctions::addEscapeChars (project.getProjectNameString()).quoted() << ";" << newLine @@ -596,10 +635,12 @@ private: writeAutoGenWarningComment (mem); - mem << "*/" << newLine - << newLine - << "#include " << Project::getAppConfigFilename().quoted() << newLine - << "#include <"; + mem << "*/" << newLine << newLine; + + if (project.shouldUseAppConfig()) + mem << "#include " << Project::getAppConfigFilename().quoted() << newLine; + + mem << "#include <"; if (cu.file.getFileExtension() != ".r") // .r files are included without the path mem << module->getID() << "/"; @@ -684,7 +725,7 @@ private: errors.add (message); } - void writePluginCharacteristicsFile(); + String getAudioPluginDefines() const; void writeUnityScriptFile() { diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp b/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp index 907778ee76..b5a4605283 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp +++ b/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp @@ -172,7 +172,7 @@ String createGCCPreprocessorFlags (const StringPairArray& defs) if (value.isNotEmpty()) def << "=" << value; - s += " -D" + def; + s += " \"" + ("-D" + def).replace ("\"", "\\\"") + "\""; } return s; diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h b/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h index 938572bed9..cc4d55e23f 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h +++ b/extras/Projucer/Source/Utility/Helpers/jucer_PresetIDs.h @@ -40,6 +40,8 @@ namespace Ids DECLARE_ID (companyCopyright); DECLARE_ID (companyWebsite); DECLARE_ID (companyEmail); + DECLARE_ID (useAppConfig); + DECLARE_ID (addUsingNamespaceToJuceHeader); DECLARE_ID (displaySplashScreen); DECLARE_ID (reportAppUsage); DECLARE_ID (splashScreenColour); diff --git a/extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.cpp b/extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.cpp index c59feb961f..4a5d7f9e90 100644 --- a/extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.cpp +++ b/extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.cpp @@ -391,6 +391,9 @@ Result PIPGenerator::setProjectSettings (ValueTree& jucerTree) nullptr); } + jucerTree.setProperty (Ids::useAppConfig, false, nullptr); + jucerTree.setProperty (Ids::addUsingNamespaceToJuceHeader, true, nullptr); + return Result::ok(); } diff --git a/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h b/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h index 64daa669f3..66221b7c54 100644 --- a/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h +++ b/extras/Projucer/Source/Wizards/jucer_NewProjectWizard.h @@ -19,6 +19,8 @@ #pragma once +#include "../Utility/Helpers/jucer_PresetIDs.h" + //============================================================================== static void setExecutableNameForAllTargets (Project& project, const String& exeName) { @@ -131,6 +133,8 @@ struct NewProjectWizard return nullptr; project->getConfigFlag ("JUCE_STRICT_REFCOUNTEDPOINTER") = true; + project->getProjectValue (Ids::useAppConfig) = false; + project->getProjectValue (Ids::addUsingNamespaceToJuceHeader) = false; addExporters (*project, wc); addDefaultModules (*project, useGlobalPath); diff --git a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile index 835dafce5c..549c55c551 100644 --- a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile +++ b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile @@ -35,8 +35,8 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) - JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_blocks_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_dsp=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_MODULE_AVAILABLE_juce_product_unlocking=1" "-DJUCE_MODULE_AVAILABLE_juce_video=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS_CONSOLEAPP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_CONSOLEAPP := UnitTestRunner JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) @@ -56,8 +56,8 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCE_UNIT_TESTS=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) - JUCE_CPPFLAGS_CONSOLEAPP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_REPORT_APP_USAGE=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60000" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_formats=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_processors=1" "-DJUCE_MODULE_AVAILABLE_juce_audio_utils=1" "-DJUCE_MODULE_AVAILABLE_juce_blocks_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_dsp=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_MODULE_AVAILABLE_juce_product_unlocking=1" "-DJUCE_MODULE_AVAILABLE_juce_video=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=1" $(shell pkg-config --cflags alsa x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 libcurl) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS_CONSOLEAPP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_CONSOLEAPP := UnitTestRunner JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) diff --git a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj index f3a25509a7..fc405efb36 100644 --- a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj +++ b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj @@ -475,13 +475,6 @@ path = "../../JuceLibraryCode/include_juce_product_unlocking.mm"; sourceTree = "SOURCE_ROOT"; }; - BDE2CEC1C2F9C0EA2FDEDEEC = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = AppConfig.h; - path = ../../JuceLibraryCode/AppConfig.h; - sourceTree = "SOURCE_ROOT"; - }; C0531453A002C480280C5F05 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; @@ -604,7 +597,6 @@ 3F7D4D52FAA229344338F40C = { isa = PBXGroup; children = ( - BDE2CEC1C2F9C0EA2FDEDEEC, 324682B2C8B9B4ACD9711A7A, 4BD792956FE7C22CB8FB691D, 00CDB93410EA5AECBA5ADA95, @@ -707,6 +699,32 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_analytics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_blocks_basics=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_dsp=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_osc=1", + "JUCE_MODULE_AVAILABLE_juce_product_unlocking=1", + "JUCE_MODULE_AVAILABLE_juce_video=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STRICT_REFCOUNTEDPOINTER=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( @@ -750,6 +768,32 @@ "JucePlugin_Build_AAX=0", "JucePlugin_Build_Standalone=0", "JucePlugin_Build_Unity=0", + "JUCE_DISPLAY_SPLASH_SCREEN=0", + "JUCE_REPORT_APP_USAGE=0", + "JUCE_USE_DARK_SPLASH_SCREEN=1", + "JUCE_PROJUCER_VERSION=0x60000", + "JUCE_MODULE_AVAILABLE_juce_analytics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_basics=1", + "JUCE_MODULE_AVAILABLE_juce_audio_devices=1", + "JUCE_MODULE_AVAILABLE_juce_audio_formats=1", + "JUCE_MODULE_AVAILABLE_juce_audio_processors=1", + "JUCE_MODULE_AVAILABLE_juce_audio_utils=1", + "JUCE_MODULE_AVAILABLE_juce_blocks_basics=1", + "JUCE_MODULE_AVAILABLE_juce_core=1", + "JUCE_MODULE_AVAILABLE_juce_cryptography=1", + "JUCE_MODULE_AVAILABLE_juce_data_structures=1", + "JUCE_MODULE_AVAILABLE_juce_dsp=1", + "JUCE_MODULE_AVAILABLE_juce_events=1", + "JUCE_MODULE_AVAILABLE_juce_graphics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", + "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_opengl=1", + "JUCE_MODULE_AVAILABLE_juce_osc=1", + "JUCE_MODULE_AVAILABLE_juce_product_unlocking=1", + "JUCE_MODULE_AVAILABLE_juce_video=1", + "JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1", + "JUCE_STRICT_REFCOUNTEDPOINTER=1", + "JUCE_STANDALONE_APPLICATION=1", ); GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj index a13eb9c96a..9afc8b318c 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_blocks_basics=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_dsp=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -107,7 +107,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_blocks_basics=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_dsp=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -2879,7 +2879,6 @@ - diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters index 4af3605098..bcb49dd45f 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -4944,9 +4944,6 @@ JUCE Modules\juce_video - - JUCE Library Code - JUCE Library Code diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj index d88e4e10d8..e5e3eda786 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_blocks_basics=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_dsp=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -107,7 +107,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_blocks_basics=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_dsp=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -2879,7 +2879,6 @@ - diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters index 10d0c722e8..76733f7843 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -4944,9 +4944,6 @@ JUCE Modules\juce_video - - JUCE Library Code - JUCE Library Code diff --git a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h deleted file mode 100644 index 8de2538008..0000000000 --- a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h +++ /dev/null @@ -1,323 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - - There's a section below where you can add your own custom code safely, and the - Projucer will preserve the contents of that block, but the best way to change - any of these definitions is by using the Projucer's project settings. - - Any commented-out settings will assume their default values. - -*/ - -#pragma once - -//============================================================================== -// [BEGIN_USER_CODE_SECTION] - -// (You can add your own code in this section, and the Projucer will not overwrite it) - -// [END_USER_CODE_SECTION] - -/* - ============================================================================== - - In accordance with the terms of the JUCE 5 End-Use License Agreement, the - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered - ineffective unless you have a JUCE Indie or Pro license, or are using JUCE - under the GPL v3 license. - - End User License Agreement: www.juce.com/juce-5-licence - - ============================================================================== -*/ - -// BEGIN SECTION A - -#ifndef JUCE_DISPLAY_SPLASH_SCREEN - #define JUCE_DISPLAY_SPLASH_SCREEN 0 -#endif - -#ifndef JUCE_REPORT_APP_USAGE - #define JUCE_REPORT_APP_USAGE 0 -#endif - -// END SECTION A - -#define JUCE_USE_DARK_SPLASH_SCREEN 1 - -#define JUCE_PROJUCER_VERSION 0x60000 - -//============================================================================== -#define JUCE_MODULE_AVAILABLE_juce_analytics 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_devices 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_formats 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_processors 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_utils 1 -#define JUCE_MODULE_AVAILABLE_juce_blocks_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_core 1 -#define JUCE_MODULE_AVAILABLE_juce_cryptography 1 -#define JUCE_MODULE_AVAILABLE_juce_data_structures 1 -#define JUCE_MODULE_AVAILABLE_juce_dsp 1 -#define JUCE_MODULE_AVAILABLE_juce_events 1 -#define JUCE_MODULE_AVAILABLE_juce_graphics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1 -#define JUCE_MODULE_AVAILABLE_juce_opengl 1 -#define JUCE_MODULE_AVAILABLE_juce_osc 1 -#define JUCE_MODULE_AVAILABLE_juce_product_unlocking 1 -#define JUCE_MODULE_AVAILABLE_juce_video 1 - -#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 - -//============================================================================== -// juce_audio_devices flags: - -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - -#ifndef JUCE_ASIO - //#define JUCE_ASIO 0 -#endif - -#ifndef JUCE_WASAPI - //#define JUCE_WASAPI 1 -#endif - -#ifndef JUCE_WASAPI_EXCLUSIVE - //#define JUCE_WASAPI_EXCLUSIVE 0 -#endif - -#ifndef JUCE_DIRECTSOUND - //#define JUCE_DIRECTSOUND 1 -#endif - -#ifndef JUCE_ALSA - //#define JUCE_ALSA 1 -#endif - -#ifndef JUCE_JACK - //#define JUCE_JACK 0 -#endif - -#ifndef JUCE_BELA - //#define JUCE_BELA 0 -#endif - -#ifndef JUCE_USE_ANDROID_OBOE - //#define JUCE_USE_ANDROID_OBOE 0 -#endif - -#ifndef JUCE_USE_ANDROID_OPENSLES - //#define JUCE_USE_ANDROID_OPENSLES 0 -#endif - -#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS - //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 -#endif - -//============================================================================== -// juce_audio_formats flags: - -#ifndef JUCE_USE_FLAC - //#define JUCE_USE_FLAC 1 -#endif - -#ifndef JUCE_USE_OGGVORBIS - //#define JUCE_USE_OGGVORBIS 1 -#endif - -#ifndef JUCE_USE_MP3AUDIOFORMAT - //#define JUCE_USE_MP3AUDIOFORMAT 0 -#endif - -#ifndef JUCE_USE_LAME_AUDIO_FORMAT - //#define JUCE_USE_LAME_AUDIO_FORMAT 0 -#endif - -#ifndef JUCE_USE_WINDOWS_MEDIA_FORMAT - //#define JUCE_USE_WINDOWS_MEDIA_FORMAT 1 -#endif - -//============================================================================== -// juce_audio_processors flags: - -#ifndef JUCE_PLUGINHOST_VST - //#define JUCE_PLUGINHOST_VST 0 -#endif - -#ifndef JUCE_PLUGINHOST_VST3 - //#define JUCE_PLUGINHOST_VST3 0 -#endif - -#ifndef JUCE_PLUGINHOST_AU - //#define JUCE_PLUGINHOST_AU 0 -#endif - -#ifndef JUCE_PLUGINHOST_LADSPA - //#define JUCE_PLUGINHOST_LADSPA 0 -#endif - -//============================================================================== -// juce_audio_utils flags: - -#ifndef JUCE_USE_CDREADER - //#define JUCE_USE_CDREADER 0 -#endif - -#ifndef JUCE_USE_CDBURNER - //#define JUCE_USE_CDBURNER 0 -#endif - -//============================================================================== -// juce_core flags: - -#ifndef JUCE_FORCE_DEBUG - //#define JUCE_FORCE_DEBUG 0 -#endif - -#ifndef JUCE_LOG_ASSERTIONS - //#define JUCE_LOG_ASSERTIONS 0 -#endif - -#ifndef JUCE_CHECK_MEMORY_LEAKS - //#define JUCE_CHECK_MEMORY_LEAKS 1 -#endif - -#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES - //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0 -#endif - -#ifndef JUCE_INCLUDE_ZLIB_CODE - //#define JUCE_INCLUDE_ZLIB_CODE 1 -#endif - -#ifndef JUCE_USE_CURL - //#define JUCE_USE_CURL 1 -#endif - -#ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY - //#define JUCE_LOAD_CURL_SYMBOLS_LAZILY 0 -#endif - -#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS - //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 -#endif - -#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES - //#define JUCE_ALLOW_STATIC_NULL_VARIABLES 0 -#endif - -#ifndef JUCE_STRICT_REFCOUNTEDPOINTER - #define JUCE_STRICT_REFCOUNTEDPOINTER 1 -#endif - -//============================================================================== -// juce_dsp flags: - -#ifndef JUCE_ASSERTION_FIRFILTER - //#define JUCE_ASSERTION_FIRFILTER 1 -#endif - -#ifndef JUCE_DSP_USE_INTEL_MKL - //#define JUCE_DSP_USE_INTEL_MKL 0 -#endif - -#ifndef JUCE_DSP_USE_SHARED_FFTW - //#define JUCE_DSP_USE_SHARED_FFTW 0 -#endif - -#ifndef JUCE_DSP_USE_STATIC_FFTW - //#define JUCE_DSP_USE_STATIC_FFTW 0 -#endif - -#ifndef JUCE_DSP_ENABLE_SNAP_TO_ZERO - //#define JUCE_DSP_ENABLE_SNAP_TO_ZERO 1 -#endif - -//============================================================================== -// juce_events flags: - -#ifndef JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK - //#define JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK 0 -#endif - -//============================================================================== -// juce_graphics flags: - -#ifndef JUCE_USE_COREIMAGE_LOADER - //#define JUCE_USE_COREIMAGE_LOADER 1 -#endif - -#ifndef JUCE_USE_DIRECTWRITE - //#define JUCE_USE_DIRECTWRITE 1 -#endif - -#ifndef JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING - //#define JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING 0 -#endif - -//============================================================================== -// juce_gui_basics flags: - -#ifndef JUCE_ENABLE_REPAINT_DEBUGGING - //#define JUCE_ENABLE_REPAINT_DEBUGGING 0 -#endif - -#ifndef JUCE_USE_XRANDR - //#define JUCE_USE_XRANDR 1 -#endif - -#ifndef JUCE_USE_XINERAMA - //#define JUCE_USE_XINERAMA 1 -#endif - -#ifndef JUCE_USE_XSHM - //#define JUCE_USE_XSHM 1 -#endif - -#ifndef JUCE_USE_XRENDER - //#define JUCE_USE_XRENDER 0 -#endif - -#ifndef JUCE_USE_XCURSOR - //#define JUCE_USE_XCURSOR 1 -#endif - -#ifndef JUCE_WIN_PER_MONITOR_DPI_AWARE - //#define JUCE_WIN_PER_MONITOR_DPI_AWARE 1 -#endif - -//============================================================================== -// juce_gui_extra flags: - -#ifndef JUCE_WEB_BROWSER - //#define JUCE_WEB_BROWSER 1 -#endif - -#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR - //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 0 -#endif - -//============================================================================== -// juce_video flags: - -#ifndef JUCE_USE_CAMERA - //#define JUCE_USE_CAMERA 0 -#endif - -#ifndef JUCE_SYNC_VIDEO_VOLUME_WITH_OS_MEDIA_VOLUME - //#define JUCE_SYNC_VIDEO_VOLUME_WITH_OS_MEDIA_VOLUME 1 -#endif - -//============================================================================== -#ifndef JUCE_STANDALONE_APPLICATION - #if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone) - #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone - #else - #define JUCE_STANDALONE_APPLICATION 1 - #endif -#endif diff --git a/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h b/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h index 1b016ebae4..a850cd0588 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h +++ b/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h @@ -12,7 +12,6 @@ #pragma once -#include "AppConfig.h" #include #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_analytics.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_analytics.cpp index 3dfd4d2179..cda0f9390a 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_analytics.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_analytics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_basics.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_basics.cpp index 418694873c..e5c3ae92d6 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_basics.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_basics.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_basics.mm index e0e6c577cc..c7f36c6467 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_basics.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_devices.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_devices.cpp index fb5c2219d7..29b774fdbe 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_devices.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_devices.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_devices.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_devices.mm index e58b67ea49..287da26e86 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_devices.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_devices.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_formats.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_formats.cpp index a3c61170eb..8dac33250a 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_formats.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_formats.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_formats.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_formats.mm index f325b8fb67..79e6a22f66 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_formats.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_formats.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_processors.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_processors.cpp index bfe172edd0..217d330a9b 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_processors.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_processors.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_processors.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_processors.mm index b80ae9017f..1f7cc419da 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_processors.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_processors.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_utils.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_utils.cpp index 97bd2c568c..046bf31d94 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_utils.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_utils.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_utils.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_utils.mm index 8eae7c6e2f..a3f746dcac 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_utils.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_audio_utils.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_blocks_basics.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_blocks_basics.cpp index 6ab147fbb4..fb50ac3c6e 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_blocks_basics.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_blocks_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_core.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_core.cpp index d0ce1636f0..84fe988cb2 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_core.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_core.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_core.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_core.mm index 72b10bf817..9ee67bf662 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_core.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_core.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_cryptography.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_cryptography.cpp index 10b3401dbe..ee7d9085f0 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_cryptography.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_cryptography.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_cryptography.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_cryptography.mm index 9311ea0ffe..03ee05f466 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_cryptography.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_cryptography.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_data_structures.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_data_structures.cpp index 9315aa1686..152980aeb6 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_data_structures.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_data_structures.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_data_structures.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_data_structures.mm index 695ec43925..02b9711c65 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_data_structures.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_data_structures.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_dsp.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_dsp.cpp index 430d943f26..0f0af65999 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_dsp.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_dsp.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_dsp.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_dsp.mm index 1dea5d08a6..a5cb956cfc 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_dsp.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_dsp.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_events.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_events.cpp index 1bba110a97..39268e2b3e 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_events.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_events.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_events.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_events.mm index 4cc34fc401..191a998705 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_events.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_events.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_graphics.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_graphics.cpp index 319c76de0e..8ccabef94f 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_graphics.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_graphics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_graphics.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_graphics.mm index b28e6dd056..6bb7456da9 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_graphics.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_graphics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_basics.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_basics.cpp index 216c76bb05..71d04b2432 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_basics.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_basics.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_basics.mm index 6a9726fa5f..e449e0b733 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_basics.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_extra.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_extra.cpp index 7226e19833..a33ece0061 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_extra.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_extra.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_extra.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_extra.mm index c9b6c3bfc6..6dacee3a6a 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_extra.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_gui_extra.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_opengl.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_opengl.cpp index d9895bce92..e6541a4249 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_opengl.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_opengl.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_opengl.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_opengl.mm index 6c2c32d095..793619ea4c 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_opengl.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_opengl.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_osc.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_osc.cpp index 0c3b9ae974..7eadead5c8 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_osc.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_osc.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_product_unlocking.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_product_unlocking.cpp index f3fcd328d6..ebb62e21a6 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_product_unlocking.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_product_unlocking.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_product_unlocking.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_product_unlocking.mm index 25aa7eaf68..12010f1876 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_product_unlocking.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_product_unlocking.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_video.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_video.cpp index bdf22ee131..29c128359d 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_video.cpp +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_video.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_video.mm b/extras/UnitTestRunner/JuceLibraryCode/include_juce_video.mm index 3da705bccd..082e1adb22 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/include_juce_video.mm +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_video.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/UnitTestRunner/UnitTestRunner.jucer b/extras/UnitTestRunner/UnitTestRunner.jucer index 2bac0e933b..4547ae4a8b 100644 --- a/extras/UnitTestRunner/UnitTestRunner.jucer +++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -2,7 +2,8 @@ + reportAppUsage="0" companyName="ROLI Ltd." companyCopyright="ROLI Ltd." + useAppConfig="0" addUsingNamespaceToJuceHeader="1"> diff --git a/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj b/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj index 60566b10c0..32aab30c54 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj +++ b/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DLL_BUILD=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_DLL_BUILD=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;_LIB;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -105,7 +105,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DLL_BUILD=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_DLL_BUILD=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JUCE_DISPLAY_SPLASH_SCREEN=0;JUCE_REPORT_APP_USAGE=0;JUCE_USE_DARK_SPLASH_SCREEN=1;JUCE_PROJUCER_VERSION=0x60000;JUCE_MODULE_AVAILABLE_juce_audio_basics=1;JUCE_MODULE_AVAILABLE_juce_audio_devices=1;JUCE_MODULE_AVAILABLE_juce_audio_formats=1;JUCE_MODULE_AVAILABLE_juce_audio_processors=1;JUCE_MODULE_AVAILABLE_juce_audio_utils=1;JUCE_MODULE_AVAILABLE_juce_core=1;JUCE_MODULE_AVAILABLE_juce_cryptography=1;JUCE_MODULE_AVAILABLE_juce_data_structures=1;JUCE_MODULE_AVAILABLE_juce_events=1;JUCE_MODULE_AVAILABLE_juce_graphics=1;JUCE_MODULE_AVAILABLE_juce_gui_basics=1;JUCE_MODULE_AVAILABLE_juce_gui_extra=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_video=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_STANDALONE_APPLICATION=1;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -2610,7 +2610,6 @@ - diff --git a/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj.filters b/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj.filters index 659f396597..525d6fbb17 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj.filters +++ b/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj.filters @@ -4428,9 +4428,6 @@ JUCE Modules\juce_video - - JUCE Library Code - JUCE Library Code diff --git a/extras/WindowsDLL/JuceLibraryCode/AppConfig.h b/extras/WindowsDLL/JuceLibraryCode/AppConfig.h deleted file mode 100644 index a6b617fa27..0000000000 --- a/extras/WindowsDLL/JuceLibraryCode/AppConfig.h +++ /dev/null @@ -1,295 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - - There's a section below where you can add your own custom code safely, and the - Projucer will preserve the contents of that block, but the best way to change - any of these definitions is by using the Projucer's project settings. - - Any commented-out settings will assume their default values. - -*/ - -#pragma once - -//============================================================================== -// [BEGIN_USER_CODE_SECTION] - -// (You can add your own code in this section, and the Projucer will not overwrite it) - -// [END_USER_CODE_SECTION] - -/* - ============================================================================== - - In accordance with the terms of the JUCE 5 End-Use License Agreement, the - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered - ineffective unless you have a JUCE Indie or Pro license, or are using JUCE - under the GPL v3 license. - - End User License Agreement: www.juce.com/juce-5-licence - - ============================================================================== -*/ - -// BEGIN SECTION A - -#ifndef JUCE_DISPLAY_SPLASH_SCREEN - #define JUCE_DISPLAY_SPLASH_SCREEN 0 -#endif - -#ifndef JUCE_REPORT_APP_USAGE - #define JUCE_REPORT_APP_USAGE 0 -#endif - -// END SECTION A - -#define JUCE_USE_DARK_SPLASH_SCREEN 1 - -#define JUCE_PROJUCER_VERSION 0x60000 - -//============================================================================== -#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_devices 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_formats 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_processors 1 -#define JUCE_MODULE_AVAILABLE_juce_audio_utils 1 -#define JUCE_MODULE_AVAILABLE_juce_core 1 -#define JUCE_MODULE_AVAILABLE_juce_cryptography 1 -#define JUCE_MODULE_AVAILABLE_juce_data_structures 1 -#define JUCE_MODULE_AVAILABLE_juce_events 1 -#define JUCE_MODULE_AVAILABLE_juce_graphics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_basics 1 -#define JUCE_MODULE_AVAILABLE_juce_gui_extra 1 -#define JUCE_MODULE_AVAILABLE_juce_opengl 1 -#define JUCE_MODULE_AVAILABLE_juce_video 1 - -#define JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED 1 - -//============================================================================== -// juce_audio_devices flags: - -#ifndef JUCE_USE_WINRT_MIDI - //#define JUCE_USE_WINRT_MIDI 0 -#endif - -#ifndef JUCE_ASIO - //#define JUCE_ASIO 0 -#endif - -#ifndef JUCE_WASAPI - //#define JUCE_WASAPI 1 -#endif - -#ifndef JUCE_WASAPI_EXCLUSIVE - //#define JUCE_WASAPI_EXCLUSIVE 0 -#endif - -#ifndef JUCE_DIRECTSOUND - //#define JUCE_DIRECTSOUND 1 -#endif - -#ifndef JUCE_ALSA - //#define JUCE_ALSA 1 -#endif - -#ifndef JUCE_JACK - //#define JUCE_JACK 0 -#endif - -#ifndef JUCE_BELA - //#define JUCE_BELA 0 -#endif - -#ifndef JUCE_USE_ANDROID_OBOE - //#define JUCE_USE_ANDROID_OBOE 0 -#endif - -#ifndef JUCE_USE_ANDROID_OPENSLES - //#define JUCE_USE_ANDROID_OPENSLES 0 -#endif - -#ifndef JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS - //#define JUCE_DISABLE_AUDIO_MIXING_WITH_OTHER_APPS 0 -#endif - -//============================================================================== -// juce_audio_formats flags: - -#ifndef JUCE_USE_FLAC - //#define JUCE_USE_FLAC 1 -#endif - -#ifndef JUCE_USE_OGGVORBIS - //#define JUCE_USE_OGGVORBIS 1 -#endif - -#ifndef JUCE_USE_MP3AUDIOFORMAT - //#define JUCE_USE_MP3AUDIOFORMAT 0 -#endif - -#ifndef JUCE_USE_LAME_AUDIO_FORMAT - //#define JUCE_USE_LAME_AUDIO_FORMAT 0 -#endif - -#ifndef JUCE_USE_WINDOWS_MEDIA_FORMAT - //#define JUCE_USE_WINDOWS_MEDIA_FORMAT 1 -#endif - -//============================================================================== -// juce_audio_processors flags: - -#ifndef JUCE_PLUGINHOST_VST - //#define JUCE_PLUGINHOST_VST 0 -#endif - -#ifndef JUCE_PLUGINHOST_VST3 - //#define JUCE_PLUGINHOST_VST3 0 -#endif - -#ifndef JUCE_PLUGINHOST_AU - //#define JUCE_PLUGINHOST_AU 0 -#endif - -#ifndef JUCE_PLUGINHOST_LADSPA - //#define JUCE_PLUGINHOST_LADSPA 0 -#endif - -//============================================================================== -// juce_audio_utils flags: - -#ifndef JUCE_USE_CDREADER - //#define JUCE_USE_CDREADER 0 -#endif - -#ifndef JUCE_USE_CDBURNER - //#define JUCE_USE_CDBURNER 0 -#endif - -//============================================================================== -// juce_core flags: - -#ifndef JUCE_FORCE_DEBUG - //#define JUCE_FORCE_DEBUG 0 -#endif - -#ifndef JUCE_LOG_ASSERTIONS - //#define JUCE_LOG_ASSERTIONS 0 -#endif - -#ifndef JUCE_CHECK_MEMORY_LEAKS - //#define JUCE_CHECK_MEMORY_LEAKS 1 -#endif - -#ifndef JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES - //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES 0 -#endif - -#ifndef JUCE_INCLUDE_ZLIB_CODE - //#define JUCE_INCLUDE_ZLIB_CODE 1 -#endif - -#ifndef JUCE_USE_CURL - //#define JUCE_USE_CURL 1 -#endif - -#ifndef JUCE_LOAD_CURL_SYMBOLS_LAZILY - //#define JUCE_LOAD_CURL_SYMBOLS_LAZILY 0 -#endif - -#ifndef JUCE_CATCH_UNHANDLED_EXCEPTIONS - //#define JUCE_CATCH_UNHANDLED_EXCEPTIONS 0 -#endif - -#ifndef JUCE_ALLOW_STATIC_NULL_VARIABLES - //#define JUCE_ALLOW_STATIC_NULL_VARIABLES 0 -#endif - -#ifndef JUCE_STRICT_REFCOUNTEDPOINTER - //#define JUCE_STRICT_REFCOUNTEDPOINTER 0 -#endif - -//============================================================================== -// juce_events flags: - -#ifndef JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK - //#define JUCE_EXECUTE_APP_SUSPEND_ON_BACKGROUND_TASK 0 -#endif - -//============================================================================== -// juce_graphics flags: - -#ifndef JUCE_USE_COREIMAGE_LOADER - //#define JUCE_USE_COREIMAGE_LOADER 1 -#endif - -#ifndef JUCE_USE_DIRECTWRITE - //#define JUCE_USE_DIRECTWRITE 1 -#endif - -#ifndef JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING - //#define JUCE_DISABLE_COREGRAPHICS_FONT_SMOOTHING 0 -#endif - -//============================================================================== -// juce_gui_basics flags: - -#ifndef JUCE_ENABLE_REPAINT_DEBUGGING - //#define JUCE_ENABLE_REPAINT_DEBUGGING 0 -#endif - -#ifndef JUCE_USE_XRANDR - //#define JUCE_USE_XRANDR 1 -#endif - -#ifndef JUCE_USE_XINERAMA - //#define JUCE_USE_XINERAMA 1 -#endif - -#ifndef JUCE_USE_XSHM - //#define JUCE_USE_XSHM 1 -#endif - -#ifndef JUCE_USE_XRENDER - //#define JUCE_USE_XRENDER 0 -#endif - -#ifndef JUCE_USE_XCURSOR - //#define JUCE_USE_XCURSOR 1 -#endif - -#ifndef JUCE_WIN_PER_MONITOR_DPI_AWARE - //#define JUCE_WIN_PER_MONITOR_DPI_AWARE 1 -#endif - -//============================================================================== -// juce_gui_extra flags: - -#ifndef JUCE_WEB_BROWSER - //#define JUCE_WEB_BROWSER 1 -#endif - -#ifndef JUCE_ENABLE_LIVE_CONSTANT_EDITOR - //#define JUCE_ENABLE_LIVE_CONSTANT_EDITOR 0 -#endif - -//============================================================================== -// juce_video flags: - -#ifndef JUCE_USE_CAMERA - //#define JUCE_USE_CAMERA 0 -#endif - -#ifndef JUCE_SYNC_VIDEO_VOLUME_WITH_OS_MEDIA_VOLUME - //#define JUCE_SYNC_VIDEO_VOLUME_WITH_OS_MEDIA_VOLUME 1 -#endif - -//============================================================================== -#ifndef JUCE_STANDALONE_APPLICATION - #if defined(JucePlugin_Name) && defined(JucePlugin_Build_Standalone) - #define JUCE_STANDALONE_APPLICATION JucePlugin_Build_Standalone - #else - #define JUCE_STANDALONE_APPLICATION 1 - #endif -#endif diff --git a/extras/WindowsDLL/JuceLibraryCode/JuceHeader.h b/extras/WindowsDLL/JuceLibraryCode/JuceHeader.h index 91fef65b93..648898a269 100644 --- a/extras/WindowsDLL/JuceLibraryCode/JuceHeader.h +++ b/extras/WindowsDLL/JuceLibraryCode/JuceHeader.h @@ -12,7 +12,6 @@ #pragma once -#include "AppConfig.h" #include #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_basics.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_basics.cpp index 418694873c..e5c3ae92d6 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_basics.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_basics.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_basics.mm index e0e6c577cc..c7f36c6467 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_basics.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_devices.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_devices.cpp index fb5c2219d7..29b774fdbe 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_devices.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_devices.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_devices.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_devices.mm index e58b67ea49..287da26e86 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_devices.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_devices.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_formats.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_formats.cpp index a3c61170eb..8dac33250a 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_formats.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_formats.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_formats.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_formats.mm index f325b8fb67..79e6a22f66 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_formats.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_formats.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_processors.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_processors.cpp index bfe172edd0..217d330a9b 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_processors.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_processors.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_processors.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_processors.mm index b80ae9017f..1f7cc419da 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_processors.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_processors.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_utils.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_utils.cpp index 97bd2c568c..046bf31d94 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_utils.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_utils.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_utils.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_utils.mm index 8eae7c6e2f..a3f746dcac 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_utils.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_audio_utils.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_core.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_core.cpp index d0ce1636f0..84fe988cb2 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_core.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_core.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_core.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_core.mm index 72b10bf817..9ee67bf662 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_core.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_core.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_cryptography.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_cryptography.cpp index 10b3401dbe..ee7d9085f0 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_cryptography.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_cryptography.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_cryptography.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_cryptography.mm index 9311ea0ffe..03ee05f466 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_cryptography.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_cryptography.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_data_structures.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_data_structures.cpp index 9315aa1686..152980aeb6 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_data_structures.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_data_structures.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_data_structures.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_data_structures.mm index 695ec43925..02b9711c65 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_data_structures.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_data_structures.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_events.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_events.cpp index 1bba110a97..39268e2b3e 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_events.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_events.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_events.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_events.mm index 4cc34fc401..191a998705 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_events.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_events.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_graphics.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_graphics.cpp index 319c76de0e..8ccabef94f 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_graphics.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_graphics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_graphics.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_graphics.mm index b28e6dd056..6bb7456da9 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_graphics.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_graphics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_basics.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_basics.cpp index 216c76bb05..71d04b2432 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_basics.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_basics.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_basics.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_basics.mm index 6a9726fa5f..e449e0b733 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_basics.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_basics.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_extra.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_extra.cpp index 7226e19833..a33ece0061 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_extra.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_extra.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_extra.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_extra.mm index c9b6c3bfc6..6dacee3a6a 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_extra.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_gui_extra.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_opengl.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_opengl.cpp index d9895bce92..e6541a4249 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_opengl.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_opengl.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_opengl.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_opengl.mm index 6c2c32d095..793619ea4c 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_opengl.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_opengl.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_video.cpp b/extras/WindowsDLL/JuceLibraryCode/include_juce_video.cpp index bdf22ee131..29c128359d 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_video.cpp +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_video.cpp @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/JuceLibraryCode/include_juce_video.mm b/extras/WindowsDLL/JuceLibraryCode/include_juce_video.mm index 3da705bccd..082e1adb22 100644 --- a/extras/WindowsDLL/JuceLibraryCode/include_juce_video.mm +++ b/extras/WindowsDLL/JuceLibraryCode/include_juce_video.mm @@ -5,5 +5,4 @@ */ -#include "AppConfig.h" #include diff --git a/extras/WindowsDLL/WindowsDLL.jucer b/extras/WindowsDLL/WindowsDLL.jucer index d071144884..ee36a3eaf5 100644 --- a/extras/WindowsDLL/WindowsDLL.jucer +++ b/extras/WindowsDLL/WindowsDLL.jucer @@ -3,7 +3,7 @@ + companyCopyright="ROLI Ltd." useAppConfig="0" addUsingNamespaceToJuceHeader="1"> diff --git a/modules/juce_audio_formats/format/juce_AudioFormatManager.h b/modules/juce_audio_formats/format/juce_AudioFormatManager.h index 05767bef56..5d99e5657b 100644 --- a/modules/juce_audio_formats/format/juce_AudioFormatManager.h +++ b/modules/juce_audio_formats/format/juce_AudioFormatManager.h @@ -59,7 +59,7 @@ public: /** Handy method to make it easy to register the formats that come with JUCE. This will add WAV and AIFF to the list, along with any other formats enabled - in either the Projucer or your application's AppConfig.h. + in either the Projucer or your application's preprocessor definitions. */ void registerBasicFormats(); diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU.r b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU.r index f839fd1c35..c5bea24ea9 100644 --- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU.r +++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AU.r @@ -20,13 +20,13 @@ #include //============================================================================== -/* The AppConfig.h file should be a file in your project, containing info to describe the - plugin's name, type, etc. The introjucer will generate this file automatically for you. +/* The JucePluginDefines file should be a file in your project, containing info to describe the + plugin's name, type, etc. The Projucer will generate this file automatically for you. You may need to adjust the include path of your project to make sure it can be found by this include statement. (Don't hack this file to change the include path) */ -#include "AppConfig.h" +#include "JucePluginDefines.h" //==============================================================================