diff --git a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt index 58164f49c7..dbc4c0f338 100644 --- a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt +++ b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt @@ -1,7 +1,7 @@ # Automatically generated CMakeLists, created by the Projucer # Don't edit this file! Your changes will be overwritten when you re-save the Projucer project! -cmake_minimum_required(VERSION 3.4.1) +cmake_minimum_required(VERSION 3.22) project(juce_jni_project) @@ -1758,17 +1758,21 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.h" "../../../../../modules/juce_gui_basics/native/juce_android_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_android_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_FileChooser.mm" + "../../../../../modules/juce_gui_basics/native/juce_ios_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm" "../../../../../modules/juce_gui_basics/native/juce_linux_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_linux_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h" "../../../../../modules/juce_gui_basics/native/juce_mac_FileChooser.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm" + "../../../../../modules/juce_gui_basics/native/juce_mac_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_PerScreenDisplayLinks.h" "../../../../../modules/juce_gui_basics/native/juce_mac_Windowing.mm" @@ -1776,6 +1780,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/native/juce_ScopedDPIAwarenessDisabler.h" "../../../../../modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_win32_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_ScopedThreadDPIAwarenessSetter.h" "../../../../../modules/juce_gui_basics/native/juce_win32_Windowing.cpp" "../../../../../modules/juce_gui_basics/positioning/juce_MarkerList.cpp" @@ -1845,10 +1850,14 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/windows/juce_DialogWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.cpp" "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.h" + "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.cpp" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_TooltipWindow.cpp" @@ -3741,17 +3750,21 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.h" "../../../../../modules/juce_gui_basics/native/juce_android_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_android_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_FileChooser.mm" + "../../../../../modules/juce_gui_basics/native/juce_ios_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm" "../../../../../modules/juce_gui_basics/native/juce_linux_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_linux_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h" "../../../../../modules/juce_gui_basics/native/juce_mac_FileChooser.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm" + "../../../../../modules/juce_gui_basics/native/juce_mac_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_PerScreenDisplayLinks.h" "../../../../../modules/juce_gui_basics/native/juce_mac_Windowing.mm" @@ -3759,6 +3772,7 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/native/juce_ScopedDPIAwarenessDisabler.h" "../../../../../modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_win32_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_ScopedThreadDPIAwarenessSetter.h" "../../../../../modules/juce_gui_basics/native/juce_win32_Windowing.cpp" "../../../../../modules/juce_gui_basics/positioning/juce_MarkerList.cpp" @@ -3828,10 +3842,14 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/windows/juce_DialogWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.cpp" "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.h" + "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.cpp" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_TooltipWindow.cpp" diff --git a/examples/DemoRunner/Builds/Android/app/build.gradle b/examples/DemoRunner/Builds/Android/app/build.gradle index a120c191f3..493b015fb6 100644 --- a/examples/DemoRunner/Builds/Android/app/build.gradle +++ b/examples/DemoRunner/Builds/Android/app/build.gradle @@ -2,10 +2,12 @@ apply plugin: 'com.android.application' android { compileSdkVersion 33 + ndkVersion "25.2.9519653" namespace "com.rmsl.jucedemorunner" externalNativeBuild { cmake { path "CMakeLists.txt" + version "3.22.1" } } signingConfigs { diff --git a/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h b/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h index 9fa1d5c3a0..26d0e3b966 100644 --- a/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h +++ b/examples/DemoRunner/Builds/Android/app/src/main/assets/DSPDemos_Common.h @@ -596,13 +596,17 @@ private: const auto u = fc.getURLResult(); if (! audioFileReader.loadURL (u)) - NativeMessageBox::showAsync (MessageBoxOptions() - .withIconType (MessageBoxIconType::WarningIcon) - .withTitle ("Error loading file") - .withMessage ("Unable to load audio file"), - nullptr); + { + auto options = MessageBoxOptions().withIconType (MessageBoxIconType::WarningIcon) + .withTitle ("Error loading file") + .withMessage ("Unable to load audio file") + .withButton ("OK"); + messageBox = NativeMessageBox::showScopedAsync (options, nullptr); + } else + { thumbnailComp.setCurrentURL (u); + } } fileChooser = nullptr; @@ -629,6 +633,7 @@ private: AudioFileReaderComponent& audioFileReader; std::unique_ptr fileChooser; + ScopedMessageBox messageBox; }; //============================================================================== diff --git a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj index 282330dbb5..9225fc3ad9 100644 --- a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj @@ -2339,6 +2339,9 @@ true + + true + true @@ -2348,6 +2351,9 @@ true + + true + true @@ -2357,6 +2363,9 @@ true + + true + true @@ -2459,9 +2468,18 @@ true + + true + + + true + true + + true + true @@ -3660,6 +3678,7 @@ + diff --git a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters index a903cacb0b..f010e3d56e 100644 --- a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters @@ -2986,6 +2986,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2995,6 +2998,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3004,6 +3010,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3016,6 +3025,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3028,6 +3040,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3130,9 +3145,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -6336,6 +6360,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj index 3eea056723..67b0e05218 100644 --- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj @@ -2339,6 +2339,9 @@ true + + true + true @@ -2348,6 +2351,9 @@ true + + true + true @@ -2357,6 +2363,9 @@ true + + true + true @@ -2459,9 +2468,18 @@ true + + true + + + true + true + + true + true @@ -3660,6 +3678,7 @@ + diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters index e51dab45fb..3f34230cf3 100644 --- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters @@ -2986,6 +2986,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2995,6 +2998,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3004,6 +3010,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3016,6 +3025,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3028,6 +3040,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3130,9 +3145,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -6336,6 +6360,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj index 8b546eed2f..fc7239d2d6 100644 --- a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj @@ -2339,6 +2339,9 @@ true + + true + true @@ -2348,6 +2351,9 @@ true + + true + true @@ -2357,6 +2363,9 @@ true + + true + true @@ -2459,9 +2468,18 @@ true + + true + + + true + true + + true + true @@ -3660,6 +3678,7 @@ + diff --git a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters index c9cf69611a..2d94bbf3cf 100644 --- a/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters @@ -2986,6 +2986,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2995,6 +2998,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3004,6 +3010,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3016,6 +3025,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3028,6 +3040,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -3130,9 +3145,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -6336,6 +6360,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index 6830b5e5eb..6fd1ab0a84 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -1,7 +1,7 @@ # Automatically generated CMakeLists, created by the Projucer # Don't edit this file! Your changes will be overwritten when you re-save the Projucer project! -cmake_minimum_required(VERSION 3.4.1) +cmake_minimum_required(VERSION 3.22) project(juce_jni_project) @@ -1535,17 +1535,21 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.h" "../../../../../modules/juce_gui_basics/native/juce_android_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_android_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_FileChooser.mm" + "../../../../../modules/juce_gui_basics/native/juce_ios_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm" "../../../../../modules/juce_gui_basics/native/juce_linux_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_linux_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h" "../../../../../modules/juce_gui_basics/native/juce_mac_FileChooser.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm" + "../../../../../modules/juce_gui_basics/native/juce_mac_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_PerScreenDisplayLinks.h" "../../../../../modules/juce_gui_basics/native/juce_mac_Windowing.mm" @@ -1553,6 +1557,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/native/juce_ScopedDPIAwarenessDisabler.h" "../../../../../modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_win32_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_ScopedThreadDPIAwarenessSetter.h" "../../../../../modules/juce_gui_basics/native/juce_win32_Windowing.cpp" "../../../../../modules/juce_gui_basics/positioning/juce_MarkerList.cpp" @@ -1622,10 +1627,14 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/windows/juce_DialogWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.cpp" "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.h" + "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.cpp" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_TooltipWindow.cpp" @@ -3216,17 +3225,21 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.h" "../../../../../modules/juce_gui_basics/native/juce_android_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_android_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_FileChooser.mm" + "../../../../../modules/juce_gui_basics/native/juce_ios_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm" "../../../../../modules/juce_gui_basics/native/juce_linux_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_linux_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h" "../../../../../modules/juce_gui_basics/native/juce_mac_FileChooser.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm" + "../../../../../modules/juce_gui_basics/native/juce_mac_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_PerScreenDisplayLinks.h" "../../../../../modules/juce_gui_basics/native/juce_mac_Windowing.mm" @@ -3234,6 +3247,7 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/native/juce_ScopedDPIAwarenessDisabler.h" "../../../../../modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_win32_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_ScopedThreadDPIAwarenessSetter.h" "../../../../../modules/juce_gui_basics/native/juce_win32_Windowing.cpp" "../../../../../modules/juce_gui_basics/positioning/juce_MarkerList.cpp" @@ -3303,10 +3317,14 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/windows/juce_DialogWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.cpp" "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.h" + "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.cpp" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_TooltipWindow.cpp" diff --git a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle index d3ce652079..7274fd3640 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle +++ b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle @@ -2,10 +2,12 @@ apply plugin: 'com.android.application' android { compileSdkVersion 33 + ndkVersion "25.2.9519653" namespace "com.juce.audioperformancetest" externalNativeBuild { cmake { path "CMakeLists.txt" + version "3.22.1" } } signingConfigs { diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj index e8fb5d4d0f..a0e4089561 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj @@ -2050,6 +2050,9 @@ true + + true + true @@ -2059,6 +2062,9 @@ true + + true + true @@ -2068,6 +2074,9 @@ true + + true + true @@ -2170,9 +2179,18 @@ true + + true + + + true + true + + true + true @@ -3159,6 +3177,7 @@ + diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters index f6eef51c9a..2112c2ec5a 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters @@ -2560,6 +2560,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2569,6 +2572,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2578,6 +2584,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2590,6 +2599,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2602,6 +2614,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2704,9 +2719,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -5451,6 +5475,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt index 297c823b1c..10e1f096d4 100644 --- a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt @@ -1,7 +1,7 @@ # Automatically generated CMakeLists, created by the Projucer # Don't edit this file! Your changes will be overwritten when you re-save the Projucer project! -cmake_minimum_required(VERSION 3.4.1) +cmake_minimum_required(VERSION 3.22) project(juce_jni_project) @@ -1667,17 +1667,21 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.h" "../../../../../modules/juce_gui_basics/native/juce_android_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_android_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_FileChooser.mm" + "../../../../../modules/juce_gui_basics/native/juce_ios_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm" "../../../../../modules/juce_gui_basics/native/juce_linux_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_linux_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h" "../../../../../modules/juce_gui_basics/native/juce_mac_FileChooser.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm" + "../../../../../modules/juce_gui_basics/native/juce_mac_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_PerScreenDisplayLinks.h" "../../../../../modules/juce_gui_basics/native/juce_mac_Windowing.mm" @@ -1685,6 +1689,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/native/juce_ScopedDPIAwarenessDisabler.h" "../../../../../modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_win32_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_ScopedThreadDPIAwarenessSetter.h" "../../../../../modules/juce_gui_basics/native/juce_win32_Windowing.cpp" "../../../../../modules/juce_gui_basics/positioning/juce_MarkerList.cpp" @@ -1754,10 +1759,14 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/windows/juce_DialogWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.cpp" "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.h" + "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.cpp" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_TooltipWindow.cpp" @@ -3503,17 +3512,21 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.h" "../../../../../modules/juce_gui_basics/native/juce_android_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_android_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_FileChooser.mm" + "../../../../../modules/juce_gui_basics/native/juce_ios_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm" "../../../../../modules/juce_gui_basics/native/juce_linux_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_linux_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h" "../../../../../modules/juce_gui_basics/native/juce_mac_FileChooser.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm" + "../../../../../modules/juce_gui_basics/native/juce_mac_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_PerScreenDisplayLinks.h" "../../../../../modules/juce_gui_basics/native/juce_mac_Windowing.mm" @@ -3521,6 +3534,7 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/native/juce_ScopedDPIAwarenessDisabler.h" "../../../../../modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_win32_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_ScopedThreadDPIAwarenessSetter.h" "../../../../../modules/juce_gui_basics/native/juce_win32_Windowing.cpp" "../../../../../modules/juce_gui_basics/positioning/juce_MarkerList.cpp" @@ -3590,10 +3604,14 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/windows/juce_DialogWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.cpp" "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.h" + "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.cpp" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_TooltipWindow.cpp" diff --git a/extras/AudioPluginHost/Builds/Android/app/build.gradle b/extras/AudioPluginHost/Builds/Android/app/build.gradle index 314b1168e8..103d5d1ef8 100644 --- a/extras/AudioPluginHost/Builds/Android/app/build.gradle +++ b/extras/AudioPluginHost/Builds/Android/app/build.gradle @@ -2,10 +2,12 @@ apply plugin: 'com.android.application' android { compileSdkVersion 33 + ndkVersion "25.2.9519653" namespace "com.juce.pluginhost" externalNativeBuild { cmake { path "CMakeLists.txt" + version "3.22.1" } } signingConfigs { diff --git a/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h b/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h index 9fa1d5c3a0..26d0e3b966 100644 --- a/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h +++ b/extras/AudioPluginHost/Builds/Android/app/src/main/assets/DSPDemos_Common.h @@ -596,13 +596,17 @@ private: const auto u = fc.getURLResult(); if (! audioFileReader.loadURL (u)) - NativeMessageBox::showAsync (MessageBoxOptions() - .withIconType (MessageBoxIconType::WarningIcon) - .withTitle ("Error loading file") - .withMessage ("Unable to load audio file"), - nullptr); + { + auto options = MessageBoxOptions().withIconType (MessageBoxIconType::WarningIcon) + .withTitle ("Error loading file") + .withMessage ("Unable to load audio file") + .withButton ("OK"); + messageBox = NativeMessageBox::showScopedAsync (options, nullptr); + } else + { thumbnailComp.setCurrentURL (u); + } } fileChooser = nullptr; @@ -629,6 +633,7 @@ private: AudioFileReaderComponent& audioFileReader; std::unique_ptr fileChooser; + ScopedMessageBox messageBox; }; //============================================================================== diff --git a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj index df9d4d3708..8814e5140b 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj @@ -2187,6 +2187,9 @@ true + + true + true @@ -2196,6 +2199,9 @@ true + + true + true @@ -2205,6 +2211,9 @@ true + + true + true @@ -2307,9 +2316,18 @@ true + + true + + + true + true + + true + true @@ -3396,6 +3414,7 @@ + diff --git a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters index ef8871efbd..258dfd0aab 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters @@ -2770,6 +2770,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2779,6 +2782,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2788,6 +2794,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2800,6 +2809,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2812,6 +2824,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2914,9 +2929,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -5892,6 +5916,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj index 17a9a1b318..5e1f9b37c8 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj @@ -2187,6 +2187,9 @@ true + + true + true @@ -2196,6 +2199,9 @@ true + + true + true @@ -2205,6 +2211,9 @@ true + + true + true @@ -2307,9 +2316,18 @@ true + + true + + + true + true + + true + true @@ -3396,6 +3414,7 @@ + diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters index 9e19f2420c..76f824c054 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters @@ -2770,6 +2770,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2779,6 +2782,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2788,6 +2794,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2800,6 +2809,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2812,6 +2824,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2914,9 +2929,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -5892,6 +5916,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj index e48bc3dbea..c1c68a7b2b 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj @@ -2187,6 +2187,9 @@ true + + true + true @@ -2196,6 +2199,9 @@ true + + true + true @@ -2205,6 +2211,9 @@ true + + true + true @@ -2307,9 +2316,18 @@ true + + true + + + true + true + + true + true @@ -3396,6 +3414,7 @@ + diff --git a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters index f03714a51a..f525b9226c 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters @@ -2770,6 +2770,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2779,6 +2782,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2788,6 +2794,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2800,6 +2809,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2812,6 +2824,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2914,9 +2929,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -5892,6 +5916,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index 69aaf46c9d..9c525cc70e 100644 --- a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -1,7 +1,7 @@ # Automatically generated CMakeLists, created by the Projucer # Don't edit this file! Your changes will be overwritten when you re-save the Projucer project! -cmake_minimum_required(VERSION 3.4.1) +cmake_minimum_required(VERSION 3.22) project(juce_jni_project) @@ -1554,17 +1554,21 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.h" "../../../../../modules/juce_gui_basics/native/juce_android_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_android_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_FileChooser.mm" + "../../../../../modules/juce_gui_basics/native/juce_ios_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm" "../../../../../modules/juce_gui_basics/native/juce_linux_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_linux_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h" "../../../../../modules/juce_gui_basics/native/juce_mac_FileChooser.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm" + "../../../../../modules/juce_gui_basics/native/juce_mac_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_PerScreenDisplayLinks.h" "../../../../../modules/juce_gui_basics/native/juce_mac_Windowing.mm" @@ -1572,6 +1576,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/native/juce_ScopedDPIAwarenessDisabler.h" "../../../../../modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_win32_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_ScopedThreadDPIAwarenessSetter.h" "../../../../../modules/juce_gui_basics/native/juce_win32_Windowing.cpp" "../../../../../modules/juce_gui_basics/positioning/juce_MarkerList.cpp" @@ -1641,10 +1646,14 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_gui_basics/windows/juce_DialogWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.cpp" "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.h" + "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.cpp" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_TooltipWindow.cpp" @@ -3315,17 +3324,21 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/native/x11/juce_linux_XWindowSystem.h" "../../../../../modules/juce_gui_basics/native/juce_android_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_android_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_ContentSharer.cpp" "../../../../../modules/juce_gui_basics/native/juce_ios_FileChooser.mm" + "../../../../../modules/juce_gui_basics/native/juce_ios_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_UIViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm" "../../../../../modules/juce_gui_basics/native/juce_linux_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_linux_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp" "../../../../../modules/juce_gui_basics/native/juce_mac_CGMetalLayerRenderer.h" "../../../../../modules/juce_gui_basics/native/juce_mac_FileChooser.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_MouseCursor.mm" + "../../../../../modules/juce_gui_basics/native/juce_mac_NativeMessageBox.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm" "../../../../../modules/juce_gui_basics/native/juce_mac_PerScreenDisplayLinks.h" "../../../../../modules/juce_gui_basics/native/juce_mac_Windowing.mm" @@ -3333,6 +3346,7 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/native/juce_ScopedDPIAwarenessDisabler.h" "../../../../../modules/juce_gui_basics/native/juce_win32_DragAndDrop.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_FileChooser.cpp" + "../../../../../modules/juce_gui_basics/native/juce_win32_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/native/juce_win32_ScopedThreadDPIAwarenessSetter.h" "../../../../../modules/juce_gui_basics/native/juce_win32_Windowing.cpp" "../../../../../modules/juce_gui_basics/positioning/juce_MarkerList.cpp" @@ -3402,10 +3416,14 @@ set_source_files_properties( "../../../../../modules/juce_gui_basics/windows/juce_DialogWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.cpp" "../../../../../modules/juce_gui_basics/windows/juce_MessageBoxOptions.h" + "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.cpp" "../../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ResizableWindow.h" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.cpp" + "../../../../../modules/juce_gui_basics/windows/juce_ScopedMessageBox.h" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp" "../../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.h" "../../../../../modules/juce_gui_basics/windows/juce_TooltipWindow.cpp" diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle b/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle index 58c8635537..6bbc057bcf 100644 --- a/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle +++ b/extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle @@ -2,10 +2,12 @@ apply plugin: 'com.android.application' android { compileSdkVersion 33 + ndkVersion "25.2.9519653" namespace "com.juce.networkgraphicsdemo" externalNativeBuild { cmake { path "CMakeLists.txt" + version "3.22.1" } } signingConfigs { diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj index 3efed10535..a880d852c3 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj @@ -2071,6 +2071,9 @@ true + + true + true @@ -2080,6 +2083,9 @@ true + + true + true @@ -2089,6 +2095,9 @@ true + + true + true @@ -2191,9 +2200,18 @@ true + + true + + + true + true + + true + true @@ -3257,6 +3275,7 @@ + diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters index 7e184d362d..9a85ed821d 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters @@ -2614,6 +2614,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2623,6 +2626,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2632,6 +2638,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2644,6 +2653,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2656,6 +2668,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2758,9 +2773,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -5613,6 +5637,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj index ac0637309c..6e59412877 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj @@ -1304,6 +1304,9 @@ true + + true + true @@ -1313,6 +1316,9 @@ true + + true + true @@ -1322,6 +1328,9 @@ true + + true + true @@ -1424,9 +1433,18 @@ true + + true + + + true + true + + true + true @@ -2144,6 +2162,7 @@ + diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters index 730a63f9b6..9e4bb0c69c 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters @@ -1633,6 +1633,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1642,6 +1645,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1651,6 +1657,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1663,6 +1672,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1675,6 +1687,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1777,9 +1792,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -3723,6 +3747,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj index 7dd8436525..aa320a2acc 100644 --- a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj @@ -1304,6 +1304,9 @@ true + + true + true @@ -1313,6 +1316,9 @@ true + + true + true @@ -1322,6 +1328,9 @@ true + + true + true @@ -1424,9 +1433,18 @@ true + + true + + + true + true + + true + true @@ -2144,6 +2162,7 @@ + diff --git a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters index 82904a1b34..d4fe2e995c 100644 --- a/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters @@ -1633,6 +1633,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1642,6 +1645,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1651,6 +1657,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1663,6 +1672,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1675,6 +1687,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1777,9 +1792,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -3723,6 +3747,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj index 59eea54a1f..ed8bbc15ad 100644 --- a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj @@ -1304,6 +1304,9 @@ true + + true + true @@ -1313,6 +1316,9 @@ true + + true + true @@ -1322,6 +1328,9 @@ true + + true + true @@ -1424,9 +1433,18 @@ true + + true + + + true + true + + true + true @@ -2144,6 +2162,7 @@ + diff --git a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters index 8d124814f1..7828b5f98f 100644 --- a/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters @@ -1633,6 +1633,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1642,6 +1645,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1651,6 +1657,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1663,6 +1672,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1675,6 +1687,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -1777,9 +1792,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -3723,6 +3747,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp index 76feaf88ac..e3be9cee99 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp +++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp @@ -8542,11 +8542,11 @@ static const unsigned char temp_binary_data_66[] = "\r\n" "#include \r\n" "\r\n" -"int main (int argc, const char** argv)\r\n" +"int main (int argc, const char* const* argv)\r\n" "{\r\n" " if (argc >= 3)\r\n" " if (auto* handle = dlopen (argv[1], RTLD_LAZY))\r\n" -" if (auto* function = reinterpret_cast (dlsym (handle, argv[2])))\r\n" +" if (auto* function = reinterpret_cast (dlsym (handle, argv[2])))\r\n" " return function (argc - 3, argv + 3);\r\n" "\r\n" " return 1;\r\n" @@ -8581,64 +8581,150 @@ static const unsigned char temp_binary_data_67[] = " ==============================================================================\r\n" "*/\r\n" "\r\n" +"#include \r\n" +"#include \r\n" +"\r\n" "#include \r\n" "#include \r\n" -"#include \r\n" "#include \r\n" +"#include \r\n" "#include \r\n" +"#include \r\n" "#include \r\n" "\r\n" -"namespace fs = std::filesystem;\r\n" +"//==============================================================================\r\n" +"struct FileHelpers\r\n" +"{\r\n" +" static std::string getCurrentWorkingDirectory()\r\n" +" {\r\n" +" std::vector buffer (1024);\r\n" +"\r\n" +" while (getcwd (buffer.data(), buffer.size() - 1) == nullptr && errno == ERANGE)\r\n" +" buffer.resize (buffer.size() * 2 / 3);\r\n" +"\r\n" +" return { buffer.data() };\r\n" +" }\r\n" +"\r\n" +" static bool endsWith (const std::string& s, char c)\r\n" +" {\r\n" +" if (s.length() == 0)\r\n" +" return false;\r\n" +"\r\n" +" return *s.rbegin() == c;\r\n" +" };\r\n" +"\r\n" +" static std::string appendedPaths (const std::string& first, const std::string& second)\r\n" +" {\r\n" +" return endsWith (first, '/') ? first + second : first + \"/\" + second;\r\n" +" }\r\n" +"\r\n" +" static bool exists (const std::string& path)\r\n" +" {\r\n" +" return ! path.empty() && access (path.c_str(), F_OK) == 0;\r\n" +" }\r\n" +"\r\n" +" static bool deleteFile (const std::string& path)\r\n" +" {\r\n" +" if (! exists (path))\r\n" +" return true;\r\n" +"\r\n" +" return remove (path.c_str()) == 0;\r\n" +" }\r\n" +"\r\n" +" static std::string getFilename (const std::string& path)\r\n" +" {\r\n" +" return { std::find_if (path.rbegin(), path.rend(), [] (auto c) { return c == '/'; }).base(),\r\n" +" path.end() };\r\n" +" }\r\n" +"\r\n" +" static bool isDirectory (const std::string& path)\r\n" +" {\r\n" +" struct stat64 info;\r\n" +"\r\n" +" return ! path.empty()\r\n" +" && stat64 (path.c_str(), &info) == 0\r\n" +" && ((info.st_mode & S_IFDIR) != 0);\r\n" +" }\r\n" +"\r\n" +" static std::string getParentDirectory (const std::string& path)\r\n" +" {\r\n" +" std::string p { path.begin(),\r\n" +" std::find_if (path.rbegin(),\r\n" +" path.rend(),\r\n" +" [] (auto c) { return c == '/'; }).base() };\r\n" +"\r\n" +" // Trim the ending slash, but only if not root\r\n" +" if (endsWith (p, '/') && p.length() > 1)\r\n" +" return { p.begin(), p.end() - 1 };\r\n" +"\r\n" +" return p;\r\n" +" }\r\n" +"\r\n" +" static bool createDirectory (const std::string& path)\r\n" +" {\r\n" +" if (isDirectory (path))\r\n" +" return true;\r\n" +"\r\n" +" const auto parentDir = getParentDirectory (path);\r\n" +"\r\n" +" if (path == parentDir)\r\n" +" return false;\r\n" +"\r\n" +" if (createDirectory (parentDir))\r\n" +" return mkdir (path.c_str(), 0777) != -1;\r\n" +"\r\n" +" return false;\r\n" +" }\r\n" +"};\r\n" "\r\n" "//==============================================================================\r\n" -"namespace StringHelpers\r\n" +"struct StringHelpers\r\n" "{\r\n" +" static bool isQuoteCharacter (char c)\r\n" +" {\r\n" +" return c == '\"' || c == '\\'';\r\n" +" }\r\n" "\r\n" -"static bool isQuoteCharacter (char c)\r\n" -"{\r\n" -" return c == '\"' || c == '\\'';\r\n" -"}\r\n" +" static std::string unquoted (const std::string& str)\r\n" +" {\r\n" +" if (str.length() == 0 || (! isQuoteCharacter (str[0])))\r\n" +" return str;\r\n" "\r\n" -"static std::string unquoted (const std::string& str)\r\n" -"{\r\n" -" if (str.length() == 0 || (! isQuoteCharacter (str[0])))\r\n" -" return str;\r\n" +" return str.substr (1, str.length() - (isQuoteCharacter (str[str.length() - 1]) ? 1 : 0));\r\n" +" }\r\n" "\r\n" -" return str.substr (1, str.length() - (isQuoteCharacter (str[str.length() - 1]) ? 1 : 0));\r\n" -"}\r\n" +" static void ltrim (std::string& s)\r\n" +" {\r\n" +" s.erase (s.begin(), std::find_if (s.begin(), s.end(), [] (int c) { return ! std::isspace (c); }));\r\n" +" }\r\n" "\r\n" -"static void ltrim (std::string& s)\r\n" -"{\r\n" -" s.erase (s.begin(), std::find_if (s.begin(), s.end(), [] (int c) { return ! std::isspace (c); }));\r\n" -"}\r\n" +" static void rtrim (std::string& s)\r\n" +" {\r\n" +" s.erase (std::find_if (s.rbegin(), s.rend(), [] (int c) { return ! std::isspace (c); }).base(), s.end());\r\n" +" }\r\n" "\r\n" -"static void rtrim (std::string& s)\r\n" -"{\r\n" -" s.erase (std::find_if (s.rbegin(), s.rend(), [] (int c) { return ! std::isspace (c); }).base(), s.end());\r\n" -"}\r\n" +" static std::string trimmed (const std::string& str)\r\n" +" {\r\n" +" auto result = str;\r\n" +" ltrim (result);\r\n" +" rtrim (result);\r\n" +" return result;\r\n" +" }\r\n" "\r\n" -"static std::string trimmed (const std::string& str)\r\n" -"{\r\n" -" auto result = str;\r\n" -" ltrim (result);\r\n" -" rtrim (result);\r\n" -" return result;\r\n" -"}\r\n" -"\r\n" -"static std::string replaced (const std::string& str, char charToReplace, char replaceWith)\r\n" -"{\r\n" -" auto result = str;\r\n" -" std::replace( result.begin(), result.end(), charToReplace, replaceWith);\r\n" -" return result;\r\n" -"}\r\n" -"\r\n" -"}\r\n" +" static std::string replaced (const std::string& str, char charToReplace, char replaceWith)\r\n" +" {\r\n" +" auto result = str;\r\n" +" std::replace (result.begin(), result.end(), charToReplace, replaceWith);\r\n" +" return result;\r\n" +" }\r\n" +"};\r\n" "\r\n" "//==============================================================================\r\n" -"static bool addFile (const fs::path& filePath,\r\n" +"static bool addFile (const std::string& filePath,\r\n" " const std::string& binaryNamespace,\r\n" " std::ofstream& headerStream,\r\n" -" std::ofstream& cppStream)\r\n" +" std::ofstream& cppStream,\r\n" +" bool verbose)\r\n" "{\r\n" " std::ifstream fileStream (filePath, std::ios::in | std::ios::binary | std::ios::ate);\r\n" "\r\n" @@ -8652,17 +8738,20 @@ static const unsigned char temp_binary_data_67[] = " fileStream.seekg (0);\r\n" " fileStream.read (buffer.data(), static_cast (buffer.size()));\r\n" "\r\n" -" const auto variableName = StringHelpers::replaced (StringHelpers::replaced (filePath.filename().string(),\r\n" +" const auto variableName = StringHelpers::replaced (StringHelpers::replaced (FileHelpers::getFilename (filePath),\r\n" " ' ',\r\n" " '_'),\r\n" " '.',\r\n" " '_');\r\n" "\r\n" -" std::cout << \"Adding \" << variableName << \": \"\r\n" -" << buffer.size() << \" bytes\" << std::endl;\r\n" +" if (verbose)\r\n" +" {\r\n" +" std::cout << \"Adding \" << variableName << \": \"\r\n" +" << buffer.size() << \" bytes\" << std::endl;\r\n" +" }\r\n" "\r\n" -" headerStream << \" extern const char* \" << variableName << \";\\r\\n\"\r\n" -" \" const int \" << variableName << \"Size = \"\r\n" +" headerStream << \" extern const char* \" << variableName << \";\" << std::endl\r\n" +" << \" const int \" << variableName << \"Size = \"\r\n" " << buffer.size() << \";\" << std::endl;\r\n" "\r\n" " cppStream << \"static const unsigned char temp0[] = {\";\r\n" @@ -8671,10 +8760,10 @@ static const unsigned char temp_binary_data_67[] = "\r\n" " for (size_t i = 0; i < buffer.size() - 1; ++i)\r\n" " {\r\n" -" if ((i % 40) != 39)\r\n" -" cppStream << (int) data[i] << \",\";\r\n" -" else\r\n" -" cppStream << (int) data[i] << \",\" << std::endl << \" \";\r\n" +" cppStream << (int) data[i] << \",\";\r\n" +"\r\n" +" if ((i % 40) == 39)\r\n" +" cppStream << std::endl << \" \";\r\n" " }\r\n" "\r\n" " cppStream << (int) data[buffer.size() - 1] << \",0,0};\" << std::endl;\r\n" @@ -8685,23 +8774,84 @@ static const unsigned char temp_binary_data_67[] = "}\r\n" "\r\n" "//==============================================================================\r\n" +"class Arguments\r\n" +"{\r\n" +"public:\r\n" +" enum class PositionalArguments\r\n" +" {\r\n" +" sourceFile = 0,\r\n" +" targetDirectory,\r\n" +" targetFilename,\r\n" +" binaryNamespace\r\n" +" };\r\n" +"\r\n" +" static std::optional create (int argc, char* argv[])\r\n" +" {\r\n" +" std::vector arguments;\r\n" +" bool verbose = false;\r\n" +"\r\n" +" for (int i = 1; i < argc; ++i)\r\n" +" {\r\n" +" std::string arg { argv[i] };\r\n" +"\r\n" +" if (arg == \"-v\" || arg == \"--verbose\")\r\n" +" verbose = true;\r\n" +" else\r\n" +" arguments.emplace_back (std::move (arg));\r\n" +" }\r\n" +"\r\n" +" if (arguments.size() != static_cast (PositionalArguments::binaryNamespace) + 1)\r\n" +" return std::nullopt;\r\n" +"\r\n" +" return Arguments { std::move (arguments), verbose };\r\n" +" }\r\n" +"\r\n" +" std::string get (PositionalArguments argument) const\r\n" +" {\r\n" +" return arguments[static_cast (argument)];\r\n" +" }\r\n" +"\r\n" +" bool isVerbose() const\r\n" +" {\r\n" +" return verbose;\r\n" +" }\r\n" +"\r\n" +"private:\r\n" +" Arguments (std::vector args, bool verboseIn)\r\n" +" : arguments (std::move (args)), verbose (verboseIn)\r\n" +" {\r\n" +" }\r\n" +"\r\n" +" std::vector arguments;\r\n" +" bool verbose = false;\r\n" +"};\r\n" +"\r\n" +"//==============================================================================\r\n" "int main (int argc, char* argv[])\r\n" "{\r\n" -" if (argc != 5)\r\n" +" const auto arguments = Arguments::create (argc, argv);\r\n" +"\r\n" +" if (! arguments.has_value())\r\n" " {\r\n" -" std::cout << \" Usage: SimpleBinaryBuilder sourcefile targetdirectory targetfilename namespace\\n\\n\"\r\n" -" \" SimpleBinaryBuilder will encode the provided source file into\\n\"\r\n" -" \" two files called (targetfilename).cpp and (targetfilename).h,\\n\"\r\n" -" \" which it will write into the specified target directory.\\n\"\r\n" -" \" The target directory will be automatically created if necessary. The binary\"\r\n" -" \" resource will be available in the given namespace.\\n\\n\";\r\n" +" std::cout << \" Usage: SimpleBinaryBuilder [-v | --verbose] sourcefile targetdirectory targetfilename namespace\"\r\n" +" << std::endl << std::endl\r\n" +" << \" SimpleBinaryBuilder will encode the provided source file into\" << std::endl\r\n" +" << \" two files called (targetfilename).cpp and (targetfilename).h,\" << std::endl\r\n" +" << \" which it will write into the specified target directory.\" << std::endl\r\n" +" << \" The target directory will be automatically created if necessary. The binary\" << std::endl\r\n" +" << \" resource will be available in the given namespace.\" << std::endl << std::endl;\r\n" "\r\n" " return 0;\r\n" " }\r\n" "\r\n" -" const auto sourceFile = fs::current_path() / StringHelpers::unquoted (std::string (argv[1]));\r\n" +" const auto currentWorkingDirectory = FileHelpers::getCurrentWorkingDirectory();\r\n" "\r\n" -" if (! fs::exists (sourceFile))\r\n" +" using ArgType = Arguments::PositionalArguments;\r\n" +"\r\n" +" const auto sourceFile = FileHelpers::appendedPaths (currentWorkingDirectory,\r\n" +" StringHelpers::unquoted (arguments->get (ArgType::sourceFile)));\r\n" +"\r\n" +" if (! FileHelpers::exists (sourceFile))\r\n" " {\r\n" " std::cerr << \"Source file doesn't exist: \"\r\n" " << sourceFile\r\n" @@ -8710,37 +8860,43 @@ static const unsigned char temp_binary_data_67[] = " return 1;\r\n" " }\r\n" "\r\n" -" const auto targetDirectory = fs::current_path() / StringHelpers::unquoted (std::string (argv[2]));\r\n" +" const auto targetDirectory = FileHelpers::appendedPaths (currentWorkingDirectory,\r\n" +" StringHelpers::unquoted (arguments->get (ArgType::targetDirectory)));\r\n" "\r\n" -" if (! fs::exists (targetDirectory))\r\n" +" if (! FileHelpers::exists (targetDirectory))\r\n" " {\r\n" -" try\r\n" +" if (! FileHelpers::createDirectory (targetDirectory))\r\n" " {\r\n" -" fs::create_directories (targetDirectory);\r\n" -" }\r\n" -" catch (const fs::filesystem_error&)\r\n" -" {\r\n" -" std::cerr << \"Failed to create target directory: \"\r\n" -" << targetDirectory\r\n" -" << std::endl << std::endl;\r\n" -"\r\n" +" std::cerr << \"Failed to create target directory: \" << targetDirectory << std::endl;\r\n" " return 1;\r\n" " }\r\n" " }\r\n" "\r\n" -" const auto className = StringHelpers::trimmed (argv[3]);\r\n" -" const auto binaryNamespace = StringHelpers::trimmed (argv[4]);\r\n" +" const auto className = StringHelpers::trimmed (arguments->get (ArgType::targetFilename));\r\n" +" const auto binaryNamespace = StringHelpers::trimmed (arguments->get (ArgType::binaryNamespace));\r\n" "\r\n" -" const auto headerFilePath = targetDirectory / (className + \".h\");\r\n" -" const auto cppFilePath = targetDirectory / (className + \".cpp\");\r\n" +" const auto headerFilePath = FileHelpers::appendedPaths (targetDirectory, className + \".h\");\r\n" +" const auto cppFilePath = FileHelpers::appendedPaths (targetDirectory, className + \".cpp\");\r\n" "\r\n" -" std::cout << \"Creating \" << headerFilePath\r\n" -" << \" and \" << cppFilePath\r\n" -" << \" from file \" << sourceFile\r\n" -" << \"...\" << std::endl << std::endl;\r\n" +" if (arguments->isVerbose())\r\n" +" {\r\n" +" std::cout << \"Creating \" << headerFilePath\r\n" +" << \" and \" << cppFilePath\r\n" +" << \" from file \" << sourceFile\r\n" +" << \"...\" << std::endl << std::endl;\r\n" +" }\r\n" "\r\n" -" fs::remove (headerFilePath);\r\n" -" fs::remove (cppFilePath);\r\n" +" if (! FileHelpers::deleteFile (headerFilePath))\r\n" +" {\r\n" +" std::cerr << \"Failed to remove old header file: \" << headerFilePath << std::endl;\r\n" +" return 1;\r\n" +" }\r\n" +"\r\n" +" if (! FileHelpers::deleteFile (cppFilePath))\r\n" +" {\r\n" +" std::cerr << \"Failed to remove old source file: \" << cppFilePath << std::endl;\r\n" +" return 1;\r\n" +" }\r\n" "\r\n" " std::ofstream header (headerFilePath);\r\n" "\r\n" @@ -8768,7 +8924,7 @@ static const unsigned char temp_binary_data_67[] = " cpp << \"/* (Auto-generated binary data file). */\" << std::endl << std::endl\r\n" " << \"#include \" << std::quoted (className + \".h\") << std::endl << std::endl;\r\n" "\r\n" -" if (! addFile (sourceFile, binaryNamespace, header, cpp))\r\n" +" if (! addFile (sourceFile, binaryNamespace, header, cpp, arguments->isVerbose()))\r\n" " return 1;\r\n" "\r\n" " header << \"}\" << std::endl << std::endl;\r\n" @@ -8856,8 +9012,8 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) case 0x763d39dc: numBytes = 1050; return colourscheme_dark_xml; case 0xe8b08520: numBytes = 1050; return colourscheme_light_xml; case 0x7c03d519: numBytes = 3005; return juce_runtime_arch_detection_cpp; - case 0x295b6f43: numBytes = 1200; return juce_LinuxSubprocessHelper_cpp; - case 0xef269d3a: numBytes = 7162; return juce_SimpleBinaryBuilder_cpp; + case 0x295b6f43: numBytes = 1212; return juce_LinuxSubprocessHelper_cpp; + case 0xef269d3a: numBytes = 12183; return juce_SimpleBinaryBuilder_cpp; default: break; } diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.h b/extras/Projucer/JuceLibraryCode/BinaryData.h index b7fd0edf58..c9bc3329fd 100644 --- a/extras/Projucer/JuceLibraryCode/BinaryData.h +++ b/extras/Projucer/JuceLibraryCode/BinaryData.h @@ -207,10 +207,10 @@ namespace BinaryData const int juce_runtime_arch_detection_cppSize = 3005; extern const char* juce_LinuxSubprocessHelper_cpp; - const int juce_LinuxSubprocessHelper_cppSize = 1200; + const int juce_LinuxSubprocessHelper_cppSize = 1212; extern const char* juce_SimpleBinaryBuilder_cpp; - const int juce_SimpleBinaryBuilder_cppSize = 7162; + const int juce_SimpleBinaryBuilder_cppSize = 12183; // Number of elements in the namedResourceList and originalFileNames arrays. const int namedResourceListSize = 68; diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj index 7e6a3c2d23..1fde377032 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj @@ -2195,6 +2195,9 @@ true + + true + true @@ -2204,6 +2207,9 @@ true + + true + true @@ -2213,6 +2219,9 @@ true + + true + true @@ -2315,9 +2324,18 @@ true + + true + + + true + true + + true + true @@ -3462,6 +3480,7 @@ + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters index 517e5b7fcf..13b7a8acfd 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -2794,6 +2794,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2803,6 +2806,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2812,6 +2818,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2824,6 +2833,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2836,6 +2848,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2938,9 +2953,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -5982,6 +6006,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj index cdbda5e7ac..e214a03745 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj @@ -2195,6 +2195,9 @@ true + + true + true @@ -2204,6 +2207,9 @@ true + + true + true @@ -2213,6 +2219,9 @@ true + + true + true @@ -2315,9 +2324,18 @@ true + + true + + + true + true + + true + true @@ -3462,6 +3480,7 @@ + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters index a203a010b7..1436726ae2 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -2794,6 +2794,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2803,6 +2806,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2812,6 +2818,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2824,6 +2833,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2836,6 +2848,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2938,9 +2953,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -5982,6 +6006,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj index 11d62f8c3e..092d6fcc41 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj @@ -2195,6 +2195,9 @@ true + + true + true @@ -2204,6 +2207,9 @@ true + + true + true @@ -2213,6 +2219,9 @@ true + + true + true @@ -2315,9 +2324,18 @@ true + + true + + + true + true + + true + true @@ -3462,6 +3480,7 @@ + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters index d01be6ad30..96b6db3302 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -2794,6 +2794,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2803,6 +2806,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2812,6 +2818,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2824,6 +2833,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2836,6 +2848,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2938,9 +2953,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -5982,6 +6006,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows diff --git a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_StaticLibrary.vcxproj b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_StaticLibrary.vcxproj index 885b80d122..fa596c7548 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_StaticLibrary.vcxproj +++ b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_StaticLibrary.vcxproj @@ -2070,6 +2070,9 @@ true + + true + true @@ -2079,6 +2082,9 @@ true + + true + true @@ -2088,6 +2094,9 @@ true + + true + true @@ -2190,9 +2199,18 @@ true + + true + + + true + true + + true + true @@ -3233,6 +3251,7 @@ + diff --git a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_StaticLibrary.vcxproj.filters b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_StaticLibrary.vcxproj.filters index 2f90234f67..916710fb1b 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_StaticLibrary.vcxproj.filters +++ b/extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_StaticLibrary.vcxproj.filters @@ -2611,6 +2611,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2620,6 +2623,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2629,6 +2635,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2641,6 +2650,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2653,6 +2665,9 @@ JUCE Modules\juce_gui_basics\native + + JUCE Modules\juce_gui_basics\native + JUCE Modules\juce_gui_basics\native @@ -2755,9 +2770,18 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows @@ -5580,6 +5604,9 @@ JUCE Modules\juce_gui_basics\windows + + JUCE Modules\juce_gui_basics\windows + JUCE Modules\juce_gui_basics\windows