diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md index 8678c1f0e0..ea699a7cff 100644 --- a/BREAKING_CHANGES.md +++ b/BREAKING_CHANGES.md @@ -2,6 +2,24 @@ # develop +## Change + +The Javascript implementation has been moved into a independent juce module. + +**Possible Issues** + +Any existing use of JavascriptEngine, JSCursor, or JSObject will fail to compile. + +**Workaround** + +Add the new juce_javascript module to the project. + +**Rationale** + +The Javascript implementation increases compilation times while being required +by only a select number of projects. + + ## Change The VBlankAttachment class' inheritance from the ComponentPeer::VBlankListener @@ -80,7 +98,7 @@ algorithm to lay out the string, with support for font fallback. ## Change -The constructors of the WebSliderRelay, WebToggleButtonRelay and +The constructors of the WebSliderRelay, WebToggleButtonRelay and WebComboBoxRelay classes were changed and they no longer accept a reference parameter to a WebBrowserComponent object. diff --git a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt index 024598514b..243f021309 100644 --- a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt +++ b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt @@ -34,9 +34,9 @@ include_directories( AFTER enable_language(ASM) if(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") - add_definitions([[-DJUCE_PROJUCER_VERSION=0x80003]] [[-DJUCE_MODULE_AVAILABLE_juce_analytics=1]] [[-DJUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1]] [[-DJUCE_PLUGINHOST_LV2=1]] [[-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0]] [[-DJUCE_STRICT_REFCOUNTEDPOINTER=1]] [[-DJUCE_USE_CAMERA=1]] [[-DJUCE_STANDALONE_APPLICATION=1]] [[-DJUCE_DEMO_RUNNER=1]] [[-DJUCE_UNIT_TESTS=1]] [[-DJUCER_ANDROIDSTUDIO_7F0E4A25=1]] [[-DJUCE_APP_VERSION=8.0.3]] [[-DJUCE_APP_VERSION_HEX=0x80003]] [[-DDEBUG=1]] [[-D_DEBUG=1]]) + add_definitions([[-DJUCE_PROJUCER_VERSION=0x80003]] [[-DJUCE_MODULE_AVAILABLE_juce_analytics=1]] [[-DJUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1]] [[-DJUCE_PLUGINHOST_LV2=1]] [[-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0]] [[-DJUCE_STRICT_REFCOUNTEDPOINTER=1]] [[-DJUCE_USE_CAMERA=1]] [[-DJUCE_STANDALONE_APPLICATION=1]] [[-DJUCE_DEMO_RUNNER=1]] [[-DJUCE_UNIT_TESTS=1]] [[-DJUCER_ANDROIDSTUDIO_7F0E4A25=1]] [[-DJUCE_APP_VERSION=8.0.3]] [[-DJUCE_APP_VERSION_HEX=0x80003]] [[-DDEBUG=1]] [[-D_DEBUG=1]]) elseif(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") - add_definitions([[-DJUCE_PROJUCER_VERSION=0x80003]] [[-DJUCE_MODULE_AVAILABLE_juce_analytics=1]] [[-DJUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1]] [[-DJUCE_PLUGINHOST_LV2=1]] [[-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0]] [[-DJUCE_STRICT_REFCOUNTEDPOINTER=1]] [[-DJUCE_USE_CAMERA=1]] [[-DJUCE_STANDALONE_APPLICATION=1]] [[-DJUCE_DEMO_RUNNER=1]] [[-DJUCE_UNIT_TESTS=1]] [[-DJUCER_ANDROIDSTUDIO_7F0E4A25=1]] [[-DJUCE_APP_VERSION=8.0.3]] [[-DJUCE_APP_VERSION_HEX=0x80003]] [[-DNDEBUG=1]]) + add_definitions([[-DJUCE_PROJUCER_VERSION=0x80003]] [[-DJUCE_MODULE_AVAILABLE_juce_analytics=1]] [[-DJUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1]] [[-DJUCE_PLUGINHOST_LV2=1]] [[-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0]] [[-DJUCE_STRICT_REFCOUNTEDPOINTER=1]] [[-DJUCE_USE_CAMERA=1]] [[-DJUCE_STANDALONE_APPLICATION=1]] [[-DJUCE_DEMO_RUNNER=1]] [[-DJUCE_UNIT_TESTS=1]] [[-DJUCER_ANDROIDSTUDIO_7F0E4A25=1]] [[-DJUCE_APP_VERSION=8.0.3]] [[-DJUCE_APP_VERSION_HEX=0x80003]] [[-DNDEBUG=1]]) else() message( FATAL_ERROR "No matching build-configuration found." ) endif() @@ -1059,26 +1059,12 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/files/juce_TemporaryFile.h" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.cpp" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.h" - "../../../../../modules/juce_core/javascript/choc/containers/choc_Value.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h" - "../../../../../modules/juce_core/javascript/choc/math/choc_MathHelpers.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_Assert.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_DisableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_ReenableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_FloatToString.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h" - "../../../../../modules/juce_core/javascript/choc/LICENSE.md" - "../../../../../modules/juce_core/javascript/juce_Javascript.cpp" - "../../../../../modules/juce_core/javascript/juce_Javascript.h" - "../../../../../modules/juce_core/javascript/juce_JSON.cpp" - "../../../../../modules/juce_core/javascript/juce_JSON.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation_test.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.h" + "../../../../../modules/juce_core/json/juce_JSON.cpp" + "../../../../../modules/juce_core/json/juce_JSON.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation_test.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.h" "../../../../../modules/juce_core/logging/juce_FileLogger.cpp" "../../../../../modules/juce_core/logging/juce_FileLogger.h" "../../../../../modules/juce_core/logging/juce_Logger.cpp" @@ -2524,6 +2510,22 @@ 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" + "../../../../../modules/juce_javascript/choc/containers/choc_Value.h" + "../../../../../modules/juce_javascript/choc/javascript/choc_javascript.h" + "../../../../../modules/juce_javascript/choc/javascript/choc_javascript_QuickJS.h" + "../../../../../modules/juce_javascript/choc/math/choc_MathHelpers.h" + "../../../../../modules/juce_javascript/choc/platform/choc_Assert.h" + "../../../../../modules/juce_javascript/choc/platform/choc_DisableAllWarnings.h" + "../../../../../modules/juce_javascript/choc/platform/choc_ReenableAllWarnings.h" + "../../../../../modules/juce_javascript/choc/text/choc_FloatToString.h" + "../../../../../modules/juce_javascript/choc/text/choc_JSON.h" + "../../../../../modules/juce_javascript/choc/text/choc_StringUtilities.h" + "../../../../../modules/juce_javascript/choc/text/choc_UTF8.h" + "../../../../../modules/juce_javascript/choc/LICENSE.md" + "../../../../../modules/juce_javascript/javascript/juce_Javascript.cpp" + "../../../../../modules/juce_javascript/javascript/juce_Javascript.h" + "../../../../../modules/juce_javascript/juce_javascript.cpp" + "../../../../../modules/juce_javascript/juce_javascript.h" "../../../../../modules/juce_opengl/geometry/juce_Draggable3DOrientation.h" "../../../../../modules/juce_opengl/geometry/juce_Matrix3D.h" "../../../../../modules/juce_opengl/geometry/juce_Quaternion.h" @@ -2629,6 +2631,7 @@ add_library( ${BINARY_NAME} "../../../JuceLibraryCode/include_juce_graphics_Sheenbidi.c" "../../../JuceLibraryCode/include_juce_gui_basics.cpp" "../../../JuceLibraryCode/include_juce_gui_extra.cpp" + "../../../JuceLibraryCode/include_juce_javascript.cpp" "../../../JuceLibraryCode/include_juce_opengl.cpp" "../../../JuceLibraryCode/include_juce_osc.cpp" "../../../JuceLibraryCode/include_juce_product_unlocking.cpp" @@ -3645,26 +3648,12 @@ set_source_files_properties( "../../../../../modules/juce_core/files/juce_TemporaryFile.h" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.cpp" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.h" - "../../../../../modules/juce_core/javascript/choc/containers/choc_Value.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h" - "../../../../../modules/juce_core/javascript/choc/math/choc_MathHelpers.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_Assert.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_DisableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_ReenableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_FloatToString.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h" - "../../../../../modules/juce_core/javascript/choc/LICENSE.md" - "../../../../../modules/juce_core/javascript/juce_Javascript.cpp" - "../../../../../modules/juce_core/javascript/juce_Javascript.h" - "../../../../../modules/juce_core/javascript/juce_JSON.cpp" - "../../../../../modules/juce_core/javascript/juce_JSON.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation_test.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.h" + "../../../../../modules/juce_core/json/juce_JSON.cpp" + "../../../../../modules/juce_core/json/juce_JSON.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation_test.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.h" "../../../../../modules/juce_core/logging/juce_FileLogger.cpp" "../../../../../modules/juce_core/logging/juce_FileLogger.h" "../../../../../modules/juce_core/logging/juce_Logger.cpp" @@ -5110,6 +5099,22 @@ set_source_files_properties( "../../../../../modules/juce_gui_extra/juce_gui_extra.cpp" "../../../../../modules/juce_gui_extra/juce_gui_extra.mm" "../../../../../modules/juce_gui_extra/juce_gui_extra.h" + "../../../../../modules/juce_javascript/choc/containers/choc_Value.h" + "../../../../../modules/juce_javascript/choc/javascript/choc_javascript.h" + "../../../../../modules/juce_javascript/choc/javascript/choc_javascript_QuickJS.h" + "../../../../../modules/juce_javascript/choc/math/choc_MathHelpers.h" + "../../../../../modules/juce_javascript/choc/platform/choc_Assert.h" + "../../../../../modules/juce_javascript/choc/platform/choc_DisableAllWarnings.h" + "../../../../../modules/juce_javascript/choc/platform/choc_ReenableAllWarnings.h" + "../../../../../modules/juce_javascript/choc/text/choc_FloatToString.h" + "../../../../../modules/juce_javascript/choc/text/choc_JSON.h" + "../../../../../modules/juce_javascript/choc/text/choc_StringUtilities.h" + "../../../../../modules/juce_javascript/choc/text/choc_UTF8.h" + "../../../../../modules/juce_javascript/choc/LICENSE.md" + "../../../../../modules/juce_javascript/javascript/juce_Javascript.cpp" + "../../../../../modules/juce_javascript/javascript/juce_Javascript.h" + "../../../../../modules/juce_javascript/juce_javascript.cpp" + "../../../../../modules/juce_javascript/juce_javascript.h" "../../../../../modules/juce_opengl/geometry/juce_Draggable3DOrientation.h" "../../../../../modules/juce_opengl/geometry/juce_Matrix3D.h" "../../../../../modules/juce_opengl/geometry/juce_Quaternion.h" diff --git a/examples/DemoRunner/Builds/LinuxMakefile/Makefile b/examples/DemoRunner/Builds/LinuxMakefile/Makefile index d21824206d..a8c91ad8c2 100644 --- a/examples/DemoRunner/Builds/LinuxMakefile/Makefile +++ b/examples/DemoRunner/Builds/LinuxMakefile/Makefile @@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_PROJUCER_VERSION=0x80003" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1" "-DJUCE_PLUGINHOST_LV2=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_USE_CAMERA=1" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCE_DEMO_RUNNER=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=8.0.3" "-DJUCE_APP_VERSION_HEX=0x80003" $(shell $(PKG_CONFIG) --cflags $(shell ($(PKG_CONFIG) --exists webkit2gtk-4.1 && echo webkit2gtk-4.1) || echo webkit2gtk-4.0) alsa freetype2 fontconfig gl libcurl gtk+-x11-3.0) -pthread -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../../../modules/juce_audio_processors/format_types/LV2_SDK -I../../../../modules/juce_audio_processors/format_types/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_PROJUCER_VERSION=0x80003" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1" "-DJUCE_PLUGINHOST_LV2=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_USE_CAMERA=1" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCE_DEMO_RUNNER=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=8.0.3" "-DJUCE_APP_VERSION_HEX=0x80003" $(shell $(PKG_CONFIG) --cflags $(shell ($(PKG_CONFIG) --exists webkit2gtk-4.1 && echo webkit2gtk-4.1) || echo webkit2gtk-4.0) alsa freetype2 fontconfig gl libcurl gtk+-x11-3.0) -pthread -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../../../modules/juce_audio_processors/format_types/LV2_SDK -I../../../../modules/juce_audio_processors/format_types/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := DemoRunner @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_PROJUCER_VERSION=0x80003" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1" "-DJUCE_PLUGINHOST_LV2=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_USE_CAMERA=1" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCE_DEMO_RUNNER=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=8.0.3" "-DJUCE_APP_VERSION_HEX=0x80003" $(shell $(PKG_CONFIG) --cflags $(shell ($(PKG_CONFIG) --exists webkit2gtk-4.1 && echo webkit2gtk-4.1) || echo webkit2gtk-4.0) alsa freetype2 fontconfig gl libcurl gtk+-x11-3.0) -pthread -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../../../modules/juce_audio_processors/format_types/LV2_SDK -I../../../../modules/juce_audio_processors/format_types/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_PROJUCER_VERSION=0x80003" "-DJUCE_MODULE_AVAILABLE_juce_analytics=1" "-DJUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1" "-DJUCE_PLUGINHOST_LV2=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_USE_CAMERA=1" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCE_DEMO_RUNNER=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=8.0.3" "-DJUCE_APP_VERSION_HEX=0x80003" $(shell $(PKG_CONFIG) --cflags $(shell ($(PKG_CONFIG) --exists webkit2gtk-4.1 && echo webkit2gtk-4.1) || echo webkit2gtk-4.0) alsa freetype2 fontconfig gl libcurl gtk+-x11-3.0) -pthread -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../../../modules/juce_audio_processors/format_types/LV2_SDK -I../../../../modules/juce_audio_processors/format_types/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := DemoRunner @@ -99,6 +99,7 @@ OBJECTS_APP := \ $(JUCE_OBJDIR)/include_juce_graphics_Sheenbidi_c310974d.o \ $(JUCE_OBJDIR)/include_juce_gui_basics_e3f79785.o \ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o \ + $(JUCE_OBJDIR)/include_juce_javascript_84e88969.o \ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o \ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o \ $(JUCE_OBJDIR)/include_juce_product_unlocking_8278fcdc.o \ @@ -252,6 +253,11 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ @echo "Compiling include_juce_gui_extra.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" +$(JUCE_OBJDIR)/include_juce_javascript_84e88969.o: ../../JuceLibraryCode/include_juce_javascript.cpp + -$(V_AT)mkdir -p $(@D) + @echo "Compiling include_juce_javascript.cpp" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_APP) $(JUCE_CFLAGS_APP) -o "$@" -c "$<" + $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o: ../../JuceLibraryCode/include_juce_opengl.cpp -$(V_AT)mkdir -p $(@D) @echo "Compiling include_juce_opengl.cpp" diff --git a/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj b/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj index 282e00f36b..bc75016793 100644 --- a/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj +++ b/examples/DemoRunner/Builds/MacOSX/DemoRunner.xcodeproj/project.pbxproj @@ -52,6 +52,7 @@ B1981F62F6A91FD2F579A198 /* QuartzCore.framework */ = {isa = PBXBuildFile; fileRef = 23CD1A3F9067C3A0ECE7BB67; }; B38728296BB32B7994CE28DF /* JUCEDemos.cpp */ = {isa = PBXBuildFile; fileRef = 934ACDCB3FD9D223A3481D8F; }; BC6036F22423CA0AFF0385A7 /* include_juce_opengl.mm */ = {isa = PBXBuildFile; fileRef = 94B6C88FE30861A47CD28709; }; + BE3AD5595805C8B8845146EF /* include_juce_javascript.cpp */ = {isa = PBXBuildFile; fileRef = 4306E55904378CE5A6EB48B3; }; C2BB2B6DA237FE0CB64C7EDA /* include_juce_analytics.cpp */ = {isa = PBXBuildFile; fileRef = 5965349393850F41DF76F350; }; CDABEA6258EC70C65C9ACCFE /* include_juce_graphics.mm */ = {isa = PBXBuildFile; fileRef = 3E4ED41C374261CFFD309743; }; CDEB6BA5341494AF51D07C72 /* include_juce_product_unlocking.mm */ = {isa = PBXBuildFile; fileRef = 0AB68DBAB6B7DAEDDDD5B683; }; @@ -90,6 +91,7 @@ 3DC90DA86565B0356B6E5E0B /* DiscRecording.framework */ /* DiscRecording.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; }; 3E4ED41C374261CFFD309743 /* include_juce_graphics.mm */ /* include_juce_graphics.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_graphics.mm; path = ../../JuceLibraryCode/include_juce_graphics.mm; sourceTree = SOURCE_ROOT; }; 40BD06D4AB0D2C73E936A2F1 /* OpenGL.framework */ /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + 4306E55904378CE5A6EB48B3 /* include_juce_javascript.cpp */ /* include_juce_javascript.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_javascript.cpp; path = ../../JuceLibraryCode/include_juce_javascript.cpp; sourceTree = SOURCE_ROOT; }; 470C3E4553B513FFEF752779 /* AudioToolbox.framework */ /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 483C3A8B4FB98B54BB42CB50 /* include_juce_graphics_Harfbuzz.cpp */ /* include_juce_graphics_Harfbuzz.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_graphics_Harfbuzz.cpp; path = ../../JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp; sourceTree = SOURCE_ROOT; }; 491641F7632BCC81BBA0ED85 /* juce_audio_formats */ /* juce_audio_formats */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_audio_formats; path = ../../../../modules/juce_audio_formats; sourceTree = SOURCE_ROOT; }; @@ -135,6 +137,7 @@ B2BC383CE102EECCF49C7AF7 /* IntroScreen.h */ /* IntroScreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = IntroScreen.h; path = ../../Source/Demos/IntroScreen.h; sourceTree = SOURCE_ROOT; }; B4389672DA4CC8E0A531062D /* CoreAudioKit.framework */ /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; C1E93FAF6C68A40A664422CD /* include_juce_dsp.mm */ /* include_juce_dsp.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_dsp.mm; path = ../../JuceLibraryCode/include_juce_dsp.mm; sourceTree = SOURCE_ROOT; }; + C64CA4082EC267CDD63E6623 /* juce_javascript */ /* juce_javascript */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_javascript; path = ../../../../modules/juce_javascript; sourceTree = SOURCE_ROOT; }; CB4C64BACC1CA4AAD6D69565 /* include_juce_animation.cpp */ /* include_juce_animation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_animation.cpp; path = ../../JuceLibraryCode/include_juce_animation.cpp; sourceTree = SOURCE_ROOT; }; CCC8AEBCE55002F970222BAD /* include_juce_graphics_Sheenbidi.c */ /* include_juce_graphics_Sheenbidi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = include_juce_graphics_Sheenbidi.c; path = ../../JuceLibraryCode/include_juce_graphics_Sheenbidi.c; sourceTree = SOURCE_ROOT; }; CE38E6469D98462A2C22C915 /* include_juce_osc.cpp */ /* include_juce_osc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_osc.cpp; path = ../../JuceLibraryCode/include_juce_osc.cpp; sourceTree = SOURCE_ROOT; }; @@ -227,6 +230,7 @@ 8CE533D611CD0984AD028D73, 5A9F2000C66D24E8B01BE60B, A9315F8368A5771EC39631CB, + C64CA4082EC267CDD63E6623, 6C198AF93E1F6E682189E2F6, 651ECE3C7BA845DDCFEE48F3, 4FE6029FF76BCE9698595DC5, @@ -259,6 +263,7 @@ CCC8AEBCE55002F970222BAD, A1D6D36B96B6B37C31F32829, 979F23EA9E5E76131299E886, + 4306E55904378CE5A6EB48B3, 94B6C88FE30861A47CD28709, CE38E6469D98462A2C22C915, 0AB68DBAB6B7DAEDDDD5B683, @@ -466,6 +471,7 @@ 1BA36E8CA4B9E8D3F3B57D24, E2F44A968EC2598DAE33A997, 5CB78489F16E82144914972D, + BE3AD5595805C8B8845146EF, BC6036F22423CA0AFF0385A7, AEA090DAC5C747C50C7D3FA7, CDEB6BA5341494AF51D07C72, @@ -556,6 +562,7 @@ "JUCE_MODULE_AVAILABLE_juce_graphics=1", "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_javascript=1", "JUCE_MODULE_AVAILABLE_juce_opengl=1", "JUCE_MODULE_AVAILABLE_juce_osc=1", "JUCE_MODULE_AVAILABLE_juce_product_unlocking=1", @@ -647,6 +654,7 @@ "JUCE_MODULE_AVAILABLE_juce_graphics=1", "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_javascript=1", "JUCE_MODULE_AVAILABLE_juce_opengl=1", "JUCE_MODULE_AVAILABLE_juce_osc=1", "JUCE_MODULE_AVAILABLE_juce_product_unlocking=1", diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj index 7aa76908e5..a8f6d6358e 100644 --- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true NotUsing @@ -79,7 +79,7 @@ ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\DemoRunner.exe @@ -107,7 +107,7 @@ Full ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreaded true NotUsing @@ -122,7 +122,7 @@ ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2019_78A5026=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\DemoRunner.exe @@ -1367,16 +1367,13 @@ true - + true - + true - - true - - + true @@ -3095,6 +3092,12 @@ true + + true + + + true + true @@ -3217,6 +3220,7 @@ /bigobj %(AdditionalOptions) + @@ -3792,21 +3796,9 @@ - - - - - - - - - - - - - - - + + + @@ -4638,6 +4630,19 @@ + + + + + + + + + + + + + @@ -4712,11 +4717,11 @@ - + diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters index 393a9c53db..9a53ea3a2e 100644 --- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters @@ -431,26 +431,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -764,6 +746,30 @@ {A4D76113-9EDC-DA60-D89B-5BACF7F1C426} + + {22F0FDAA-91D0-AC0A-CE26-C58C6016D20F} + + + {995672BE-1FBF-B25B-3B3E-56C32E1ED76B} + + + {EE5C5CBE-AA3C-9E83-CE0E-49216D77C46D} + + + {60EC7489-2A44-44DC-A237-F0D6C8BDD7FE} + + + {67E80742-1E8B-7688-4217-3922EF2FBF2A} + + + {D2777265-A166-EDB8-938A-47D1EDAADA42} + + + {AF145034-7775-F013-E219-381BA369C108} + + + {08279B14-88F5-FDFE-A7A2-2F7485A424DB} + {1A9221A3-E993-70B2-6EA2-8E1DB5FF646A} @@ -2089,17 +2095,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -3931,6 +3934,12 @@ JUCE Modules\juce_gui_extra + + JUCE Modules\juce_javascript\javascript + + + JUCE Modules\juce_javascript + JUCE Modules\juce_opengl\opengl @@ -4096,6 +4105,9 @@ JUCE Library Code + + JUCE Library Code + JUCE Library Code @@ -5817,50 +5829,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -8355,6 +8331,45 @@ JUCE Modules\juce_gui_extra + + JUCE Modules\juce_javascript\choc\containers + + + JUCE Modules\juce_javascript\choc\javascript + + + JUCE Modules\juce_javascript\choc\javascript + + + JUCE Modules\juce_javascript\choc\math + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\javascript + + + JUCE Modules\juce_javascript + JUCE Modules\juce_opengl\geometry @@ -8573,9 +8588,6 @@ JUCE Modules\juce_box2d\box2d - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java @@ -8588,6 +8600,9 @@ JUCE Modules\juce_graphics\unicode\sheenbidi + + JUCE Modules\juce_javascript\choc + JUCE Library Code diff --git a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj index 6afd542756..387098a49b 100644 --- a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true NotUsing @@ -79,7 +79,7 @@ ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\DemoRunner.exe @@ -107,7 +107,7 @@ Full ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreaded true NotUsing @@ -122,7 +122,7 @@ ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;JUCE_MODULE_AVAILABLE_juce_analytics=1;JUCE_MODULE_AVAILABLE_juce_animation=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_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_javascript=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_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_ALLOW_STATIC_NULL_VARIABLES=0;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_USE_CAMERA=1;JUCE_STANDALONE_APPLICATION=1;JUCE_DEMO_RUNNER=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=8.0.3;JUCE_APP_VERSION_HEX=0x80003;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\DemoRunner.exe @@ -1367,16 +1367,13 @@ true - + true - + true - - true - - + true @@ -3095,6 +3092,12 @@ true + + true + + + true + true @@ -3217,6 +3220,7 @@ /bigobj %(AdditionalOptions) + @@ -3792,21 +3796,9 @@ - - - - - - - - - - - - - - - + + + @@ -4638,6 +4630,19 @@ + + + + + + + + + + + + + @@ -4712,11 +4717,11 @@ - + diff --git a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters index 162bc7ab7a..14c245cff5 100644 --- a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters @@ -431,26 +431,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -764,6 +746,30 @@ {A4D76113-9EDC-DA60-D89B-5BACF7F1C426} + + {22F0FDAA-91D0-AC0A-CE26-C58C6016D20F} + + + {995672BE-1FBF-B25B-3B3E-56C32E1ED76B} + + + {EE5C5CBE-AA3C-9E83-CE0E-49216D77C46D} + + + {60EC7489-2A44-44DC-A237-F0D6C8BDD7FE} + + + {67E80742-1E8B-7688-4217-3922EF2FBF2A} + + + {D2777265-A166-EDB8-938A-47D1EDAADA42} + + + {AF145034-7775-F013-E219-381BA369C108} + + + {08279B14-88F5-FDFE-A7A2-2F7485A424DB} + {1A9221A3-E993-70B2-6EA2-8E1DB5FF646A} @@ -2089,17 +2095,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -3931,6 +3934,12 @@ JUCE Modules\juce_gui_extra + + JUCE Modules\juce_javascript\javascript + + + JUCE Modules\juce_javascript + JUCE Modules\juce_opengl\opengl @@ -4096,6 +4105,9 @@ JUCE Library Code + + JUCE Library Code + JUCE Library Code @@ -5817,50 +5829,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -8355,6 +8331,45 @@ JUCE Modules\juce_gui_extra + + JUCE Modules\juce_javascript\choc\containers + + + JUCE Modules\juce_javascript\choc\javascript + + + JUCE Modules\juce_javascript\choc\javascript + + + JUCE Modules\juce_javascript\choc\math + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\javascript + + + JUCE Modules\juce_javascript + JUCE Modules\juce_opengl\geometry @@ -8573,9 +8588,6 @@ JUCE Modules\juce_box2d\box2d - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java @@ -8588,6 +8600,9 @@ JUCE Modules\juce_graphics\unicode\sheenbidi + + JUCE Modules\juce_javascript\choc + JUCE Library Code diff --git a/examples/DemoRunner/Builds/iOS/DemoRunner.xcodeproj/project.pbxproj b/examples/DemoRunner/Builds/iOS/DemoRunner.xcodeproj/project.pbxproj index beea265ee3..2f515c6daa 100644 --- a/examples/DemoRunner/Builds/iOS/DemoRunner.xcodeproj/project.pbxproj +++ b/examples/DemoRunner/Builds/iOS/DemoRunner.xcodeproj/project.pbxproj @@ -54,6 +54,7 @@ B1981F62F6A91FD2F579A198 /* QuartzCore.framework */ = {isa = PBXBuildFile; fileRef = 23CD1A3F9067C3A0ECE7BB67; }; B38728296BB32B7994CE28DF /* JUCEDemos.cpp */ = {isa = PBXBuildFile; fileRef = 934ACDCB3FD9D223A3481D8F; }; BC6036F22423CA0AFF0385A7 /* include_juce_opengl.mm */ = {isa = PBXBuildFile; fileRef = 94B6C88FE30861A47CD28709; }; + BE3AD5595805C8B8845146EF /* include_juce_javascript.cpp */ = {isa = PBXBuildFile; fileRef = 4306E55904378CE5A6EB48B3; }; C2BB2B6DA237FE0CB64C7EDA /* include_juce_analytics.cpp */ = {isa = PBXBuildFile; fileRef = 5965349393850F41DF76F350; }; CDABEA6258EC70C65C9ACCFE /* include_juce_graphics.mm */ = {isa = PBXBuildFile; fileRef = 3E4ED41C374261CFFD309743; }; CDEB6BA5341494AF51D07C72 /* include_juce_product_unlocking.mm */ = {isa = PBXBuildFile; fileRef = 0AB68DBAB6B7DAEDDDD5B683; }; @@ -90,6 +91,7 @@ 3BC9753E0CD75A36DC742EE0 /* include_juce_core.mm */ /* include_juce_core.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_core.mm; path = ../../JuceLibraryCode/include_juce_core.mm; sourceTree = SOURCE_ROOT; }; 3E4ED41C374261CFFD309743 /* include_juce_graphics.mm */ /* include_juce_graphics.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_graphics.mm; path = ../../JuceLibraryCode/include_juce_graphics.mm; sourceTree = SOURCE_ROOT; }; 40D006CCDB1D33FF94B6ECAE /* UserNotifications.framework */ /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; }; + 4306E55904378CE5A6EB48B3 /* include_juce_javascript.cpp */ /* include_juce_javascript.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_javascript.cpp; path = ../../JuceLibraryCode/include_juce_javascript.cpp; sourceTree = SOURCE_ROOT; }; 470C3E4553B513FFEF752779 /* AudioToolbox.framework */ /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 483C3A8B4FB98B54BB42CB50 /* include_juce_graphics_Harfbuzz.cpp */ /* include_juce_graphics_Harfbuzz.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_graphics_Harfbuzz.cpp; path = ../../JuceLibraryCode/include_juce_graphics_Harfbuzz.cpp; sourceTree = SOURCE_ROOT; }; 491641F7632BCC81BBA0ED85 /* juce_audio_formats */ /* juce_audio_formats */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_audio_formats; path = ../../../../modules/juce_audio_formats; sourceTree = SOURCE_ROOT; }; @@ -136,6 +138,7 @@ B2BC383CE102EECCF49C7AF7 /* IntroScreen.h */ /* IntroScreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = IntroScreen.h; path = ../../Source/Demos/IntroScreen.h; sourceTree = SOURCE_ROOT; }; B4389672DA4CC8E0A531062D /* CoreAudioKit.framework */ /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; C1E93FAF6C68A40A664422CD /* include_juce_dsp.mm */ /* include_juce_dsp.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_dsp.mm; path = ../../JuceLibraryCode/include_juce_dsp.mm; sourceTree = SOURCE_ROOT; }; + C64CA4082EC267CDD63E6623 /* juce_javascript */ /* juce_javascript */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_javascript; path = ../../../../modules/juce_javascript; sourceTree = SOURCE_ROOT; }; CB4C64BACC1CA4AAD6D69565 /* include_juce_animation.cpp */ /* include_juce_animation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_animation.cpp; path = ../../JuceLibraryCode/include_juce_animation.cpp; sourceTree = SOURCE_ROOT; }; CCC8AEBCE55002F970222BAD /* include_juce_graphics_Sheenbidi.c */ /* include_juce_graphics_Sheenbidi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = include_juce_graphics_Sheenbidi.c; path = ../../JuceLibraryCode/include_juce_graphics_Sheenbidi.c; sourceTree = SOURCE_ROOT; }; CE38E6469D98462A2C22C915 /* include_juce_osc.cpp */ /* include_juce_osc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_osc.cpp; path = ../../JuceLibraryCode/include_juce_osc.cpp; sourceTree = SOURCE_ROOT; }; @@ -238,6 +241,7 @@ 8CE533D611CD0984AD028D73, 5A9F2000C66D24E8B01BE60B, A9315F8368A5771EC39631CB, + C64CA4082EC267CDD63E6623, 6C198AF93E1F6E682189E2F6, 651ECE3C7BA845DDCFEE48F3, 4FE6029FF76BCE9698595DC5, @@ -270,6 +274,7 @@ CCC8AEBCE55002F970222BAD, A1D6D36B96B6B37C31F32829, 979F23EA9E5E76131299E886, + 4306E55904378CE5A6EB48B3, 94B6C88FE30861A47CD28709, CE38E6469D98462A2C22C915, 0AB68DBAB6B7DAEDDDD5B683, @@ -474,6 +479,7 @@ 1BA36E8CA4B9E8D3F3B57D24, E2F44A968EC2598DAE33A997, 5CB78489F16E82144914972D, + BE3AD5595805C8B8845146EF, BC6036F22423CA0AFF0385A7, AEA090DAC5C747C50C7D3FA7, CDEB6BA5341494AF51D07C72, @@ -567,6 +573,7 @@ "JUCE_MODULE_AVAILABLE_juce_graphics=1", "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_javascript=1", "JUCE_MODULE_AVAILABLE_juce_opengl=1", "JUCE_MODULE_AVAILABLE_juce_osc=1", "JUCE_MODULE_AVAILABLE_juce_product_unlocking=1", @@ -658,6 +665,7 @@ "JUCE_MODULE_AVAILABLE_juce_graphics=1", "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_javascript=1", "JUCE_MODULE_AVAILABLE_juce_opengl=1", "JUCE_MODULE_AVAILABLE_juce_osc=1", "JUCE_MODULE_AVAILABLE_juce_product_unlocking=1", diff --git a/examples/DemoRunner/CMakeLists.txt b/examples/DemoRunner/CMakeLists.txt index d6dc6e3172..2c83f6ba15 100644 --- a/examples/DemoRunner/CMakeLists.txt +++ b/examples/DemoRunner/CMakeLists.txt @@ -77,6 +77,7 @@ target_link_libraries(DemoRunner PRIVATE juce::juce_osc juce::juce_product_unlocking juce::juce_video + juce::juce_javascript juce::juce_recommended_config_flags juce::juce_recommended_lto_flags juce::juce_recommended_warning_flags) diff --git a/examples/DemoRunner/DemoRunner.jucer b/examples/DemoRunner/DemoRunner.jucer index d5fb41459e..ed0a39bc87 100644 --- a/examples/DemoRunner/DemoRunner.jucer +++ b/examples/DemoRunner/DemoRunner.jucer @@ -61,6 +61,7 @@ + @@ -89,6 +90,7 @@ + + + + + @@ -235,6 +241,7 @@ + #include #include +#include #include #include #include diff --git a/examples/DemoRunner/JuceLibraryCode/include_juce_javascript.cpp b/examples/DemoRunner/JuceLibraryCode/include_juce_javascript.cpp new file mode 100644 index 0000000000..b2db8636f3 --- /dev/null +++ b/examples/DemoRunner/JuceLibraryCode/include_juce_javascript.cpp @@ -0,0 +1,8 @@ +/* + + IMPORTANT! This file is auto-generated each time you save your + project - if you alter its contents, your changes may be overwritten! + +*/ + +#include diff --git a/examples/Utilities/JavaScriptDemo.h b/examples/Utilities/JavaScriptDemo.h index 2f5e1c9f7b..9590b510e7 100644 --- a/examples/Utilities/JavaScriptDemo.h +++ b/examples/Utilities/JavaScriptDemo.h @@ -34,7 +34,7 @@ description: Showcases JavaScript features. dependencies: juce_core, juce_data_structures, juce_events, juce_graphics, - juce_gui_basics, juce_gui_extra + juce_gui_basics, juce_gui_extra, juce_javascript exporters: xcode_mac, vs2022, linux_make, androidstudio, xcode_iphone moduleFlags: JUCE_STRICT_REFCOUNTEDPOINTER=1 diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index 1d93a40e1b..20e5171a38 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -918,26 +918,12 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/files/juce_TemporaryFile.h" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.cpp" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.h" - "../../../../../modules/juce_core/javascript/choc/containers/choc_Value.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h" - "../../../../../modules/juce_core/javascript/choc/math/choc_MathHelpers.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_Assert.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_DisableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_ReenableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_FloatToString.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h" - "../../../../../modules/juce_core/javascript/choc/LICENSE.md" - "../../../../../modules/juce_core/javascript/juce_Javascript.cpp" - "../../../../../modules/juce_core/javascript/juce_Javascript.h" - "../../../../../modules/juce_core/javascript/juce_JSON.cpp" - "../../../../../modules/juce_core/javascript/juce_JSON.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation_test.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.h" + "../../../../../modules/juce_core/json/juce_JSON.cpp" + "../../../../../modules/juce_core/json/juce_JSON.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation_test.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.h" "../../../../../modules/juce_core/logging/juce_FileLogger.cpp" "../../../../../modules/juce_core/logging/juce_FileLogger.h" "../../../../../modules/juce_core/logging/juce_Logger.cpp" @@ -3187,26 +3173,12 @@ set_source_files_properties( "../../../../../modules/juce_core/files/juce_TemporaryFile.h" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.cpp" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.h" - "../../../../../modules/juce_core/javascript/choc/containers/choc_Value.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h" - "../../../../../modules/juce_core/javascript/choc/math/choc_MathHelpers.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_Assert.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_DisableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_ReenableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_FloatToString.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h" - "../../../../../modules/juce_core/javascript/choc/LICENSE.md" - "../../../../../modules/juce_core/javascript/juce_Javascript.cpp" - "../../../../../modules/juce_core/javascript/juce_Javascript.h" - "../../../../../modules/juce_core/javascript/juce_JSON.cpp" - "../../../../../modules/juce_core/javascript/juce_JSON.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation_test.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.h" + "../../../../../modules/juce_core/json/juce_JSON.cpp" + "../../../../../modules/juce_core/json/juce_JSON.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation_test.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.h" "../../../../../modules/juce_core/logging/juce_FileLogger.cpp" "../../../../../modules/juce_core/logging/juce_FileLogger.h" "../../../../../modules/juce_core/logging/juce_Logger.cpp" diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj index b9ae419ca2..88a22231dd 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj @@ -1186,16 +1186,13 @@ true - + true - + true - - true - - + true @@ -3316,21 +3313,9 @@ - - - - - - - - - - - - - - - + + + @@ -4131,7 +4116,6 @@ - diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters index 588e9fdec6..7a475a3df1 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters @@ -374,26 +374,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -1765,17 +1747,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -5031,50 +5010,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -7472,9 +7415,6 @@ JUCE Modules\juce_audio_processors\format_types\VST3_SDK - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt index ff5a5a9e88..5122ac7f27 100644 --- a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt @@ -951,26 +951,12 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/files/juce_TemporaryFile.h" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.cpp" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.h" - "../../../../../modules/juce_core/javascript/choc/containers/choc_Value.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h" - "../../../../../modules/juce_core/javascript/choc/math/choc_MathHelpers.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_Assert.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_DisableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_ReenableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_FloatToString.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h" - "../../../../../modules/juce_core/javascript/choc/LICENSE.md" - "../../../../../modules/juce_core/javascript/juce_Javascript.cpp" - "../../../../../modules/juce_core/javascript/juce_Javascript.h" - "../../../../../modules/juce_core/javascript/juce_JSON.cpp" - "../../../../../modules/juce_core/javascript/juce_JSON.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation_test.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.h" + "../../../../../modules/juce_core/json/juce_JSON.cpp" + "../../../../../modules/juce_core/json/juce_JSON.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation_test.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.h" "../../../../../modules/juce_core/logging/juce_FileLogger.cpp" "../../../../../modules/juce_core/logging/juce_FileLogger.h" "../../../../../modules/juce_core/logging/juce_Logger.cpp" @@ -3373,26 +3359,12 @@ set_source_files_properties( "../../../../../modules/juce_core/files/juce_TemporaryFile.h" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.cpp" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.h" - "../../../../../modules/juce_core/javascript/choc/containers/choc_Value.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h" - "../../../../../modules/juce_core/javascript/choc/math/choc_MathHelpers.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_Assert.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_DisableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_ReenableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_FloatToString.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h" - "../../../../../modules/juce_core/javascript/choc/LICENSE.md" - "../../../../../modules/juce_core/javascript/juce_Javascript.cpp" - "../../../../../modules/juce_core/javascript/juce_Javascript.h" - "../../../../../modules/juce_core/javascript/juce_JSON.cpp" - "../../../../../modules/juce_core/javascript/juce_JSON.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation_test.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.h" + "../../../../../modules/juce_core/json/juce_JSON.cpp" + "../../../../../modules/juce_core/json/juce_JSON.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation_test.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.h" "../../../../../modules/juce_core/logging/juce_FileLogger.cpp" "../../../../../modules/juce_core/logging/juce_FileLogger.h" "../../../../../modules/juce_core/logging/juce_Logger.cpp" diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj index 49c4ab206f..8160bdbebc 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj @@ -1194,16 +1194,13 @@ true - + true - + true - - true - - + true @@ -3496,21 +3493,9 @@ - - - - - - - - - - - - - - - + + + @@ -4397,7 +4382,6 @@ - diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters index d2047ee98b..c5886faeb6 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters @@ -383,26 +383,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -1840,17 +1822,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -5307,50 +5286,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -8006,9 +7949,6 @@ JUCE Modules\juce_audio_processors\format_types\VST3_SDK - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj index 1902839141..298a56dd77 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj @@ -1194,16 +1194,13 @@ true - + true - + true - - true - - + true @@ -3496,21 +3493,9 @@ - - - - - - - - - - - - - - - + + + @@ -4397,7 +4382,6 @@ - diff --git a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters index 4743a46145..aad4602684 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters @@ -383,26 +383,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -1840,17 +1822,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -5307,50 +5286,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -8006,9 +7949,6 @@ JUCE Modules\juce_audio_processors\format_types\VST3_SDK - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj b/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj index b00fd2667d..a8b2d3590d 100644 --- a/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj +++ b/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj @@ -214,16 +214,13 @@ true - + true - + true - - true - - + true @@ -549,21 +546,9 @@ - - - - - - - - - - - - - - - + + + @@ -688,7 +673,6 @@ - diff --git a/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj.filters b/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj.filters index 2ecd52e5d5..fabfba05a3 100644 --- a/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj.filters +++ b/extras/BinaryBuilder/Builds/VisualStudio2022/BinaryBuilder_ConsoleApp.vcxproj.filters @@ -17,26 +17,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -175,17 +157,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -606,50 +585,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -1019,9 +962,6 @@ - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/extras/Build/CMake/JUCEConfig.cmake.in b/extras/Build/CMake/JUCEConfig.cmake.in index d4bdce4f26..c0c1eef2dd 100644 --- a/extras/Build/CMake/JUCEConfig.cmake.in +++ b/extras/Build/CMake/JUCEConfig.cmake.in @@ -54,6 +54,7 @@ set(_juce_modules juce_graphics juce_gui_basics juce_gui_extra + juce_javascript juce_opengl juce_osc juce_product_unlocking diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index 78663b6b83..1b645b1e18 100644 --- a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -922,26 +922,12 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/files/juce_TemporaryFile.h" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.cpp" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.h" - "../../../../../modules/juce_core/javascript/choc/containers/choc_Value.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h" - "../../../../../modules/juce_core/javascript/choc/math/choc_MathHelpers.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_Assert.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_DisableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_ReenableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_FloatToString.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h" - "../../../../../modules/juce_core/javascript/choc/LICENSE.md" - "../../../../../modules/juce_core/javascript/juce_Javascript.cpp" - "../../../../../modules/juce_core/javascript/juce_Javascript.h" - "../../../../../modules/juce_core/javascript/juce_JSON.cpp" - "../../../../../modules/juce_core/javascript/juce_JSON.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation_test.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.h" + "../../../../../modules/juce_core/json/juce_JSON.cpp" + "../../../../../modules/juce_core/json/juce_JSON.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation_test.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.h" "../../../../../modules/juce_core/logging/juce_FileLogger.cpp" "../../../../../modules/juce_core/logging/juce_FileLogger.h" "../../../../../modules/juce_core/logging/juce_Logger.cpp" @@ -3271,26 +3257,12 @@ set_source_files_properties( "../../../../../modules/juce_core/files/juce_TemporaryFile.h" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.cpp" "../../../../../modules/juce_core/files/juce_WildcardFileFilter.h" - "../../../../../modules/juce_core/javascript/choc/containers/choc_Value.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript.h" - "../../../../../modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h" - "../../../../../modules/juce_core/javascript/choc/math/choc_MathHelpers.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_Assert.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_DisableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/platform/choc_ReenableAllWarnings.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_FloatToString.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_JSON.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_StringUtilities.h" - "../../../../../modules/juce_core/javascript/choc/text/choc_UTF8.h" - "../../../../../modules/juce_core/javascript/choc/LICENSE.md" - "../../../../../modules/juce_core/javascript/juce_Javascript.cpp" - "../../../../../modules/juce_core/javascript/juce_Javascript.h" - "../../../../../modules/juce_core/javascript/juce_JSON.cpp" - "../../../../../modules/juce_core/javascript/juce_JSON.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation.h" - "../../../../../modules/juce_core/javascript/juce_JSONSerialisation_test.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.cpp" - "../../../../../modules/juce_core/javascript/juce_JSONUtils.h" + "../../../../../modules/juce_core/json/juce_JSON.cpp" + "../../../../../modules/juce_core/json/juce_JSON.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation.h" + "../../../../../modules/juce_core/json/juce_JSONSerialisation_test.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.cpp" + "../../../../../modules/juce_core/json/juce_JSONUtils.h" "../../../../../modules/juce_core/logging/juce_FileLogger.cpp" "../../../../../modules/juce_core/logging/juce_FileLogger.h" "../../../../../modules/juce_core/logging/juce_Logger.cpp" diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj index 72d02587c2..2296a731e2 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj @@ -1186,16 +1186,13 @@ true - + true - + true - - true - - + true @@ -3407,21 +3404,9 @@ - - - - - - - - - - - - - - - + + + @@ -4265,7 +4250,6 @@ - diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters index 96f9375c7c..f3ddc3d536 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters @@ -374,26 +374,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -1795,17 +1777,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -5172,50 +5151,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -7742,9 +7685,6 @@ JUCE Modules\juce_audio_processors\format_types\VST3_SDK - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj index 1b04a4a2c7..ffd25fc5ac 100644 --- a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj @@ -331,16 +331,13 @@ true - + true - + true - - true - - + true @@ -2110,21 +2107,9 @@ - - - - - - - - - - - - - - - + + + @@ -2944,7 +2929,6 @@ - diff --git a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters index 642e615b7d..61acce1777 100644 --- a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters @@ -77,26 +77,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -637,17 +619,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -2817,50 +2796,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -5315,9 +5258,6 @@ Projucer\BinaryData - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj index c8152aaeec..c5ae0b753b 100644 --- a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj @@ -331,16 +331,13 @@ true - + true - + true - - true - - + true @@ -2110,21 +2107,9 @@ - - - - - - - - - - - - - - - + + + @@ -2944,7 +2929,6 @@ - diff --git a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters index cb6010a122..08271ff691 100644 --- a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters @@ -77,26 +77,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -637,17 +619,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -2817,50 +2796,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -5315,9 +5258,6 @@ Projucer\BinaryData - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp b/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp index 25cefcc2b9..00f79e568e 100644 --- a/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp +++ b/extras/Projucer/Source/Utility/Helpers/jucer_MiscUtilities.cpp @@ -289,6 +289,7 @@ StringArray getJUCEModules() noexcept "juce_graphics", "juce_gui_basics", "juce_gui_extra", + "juce_javascript", "juce_opengl", "juce_osc", "juce_product_unlocking", diff --git a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile index cd36cfb4fa..53bd53fa09 100644 --- a/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile +++ b/extras/UnitTestRunner/Builds/LinuxMakefile/Makefile @@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_PROJUCER_VERSION=0x80003" "-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_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_midi_ci=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_MODULE_AVAILABLE_juce_product_unlocking=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_PLUGINHOST_VST3=1" "-DJUCE_PLUGINHOST_LV2=1" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=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 $(shell ($(PKG_CONFIG) --exists webkit2gtk-4.1 && echo webkit2gtk-4.1) || echo webkit2gtk-4.0) alsa freetype2 fontconfig gl libcurl gtk+-x11-3.0) -pthread -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../../../modules/juce_audio_processors/format_types/LV2_SDK -I../../../../modules/juce_audio_processors/format_types/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_PROJUCER_VERSION=0x80003" "-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_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_javascript=1" "-DJUCE_MODULE_AVAILABLE_juce_midi_ci=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_MODULE_AVAILABLE_juce_product_unlocking=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_PLUGINHOST_VST3=1" "-DJUCE_PLUGINHOST_LV2=1" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=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 $(shell ($(PKG_CONFIG) --exists webkit2gtk-4.1 && echo webkit2gtk-4.1) || echo webkit2gtk-4.0) alsa freetype2 fontconfig gl libcurl gtk+-x11-3.0) -pthread -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../../../modules/juce_audio_processors/format_types/LV2_SDK -I../../../../modules/juce_audio_processors/format_types/VST3_SDK -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_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_CONSOLEAPP := UnitTestRunner @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_PROJUCER_VERSION=0x80003" "-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_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_midi_ci=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_MODULE_AVAILABLE_juce_product_unlocking=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_PLUGINHOST_VST3=1" "-DJUCE_PLUGINHOST_LV2=1" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=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 $(shell ($(PKG_CONFIG) --exists webkit2gtk-4.1 && echo webkit2gtk-4.1) || echo webkit2gtk-4.0) alsa freetype2 fontconfig gl libcurl gtk+-x11-3.0) -pthread -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../../../modules/juce_audio_processors/format_types/LV2_SDK -I../../../../modules/juce_audio_processors/format_types/VST3_SDK -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_PROJUCER_VERSION=0x80003" "-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_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_javascript=1" "-DJUCE_MODULE_AVAILABLE_juce_midi_ci=1" "-DJUCE_MODULE_AVAILABLE_juce_opengl=1" "-DJUCE_MODULE_AVAILABLE_juce_osc=1" "-DJUCE_MODULE_AVAILABLE_juce_product_unlocking=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_PLUGINHOST_VST3=1" "-DJUCE_PLUGINHOST_LV2=1" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_STANDALONE_APPLICATION=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 $(shell ($(PKG_CONFIG) --exists webkit2gtk-4.1 && echo webkit2gtk-4.1) || echo webkit2gtk-4.0) alsa freetype2 fontconfig gl libcurl gtk+-x11-3.0) -pthread -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lilv -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sratom -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord/src -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/sord -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/serd -I../../../../modules/juce_audio_processors/format_types/LV2_SDK/lv2 -I../../../../modules/juce_audio_processors/format_types/LV2_SDK -I../../../../modules/juce_audio_processors/format_types/VST3_SDK -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_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_CONSOLEAPP := UnitTestRunner @@ -92,6 +92,7 @@ OBJECTS_CONSOLEAPP := \ $(JUCE_OBJDIR)/include_juce_graphics_Sheenbidi_c310974d.o \ $(JUCE_OBJDIR)/include_juce_gui_basics_e3f79785.o \ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o \ + $(JUCE_OBJDIR)/include_juce_javascript_84e88969.o \ $(JUCE_OBJDIR)/include_juce_midi_ci_1fda4092.o \ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o \ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o \ @@ -210,6 +211,11 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_ @echo "Compiling include_juce_gui_extra.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_CONSOLEAPP) $(JUCE_CFLAGS_CONSOLEAPP) -o "$@" -c "$<" +$(JUCE_OBJDIR)/include_juce_javascript_84e88969.o: ../../JuceLibraryCode/include_juce_javascript.cpp + -$(V_AT)mkdir -p $(@D) + @echo "Compiling include_juce_javascript.cpp" + $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_CONSOLEAPP) $(JUCE_CFLAGS_CONSOLEAPP) -o "$@" -c "$<" + $(JUCE_OBJDIR)/include_juce_midi_ci_1fda4092.o: ../../JuceLibraryCode/include_juce_midi_ci.cpp -$(V_AT)mkdir -p $(@D) @echo "Compiling include_juce_midi_ci.cpp" diff --git a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj index 985e1f52e3..764730876f 100644 --- a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj +++ b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ 7164274FE42C7EC423455E05 /* include_juce_osc.cpp */ = {isa = PBXBuildFile; fileRef = A59D9064C3A2D7EC3DC45420; }; 74EC8AEC296DB2721EB438BF /* include_juce_audio_processors.mm */ = {isa = PBXBuildFile; fileRef = 3A26A3568F2C301EEED25288; }; 79FE3F2D2EFAC333283E5D90 /* include_juce_audio_processors_lv2_libs.cpp */ = {isa = PBXBuildFile; fileRef = 45FB94C047D1ECAACA9462B7; }; + 8931A330E8D2263E787BDBA6 /* include_juce_javascript.cpp */ = {isa = PBXBuildFile; fileRef = 46D161431FC09F290F176D30; }; 8D51903C59161885903F60CC /* CoreMIDI.framework */ = {isa = PBXBuildFile; fileRef = 04C1B8BF62AA09E62B362913; }; 96EFF7BA261F57DD829324D8 /* AudioToolbox.framework */ = {isa = PBXBuildFile; fileRef = 7898C73DCA6FA9D9CF669D32; }; 9B48039CDFD679AD944BAC70 /* include_juce_core.mm */ = {isa = PBXBuildFile; fileRef = AB19DDC8458D2A420E6D8AC3; }; @@ -52,6 +53,7 @@ /* Begin PBXFileReference section */ 00CDB93410EA5AECBA5ADA95 /* include_juce_audio_devices.mm */ /* include_juce_audio_devices.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_audio_devices.mm; path = ../../JuceLibraryCode/include_juce_audio_devices.mm; sourceTree = SOURCE_ROOT; }; + 02D7ADAB1962C77DC0BDCC0E /* juce_javascript */ /* juce_javascript */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_javascript; path = ../../../../modules/juce_javascript; sourceTree = SOURCE_ROOT; }; 04C1B8BF62AA09E62B362913 /* CoreMIDI.framework */ /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; }; 05501801BF6C4A47598C59E2 /* juce_cryptography */ /* juce_cryptography */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_cryptography; path = ../../../../modules/juce_cryptography; sourceTree = SOURCE_ROOT; }; 080EAB9CF5AB2BD6B2BBB173 /* ConsoleApp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = UnitTestRunner; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -73,6 +75,7 @@ 3D169C5EFBF6304F5CE4C35E /* include_juce_events.mm */ /* include_juce_events.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_events.mm; path = ../../JuceLibraryCode/include_juce_events.mm; sourceTree = SOURCE_ROOT; }; 4195CB317C364D778AE2ADB1 /* include_juce_gui_extra.mm */ /* include_juce_gui_extra.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_gui_extra.mm; path = ../../JuceLibraryCode/include_juce_gui_extra.mm; sourceTree = SOURCE_ROOT; }; 45FB94C047D1ECAACA9462B7 /* include_juce_audio_processors_lv2_libs.cpp */ /* include_juce_audio_processors_lv2_libs.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_audio_processors_lv2_libs.cpp; path = ../../JuceLibraryCode/include_juce_audio_processors_lv2_libs.cpp; sourceTree = SOURCE_ROOT; }; + 46D161431FC09F290F176D30 /* include_juce_javascript.cpp */ /* include_juce_javascript.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_javascript.cpp; path = ../../JuceLibraryCode/include_juce_javascript.cpp; sourceTree = SOURCE_ROOT; }; 4BD792956FE7C22CB8FB691D /* include_juce_audio_basics.mm */ /* include_juce_audio_basics.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_audio_basics.mm; path = ../../JuceLibraryCode/include_juce_audio_basics.mm; sourceTree = SOURCE_ROOT; }; 4CA19EC18C2BC536B3636842 /* include_juce_dsp.mm */ /* include_juce_dsp.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_dsp.mm; path = ../../JuceLibraryCode/include_juce_dsp.mm; sourceTree = SOURCE_ROOT; }; 583EA0E5C4B75A629AEF1157 /* include_juce_gui_basics.mm */ /* include_juce_gui_basics.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_gui_basics.mm; path = ../../JuceLibraryCode/include_juce_gui_basics.mm; sourceTree = SOURCE_ROOT; }; @@ -183,6 +186,7 @@ 0E5DB2C17DAC6067A0DAC84E, 583EA0E5C4B75A629AEF1157, 4195CB317C364D778AE2ADB1, + 46D161431FC09F290F176D30, 0EFA505235D959565503D537, 1CA82C74AEC08421812BDCAC, A59D9064C3A2D7EC3DC45420, @@ -254,6 +258,7 @@ 1DC921E6494548F5E73E1056, DD849A04E38279B842EDE213, 2A163F48282EEE95B8A8BA7A, + 02D7ADAB1962C77DC0BDCC0E, 8EC828FBFEC92A64A135467C, CC27F53A76BFB2675D2683A1, 8EBA9CF0874619A8FA0B4E74, @@ -344,6 +349,7 @@ 69EB54A3097C15333ECB957A, D43289CF624A7B068237C192, AF1FE82A4A20DCB8944B35C7, + 8931A330E8D2263E787BDBA6, B407D123F08A9A8C12624ABA, 1D06F1A254F84A7AE3E90DF2, 7164274FE42C7EC423455E05, @@ -433,6 +439,7 @@ "JUCE_MODULE_AVAILABLE_juce_graphics=1", "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_javascript=1", "JUCE_MODULE_AVAILABLE_juce_midi_ci=1", "JUCE_MODULE_AVAILABLE_juce_opengl=1", "JUCE_MODULE_AVAILABLE_juce_osc=1", @@ -564,6 +571,7 @@ "JUCE_MODULE_AVAILABLE_juce_graphics=1", "JUCE_MODULE_AVAILABLE_juce_gui_basics=1", "JUCE_MODULE_AVAILABLE_juce_gui_extra=1", + "JUCE_MODULE_AVAILABLE_juce_javascript=1", "JUCE_MODULE_AVAILABLE_juce_midi_ci=1", "JUCE_MODULE_AVAILABLE_juce_opengl=1", "JUCE_MODULE_AVAILABLE_juce_osc=1", diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj index d12540dfac..e5ff46061a 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_javascript=1;JUCE_MODULE_AVAILABLE_juce_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true NotUsing @@ -80,7 +80,7 @@ ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_javascript=1;JUCE_MODULE_AVAILABLE_juce_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\UnitTestRunner.exe @@ -108,7 +108,7 @@ Full ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_javascript=1;JUCE_MODULE_AVAILABLE_juce_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDLL true NotUsing @@ -124,7 +124,7 @@ ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_javascript=1;JUCE_MODULE_AVAILABLE_juce_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\UnitTestRunner.exe @@ -1202,16 +1202,13 @@ true - + true - + true - - true - - + true @@ -2930,6 +2927,12 @@ true + + true + + + true + true @@ -3080,6 +3083,7 @@ /bigobj %(AdditionalOptions) + @@ -3592,21 +3596,9 @@ - - - - - - - - - - - - - - - + + + @@ -4438,6 +4430,19 @@ + + + + + + + + + + + + + @@ -4532,11 +4537,11 @@ - + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters index 21be4af8b3..19f2199863 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -383,26 +383,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -716,6 +698,30 @@ {A4D76113-9EDC-DA60-D89B-5BACF7F1C426} + + {22F0FDAA-91D0-AC0A-CE26-C58C6016D20F} + + + {995672BE-1FBF-B25B-3B3E-56C32E1ED76B} + + + {EE5C5CBE-AA3C-9E83-CE0E-49216D77C46D} + + + {60EC7489-2A44-44DC-A237-F0D6C8BDD7FE} + + + {67E80742-1E8B-7688-4217-3922EF2FBF2A} + + + {D2777265-A166-EDB8-938A-47D1EDAADA42} + + + {AF145034-7775-F013-E219-381BA369C108} + + + {08279B14-88F5-FDFE-A7A2-2F7485A424DB} + {EC0A49B5-F336-1F4D-6C32-40E19BE1426F} @@ -1861,17 +1867,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -3703,6 +3706,12 @@ JUCE Modules\juce_gui_extra + + JUCE Modules\juce_javascript\javascript + + + JUCE Modules\juce_javascript + JUCE Modules\juce_midi_ci\ci @@ -3889,6 +3898,9 @@ JUCE Library Code + + JUCE Library Code + JUCE Library Code @@ -5421,50 +5433,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -7959,6 +7935,45 @@ JUCE Modules\juce_gui_extra + + JUCE Modules\juce_javascript\choc\containers + + + JUCE Modules\juce_javascript\choc\javascript + + + JUCE Modules\juce_javascript\choc\javascript + + + JUCE Modules\juce_javascript\choc\math + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\javascript + + + JUCE Modules\juce_javascript + JUCE Modules\juce_midi_ci\ci @@ -8237,9 +8252,6 @@ JUCE Modules\juce_audio_processors\format_types\VST3_SDK - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java @@ -8252,6 +8264,9 @@ JUCE Modules\juce_graphics\unicode\sheenbidi + + JUCE Modules\juce_javascript\choc + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj index 0ff48cff0b..79df62405e 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj @@ -64,7 +64,7 @@ Disabled ProgramDatabase ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_javascript=1;JUCE_MODULE_AVAILABLE_juce_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true NotUsing @@ -80,7 +80,7 @@ ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_javascript=1;JUCE_MODULE_AVAILABLE_juce_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\UnitTestRunner.exe @@ -108,7 +108,7 @@ Full ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_javascript=1;JUCE_MODULE_AVAILABLE_juce_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDLL true NotUsing @@ -124,7 +124,7 @@ ..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lilv;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sratom;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord\src;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\sord;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\serd;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK\lv2;..\..\..\..\modules\juce_audio_processors\format_types\LV2_SDK;..\..\..\..\modules\juce_audio_processors\format_types\VST3_SDK;..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCE_PROJUCER_VERSION=0x80003;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_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_javascript=1;JUCE_MODULE_AVAILABLE_juce_midi_ci=1;JUCE_MODULE_AVAILABLE_juce_opengl=1;JUCE_MODULE_AVAILABLE_juce_osc=1;JUCE_MODULE_AVAILABLE_juce_product_unlocking=1;JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1;JUCE_PLUGINHOST_VST3=1;JUCE_PLUGINHOST_LV2=1;JUCE_STRICT_REFCOUNTEDPOINTER=1;JUCE_STANDALONE_APPLICATION=1;JUCE_UNIT_TESTS=1;JUCER_VS2022_78A503E=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_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\UnitTestRunner.exe @@ -1202,16 +1202,13 @@ true - + true - + true - - true - - + true @@ -2930,6 +2927,12 @@ true + + true + + + true + true @@ -3080,6 +3083,7 @@ /bigobj %(AdditionalOptions) + @@ -3592,21 +3596,9 @@ - - - - - - - - - - - - - - - + + + @@ -4438,6 +4430,19 @@ + + + + + + + + + + + + + @@ -4532,11 +4537,11 @@ - + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters index 45441cd12f..5e57e1c11e 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -383,26 +383,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -716,6 +698,30 @@ {A4D76113-9EDC-DA60-D89B-5BACF7F1C426} + + {22F0FDAA-91D0-AC0A-CE26-C58C6016D20F} + + + {995672BE-1FBF-B25B-3B3E-56C32E1ED76B} + + + {EE5C5CBE-AA3C-9E83-CE0E-49216D77C46D} + + + {60EC7489-2A44-44DC-A237-F0D6C8BDD7FE} + + + {67E80742-1E8B-7688-4217-3922EF2FBF2A} + + + {D2777265-A166-EDB8-938A-47D1EDAADA42} + + + {AF145034-7775-F013-E219-381BA369C108} + + + {08279B14-88F5-FDFE-A7A2-2F7485A424DB} + {EC0A49B5-F336-1F4D-6C32-40E19BE1426F} @@ -1861,17 +1867,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -3703,6 +3706,12 @@ JUCE Modules\juce_gui_extra + + JUCE Modules\juce_javascript\javascript + + + JUCE Modules\juce_javascript + JUCE Modules\juce_midi_ci\ci @@ -3889,6 +3898,9 @@ JUCE Library Code + + JUCE Library Code + JUCE Library Code @@ -5421,50 +5433,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -7959,6 +7935,45 @@ JUCE Modules\juce_gui_extra + + JUCE Modules\juce_javascript\choc\containers + + + JUCE Modules\juce_javascript\choc\javascript + + + JUCE Modules\juce_javascript\choc\javascript + + + JUCE Modules\juce_javascript\choc\math + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\platform + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\choc\text + + + JUCE Modules\juce_javascript\javascript + + + JUCE Modules\juce_javascript + JUCE Modules\juce_midi_ci\ci @@ -8237,9 +8252,6 @@ JUCE Modules\juce_audio_processors\format_types\VST3_SDK - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java @@ -8252,6 +8264,9 @@ JUCE Modules\juce_graphics\unicode\sheenbidi + + JUCE Modules\juce_javascript\choc + diff --git a/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h b/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h index 1ff2aae7db..8b310d8e38 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h +++ b/extras/UnitTestRunner/JuceLibraryCode/JuceHeader.h @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/extras/UnitTestRunner/JuceLibraryCode/include_juce_javascript.cpp b/extras/UnitTestRunner/JuceLibraryCode/include_juce_javascript.cpp new file mode 100644 index 0000000000..b2db8636f3 --- /dev/null +++ b/extras/UnitTestRunner/JuceLibraryCode/include_juce_javascript.cpp @@ -0,0 +1,8 @@ +/* + + IMPORTANT! This file is auto-generated each time you save your + project - if you alter its contents, your changes may be overwritten! + +*/ + +#include diff --git a/extras/UnitTestRunner/UnitTestRunner.jucer b/extras/UnitTestRunner/UnitTestRunner.jucer index e6bfd39279..5c49483d90 100644 --- a/extras/UnitTestRunner/UnitTestRunner.jucer +++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -1,9 +1,9 @@ + defines="JUCE_UNIT_TESTS=1" companyName="Raw Material Software Limited" + companyCopyright="Raw Material Software Limited" useAppConfig="0" + addUsingNamespaceToJuceHeader="1" jucerFormatVersion="1"> @@ -35,6 +35,7 @@ + @@ -61,6 +62,7 @@ + @@ -88,6 +90,7 @@ + @@ -115,6 +118,7 @@ + @@ -133,6 +137,7 @@ + diff --git a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj index 865654c7b3..2f48cf093e 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj +++ b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj @@ -1185,16 +1185,13 @@ true - + true - + true - - true - - + true @@ -3383,21 +3380,9 @@ - - - - - - - - - - - - - - - + + + @@ -4240,7 +4225,6 @@ - diff --git a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters index 67e8292dab..b6dcc7091b 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters +++ b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters @@ -368,26 +368,8 @@ {7868764A-6572-381A-906C-9C26792A4C29} - - {259B70B2-0C68-1990-EC86-42DAA564D388} - - - {19C3DF40-ABE4-49F7-CDD2-7A592EA01F73} - - - {20DE6E65-B828-EB00-17F7-541D368DFA9B} - - - {5CCB85C1-6052-8F8C-FCA7-E34D5514A0EE} - - - {375615B1-7B81-BB18-920B-926E88A78F9A} - - - {17CA846A-C621-9676-4FBD-8B04DBAA4488} - - - {03678508-A517-48BB-FB4A-485628C34E08} + + {ED602AA0-0A43-9721-5882-747B526C812E} {07D27C1D-3227-F527-356C-17DA11551A99} @@ -1792,17 +1774,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -5139,50 +5118,14 @@ JUCE Modules\juce_core\files - - JUCE Modules\juce_core\javascript\choc\containers + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript + + JUCE Modules\juce_core\json - - JUCE Modules\juce_core\javascript\choc\javascript - - - JUCE Modules\juce_core\javascript\choc\math - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\platform - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript\choc\text - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript - - - JUCE Modules\juce_core\javascript + + JUCE Modules\juce_core\json JUCE Modules\juce_core\logging @@ -7706,9 +7649,6 @@ JUCE Modules\juce_audio_processors\format_types\VST3_SDK - - JUCE Modules\juce_core\javascript\choc - JUCE Modules\juce_core\native\java diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 9119dc7933..27c987abe2 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -50,6 +50,7 @@ juce_add_modules( juce_graphics juce_gui_basics juce_gui_extra + juce_javascript juce_midi_ci juce_opengl juce_osc diff --git a/modules/juce_core/javascript/juce_JSON.cpp b/modules/juce_core/json/juce_JSON.cpp similarity index 100% rename from modules/juce_core/javascript/juce_JSON.cpp rename to modules/juce_core/json/juce_JSON.cpp diff --git a/modules/juce_core/javascript/juce_JSON.h b/modules/juce_core/json/juce_JSON.h similarity index 100% rename from modules/juce_core/javascript/juce_JSON.h rename to modules/juce_core/json/juce_JSON.h diff --git a/modules/juce_core/javascript/juce_JSONSerialisation.h b/modules/juce_core/json/juce_JSONSerialisation.h similarity index 100% rename from modules/juce_core/javascript/juce_JSONSerialisation.h rename to modules/juce_core/json/juce_JSONSerialisation.h diff --git a/modules/juce_core/javascript/juce_JSONSerialisation_test.cpp b/modules/juce_core/json/juce_JSONSerialisation_test.cpp similarity index 100% rename from modules/juce_core/javascript/juce_JSONSerialisation_test.cpp rename to modules/juce_core/json/juce_JSONSerialisation_test.cpp diff --git a/modules/juce_core/javascript/juce_JSONUtils.cpp b/modules/juce_core/json/juce_JSONUtils.cpp similarity index 100% rename from modules/juce_core/javascript/juce_JSONUtils.cpp rename to modules/juce_core/json/juce_JSONUtils.cpp diff --git a/modules/juce_core/javascript/juce_JSONUtils.h b/modules/juce_core/json/juce_JSONUtils.h similarity index 100% rename from modules/juce_core/javascript/juce_JSONUtils.h rename to modules/juce_core/json/juce_JSONUtils.h diff --git a/modules/juce_core/juce_core.cpp b/modules/juce_core/juce_core.cpp index d7f5e4911b..8382283f91 100644 --- a/modules/juce_core/juce_core.cpp +++ b/modules/juce_core/juce_core.cpp @@ -190,9 +190,8 @@ #include "time/juce_Time.cpp" #include "unit_tests/juce_UnitTest.cpp" #include "containers/juce_Variant.cpp" -#include "javascript/juce_JSON.cpp" -#include "javascript/juce_JSONUtils.cpp" -#include "javascript/juce_Javascript.cpp" +#include "json/juce_JSON.cpp" +#include "json/juce_JSONUtils.cpp" #include "containers/juce_DynamicObject.cpp" #include "xml/juce_XmlDocument.cpp" #include "xml/juce_XmlElement.cpp" @@ -294,7 +293,7 @@ #include "maths/juce_MathsFunctions_test.cpp" #include "misc/juce_EnumHelpers_test.cpp" #include "containers/juce_FixedSizeFunction_test.cpp" - #include "javascript/juce_JSONSerialisation_test.cpp" + #include "json/juce_JSONSerialisation_test.cpp" #include "memory/juce_SharedResourcePointer_test.cpp" #include "text/juce_CharPointer_UTF8_test.cpp" #include "text/juce_CharPointer_UTF16_test.cpp" diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h index 3a0a2c94b1..a3e669015a 100644 --- a/modules/juce_core/juce_core.h +++ b/modules/juce_core/juce_core.h @@ -302,7 +302,7 @@ JUCE_END_IGNORE_WARNINGS_MSVC #include "misc/juce_ConsoleApplication.h" #include "containers/juce_Variant.h" #include "containers/juce_NamedValueSet.h" -#include "javascript/juce_JSON.h" +#include "json/juce_JSON.h" #include "containers/juce_DynamicObject.h" #include "containers/juce_HashMap.h" #include "containers/juce_FixedSizeFunction.h" @@ -327,10 +327,9 @@ JUCE_END_IGNORE_WARNINGS_MSVC #include "files/juce_WildcardFileFilter.h" #include "streams/juce_FileInputSource.h" #include "logging/juce_FileLogger.h" -#include "javascript/juce_JSONUtils.h" +#include "json/juce_JSONUtils.h" #include "serialisation/juce_Serialisation.h" -#include "javascript/juce_JSONSerialisation.h" -#include "javascript/juce_Javascript.h" +#include "json/juce_JSONSerialisation.h" #include "maths/juce_BigInteger.h" #include "maths/juce_Expression.h" #include "maths/juce_Random.h" diff --git a/modules/juce_core/javascript/choc/LICENSE.md b/modules/juce_javascript/choc/LICENSE.md similarity index 100% rename from modules/juce_core/javascript/choc/LICENSE.md rename to modules/juce_javascript/choc/LICENSE.md diff --git a/modules/juce_core/javascript/choc/containers/choc_Value.h b/modules/juce_javascript/choc/containers/choc_Value.h similarity index 100% rename from modules/juce_core/javascript/choc/containers/choc_Value.h rename to modules/juce_javascript/choc/containers/choc_Value.h diff --git a/modules/juce_core/javascript/choc/javascript/choc_javascript.h b/modules/juce_javascript/choc/javascript/choc_javascript.h similarity index 100% rename from modules/juce_core/javascript/choc/javascript/choc_javascript.h rename to modules/juce_javascript/choc/javascript/choc_javascript.h diff --git a/modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h b/modules/juce_javascript/choc/javascript/choc_javascript_QuickJS.h similarity index 100% rename from modules/juce_core/javascript/choc/javascript/choc_javascript_QuickJS.h rename to modules/juce_javascript/choc/javascript/choc_javascript_QuickJS.h diff --git a/modules/juce_core/javascript/choc/math/choc_MathHelpers.h b/modules/juce_javascript/choc/math/choc_MathHelpers.h similarity index 100% rename from modules/juce_core/javascript/choc/math/choc_MathHelpers.h rename to modules/juce_javascript/choc/math/choc_MathHelpers.h diff --git a/modules/juce_core/javascript/choc/platform/choc_Assert.h b/modules/juce_javascript/choc/platform/choc_Assert.h similarity index 100% rename from modules/juce_core/javascript/choc/platform/choc_Assert.h rename to modules/juce_javascript/choc/platform/choc_Assert.h diff --git a/modules/juce_core/javascript/choc/platform/choc_DisableAllWarnings.h b/modules/juce_javascript/choc/platform/choc_DisableAllWarnings.h similarity index 100% rename from modules/juce_core/javascript/choc/platform/choc_DisableAllWarnings.h rename to modules/juce_javascript/choc/platform/choc_DisableAllWarnings.h diff --git a/modules/juce_core/javascript/choc/platform/choc_ReenableAllWarnings.h b/modules/juce_javascript/choc/platform/choc_ReenableAllWarnings.h similarity index 100% rename from modules/juce_core/javascript/choc/platform/choc_ReenableAllWarnings.h rename to modules/juce_javascript/choc/platform/choc_ReenableAllWarnings.h diff --git a/modules/juce_core/javascript/choc/text/choc_FloatToString.h b/modules/juce_javascript/choc/text/choc_FloatToString.h similarity index 100% rename from modules/juce_core/javascript/choc/text/choc_FloatToString.h rename to modules/juce_javascript/choc/text/choc_FloatToString.h diff --git a/modules/juce_core/javascript/choc/text/choc_JSON.h b/modules/juce_javascript/choc/text/choc_JSON.h similarity index 100% rename from modules/juce_core/javascript/choc/text/choc_JSON.h rename to modules/juce_javascript/choc/text/choc_JSON.h diff --git a/modules/juce_core/javascript/choc/text/choc_StringUtilities.h b/modules/juce_javascript/choc/text/choc_StringUtilities.h similarity index 100% rename from modules/juce_core/javascript/choc/text/choc_StringUtilities.h rename to modules/juce_javascript/choc/text/choc_StringUtilities.h diff --git a/modules/juce_core/javascript/choc/text/choc_UTF8.h b/modules/juce_javascript/choc/text/choc_UTF8.h similarity index 100% rename from modules/juce_core/javascript/choc/text/choc_UTF8.h rename to modules/juce_javascript/choc/text/choc_UTF8.h diff --git a/modules/juce_core/javascript/juce_Javascript.cpp b/modules/juce_javascript/javascript/juce_Javascript.cpp similarity index 96% rename from modules/juce_core/javascript/juce_Javascript.cpp rename to modules/juce_javascript/javascript/juce_Javascript.cpp index 23c004f2a3..9e97a4d3ca 100644 --- a/modules/juce_core/javascript/juce_Javascript.cpp +++ b/modules/juce_javascript/javascript/juce_Javascript.cpp @@ -32,10 +32,6 @@ ============================================================================== */ -#define choc juce::detail::choc -#include -#undef choc - namespace juce { diff --git a/modules/juce_core/javascript/juce_Javascript.h b/modules/juce_javascript/javascript/juce_Javascript.h similarity index 100% rename from modules/juce_core/javascript/juce_Javascript.h rename to modules/juce_javascript/javascript/juce_Javascript.h diff --git a/modules/juce_javascript/juce_javascript.cpp b/modules/juce_javascript/juce_javascript.cpp new file mode 100644 index 0000000000..47c1754cbc --- /dev/null +++ b/modules/juce_javascript/juce_javascript.cpp @@ -0,0 +1,50 @@ +/* + ============================================================================== + + This file is part of the JUCE framework. + Copyright (c) Raw Material Software Limited + + JUCE is an open source framework subject to commercial or open source + licensing. + + By downloading, installing, or using the JUCE framework, or combining the + JUCE framework with any other source code, object code, content or any other + copyrightable work, you agree to the terms of the JUCE End User Licence + Agreement, and all incorporated terms including the JUCE Privacy Policy and + the JUCE Website Terms of Service, as applicable, which will bind you. If you + do not agree to the terms of these agreements, we will not license the JUCE + framework to you, and you must discontinue the installation or download + process and cease use of the JUCE framework. + + JUCE End User Licence Agreement: https://juce.com/legal/juce-8-licence/ + JUCE Privacy Policy: https://juce.com/juce-privacy-policy + JUCE Website Terms of Service: https://juce.com/juce-website-terms-of-service/ + + Or: + + You may also use this code under the terms of the AGPLv3: + https://www.gnu.org/licenses/agpl-3.0.en.html + + THE JUCE FRAMEWORK IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL + WARRANTIES, WHETHER EXPRESSED OR IMPLIED, INCLUDING WARRANTY OF + MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED. + + ============================================================================== +*/ + +#ifdef JUCE_JAVASCRIPT_H_INCLUDED + /* When you add this cpp file to your project, you mustn't include it in a file where you've + already included any other headers - just put it inside a file on its own, possibly with your config + flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix + header files that the compiler may be using. + */ + #error "Incorrect use of JUCE cpp file" +#endif + +#include "juce_javascript.h" + +#define choc juce::detail::choc +#include +#undef choc + +#include "javascript/juce_Javascript.cpp" diff --git a/modules/juce_javascript/juce_javascript.h b/modules/juce_javascript/juce_javascript.h new file mode 100644 index 0000000000..067bdbfe93 --- /dev/null +++ b/modules/juce_javascript/juce_javascript.h @@ -0,0 +1,65 @@ +/* + ============================================================================== + + This file is part of the JUCE framework. + Copyright (c) Raw Material Software Limited + + JUCE is an open source framework subject to commercial or open source + licensing. + + By downloading, installing, or using the JUCE framework, or combining the + JUCE framework with any other source code, object code, content or any other + copyrightable work, you agree to the terms of the JUCE End User Licence + Agreement, and all incorporated terms including the JUCE Privacy Policy and + the JUCE Website Terms of Service, as applicable, which will bind you. If you + do not agree to the terms of these agreements, we will not license the JUCE + framework to you, and you must discontinue the installation or download + process and cease use of the JUCE framework. + + JUCE End User Licence Agreement: https://juce.com/legal/juce-8-licence/ + JUCE Privacy Policy: https://juce.com/juce-privacy-policy + JUCE Website Terms of Service: https://juce.com/juce-website-terms-of-service/ + + Or: + + You may also use this code under the terms of the AGPLv3: + https://www.gnu.org/licenses/agpl-3.0.en.html + + THE JUCE FRAMEWORK IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL + WARRANTIES, WHETHER EXPRESSED OR IMPLIED, INCLUDING WARRANTY OF + MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED. + + ============================================================================== +*/ + + +/******************************************************************************* + The block below describes the properties of this module, and is read by + the Projucer to automatically generate project code that uses it. + For details about the syntax and how to create or use a module, see the + JUCE Module Format.md file. + + + BEGIN_JUCE_MODULE_DECLARATION + + ID: juce_javascript + vendor: juce + version: 8.0.3 + name: JUCE Javascript interpreter + description: Javascript interpreter. + website: http://www.juce.com/juce + license: AGPLv3/Commercial + minimumCppStandard: 17 + + dependencies: juce_core + + END_JUCE_MODULE_DECLARATION + +*******************************************************************************/ + + +#pragma once +#define JUCE_JAVASCRIPT_H_INCLUDED + +#include +#include "javascript/juce_Javascript.h"