Skip to content

Commit 1f7d8ef

Browse files
kunitokikunitoki
committed
Merge branch 'main' into dev/improved_artboard
2 parents bf81960 + 624b164 commit 1f7d8ef

File tree

812 files changed

+87124
-116579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

812 files changed

+87124
-116579
lines changed

‎.github/workflows/build_linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828
INSTALL_DEPS: >-
2929
libasound2-dev libjack-jackd2-dev ladspa-sdk libcurl4-openssl-dev libfreetype6-dev
3030
libx11-dev libxcomposite-dev libxcursor-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev
31-
libxrandr-dev libxrender-dev libglu1-mesa-dev mesa-common-dev
31+
libxrandr-dev libxrender-dev libglu1-mesa-dev libegl1-mesa-dev mesa-common-dev
3232
3333
jobs:
3434
configure:

‎.github/workflows/clang_format.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
- "**/modules/**"
88
- "**/standalone/**"
99
- "**/tests/**"
10-
- ".clang-format"
1110
branches:
1211
- "**"
1312
- "!main"

‎cmake/yup_audio_plugin.cmake‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ function (yup_audio_plugin)
9494
# ==== Fetch clap SDK and build clap target
9595
if (YUP_ARG_PLUGIN_CREATE_CLAP)
9696
_yup_message (STATUS "Fetching CLAP SDK")
97-
FetchContent_Declare (
98-
clap
97+
_yup_fetchcontent_declare (clap
9998
GIT_REPOSITORY https://github.com/free-audio/clap.git
10099
GIT_TAG main)
101100
FetchContent_MakeAvailable (clap)
@@ -148,11 +147,9 @@ function (yup_audio_plugin)
148147
else()
149148
set (SMTG_RUN_VST_VALIDATOR OFF)
150149
endif()
151-
FetchContent_Declare (
152-
vst3sdk
150+
_yup_fetchcontent_declare (vst3sdk
153151
GIT_REPOSITORY https://github.com/steinbergmedia/vst3sdk.git
154-
GIT_TAG master
155-
GIT_SUBMODULES_RECURSE ON)
152+
GIT_TAG master)
156153
FetchContent_MakeAvailable (vst3sdk)
157154

158155
_yup_message (STATUS "Setting up VST3 plugin client")

‎cmake/yup_dependencies.cmake‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,36 @@
1919

2020
#==============================================================================
2121

22+
macro (_yup_fetchcontent_declare name GIT_REPOSITORY git_repository GIT_TAG git_tag)
23+
FetchContent_Declare(
24+
"${name}"
25+
GIT_REPOSITORY "${git_repository}"
26+
GIT_TAG "${git_tag}"
27+
GIT_SUBMODULES_RECURSE ON
28+
SOURCE_DIR "${CMAKE_BINARY_DIR}/externals/${name}")
29+
30+
#if (NOT DEFINED FETCHCONTENT_BASE_DIR)
31+
# set (FETCHCONTENT_BASE_DIR "${CMAKE_BINARY_DIR}/externals")
32+
#endif()
33+
#FetchContent_Declare(
34+
# "${name}"
35+
# DOWNLOAD_COMMAND
36+
# cd "${FETCHCONTENT_BASE_DIR}/${name}-src" &&
37+
# git init &&
38+
# git fetch --depth=1 --progress "${git_repository}" "${git_tag}" &&
39+
# git reset --hard FETCH_HEAD)
40+
endmacro()
41+
42+
#==============================================================================
43+
2244
function (_yup_fetch_sdl2)
2345
if (TARGET sdl2::sdl2)
2446
return()
2547
endif()
2648

27-
FetchContent_Declare (SDL2
49+
_yup_fetchcontent_declare (SDL2
2850
GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
29-
GIT_TAG release-2.30.10
30-
SOURCE_DIR ${CMAKE_BINARY_DIR}/externals/SDL2
31-
GIT_SHALLOW TRUE
32-
GIT_PROGRESS TRUE)
51+
GIT_TAG release-2.32.8)
3352

3453
set (BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
3554
set (SDL_SHARED OFF CACHE BOOL "" FORCE)
@@ -63,12 +82,9 @@ function (_yup_fetch_perfetto)
6382
return()
6483
endif()
6584

66-
FetchContent_Declare (Perfetto
85+
_yup_fetchcontent_declare (Perfetto
6786
GIT_REPOSITORY https://android.googlesource.com/platform/external/perfetto
68-
GIT_TAG v42.0
69-
SOURCE_DIR ${CMAKE_BINARY_DIR}/externals/Perfetto
70-
GIT_SHALLOW TRUE
71-
GIT_PROGRESS TRUE)
87+
GIT_TAG v49.0)
7288

7389
FetchContent_MakeAvailable (Perfetto)
7490

‎cmake/yup_modules.cmake‎

Lines changed: 60 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ endfunction()
303303

304304
#==============================================================================
305305

306-
function (yup_add_module module_path)
306+
function (yup_add_module module_path module_group)
307307
get_filename_component (module_path ${module_path} ABSOLUTE)
308308
get_filename_component (module_name ${module_path} NAME)
309309

@@ -321,14 +321,14 @@ function (yup_add_module module_path)
321321

322322
# ==== Add module as library
323323
add_library (${module_name} INTERFACE)
324-
set_target_properties (${module_name} PROPERTIES FOLDER "Modules")
324+
set_target_properties (${module_name} PROPERTIES FOLDER "${module_group}")
325325

326326
# ==== Parse module declaration string
327327
_yup_module_parse_config ("${module_header}" module_configs module_user_configs)
328328

329329
# ==== Assign Configurations Dynamically
330330
set (global_properties "dependencies|defines|options|searchpaths")
331-
set (platform_properties "^(.*)Deps$|^(.*)Defines$|^(.*)Libs$|^(.*)Frameworks$|^(.*)WeakFrameworks$|^(.*)Options$|^(.*)Packages$|^(.*)Searchpaths$")
331+
set (platform_properties "^(.*)Deps$|^(.*)Defines$|^(.*)Libs$|^(.*)Frameworks$|^(.*)WeakFrameworks$|^(.*)Options$|^(.*)Packages$|^(.*)Searchpaths$|^(.*)CppStandard$")
332332

333333
set (parsed_config "")
334334
foreach (module_config ${module_configs})
@@ -356,6 +356,10 @@ function (yup_add_module module_path)
356356

357357
# ==== Setup Platform-Specific Configurations
358358
if (YUP_PLATFORM_IOS)
359+
if (module_appleCppStandard)
360+
set (module_cpp_standard "${module_appleCppStandard}")
361+
endif()
362+
359363
if (PLATFORM MATCHES "^(SIMULATOR.*)$")
360364
list (APPEND module_dependencies ${module_iosSimDeps})
361365
list (APPEND module_defines ${module_iosSimDefines})
@@ -365,6 +369,9 @@ function (yup_add_module module_path)
365369
list (APPEND module_searchpaths ${module_iosSimSearchpaths})
366370
_yup_module_prepare_frameworks ("${module_iosSimFrameworks}" "${module_iosSimWeakFrameworks}" module_iosSimframeworks)
367371
list (APPEND module_frameworks ${module_iosSimframeworks})
372+
if (module_iosSimCppStandard)
373+
set (module_cpp_standard "${module_iosSimCppStandard}")
374+
endif()
368375
else()
369376
list (APPEND module_dependencies ${module_iosDeps})
370377
list (APPEND module_defines ${module_iosDefines})
@@ -374,6 +381,9 @@ function (yup_add_module module_path)
374381
list (APPEND module_searchpaths ${module_iosSearchpaths})
375382
_yup_module_prepare_frameworks ("${module_iosFrameworks}" "${module_iosWeakFrameworks}" module_iosFrameworks)
376383
list (APPEND module_frameworks ${module_iosFrameworks})
384+
if (module_iosCppStandard)
385+
set (module_cpp_standard "${module_iosCppStandard}")
386+
endif()
377387
endif()
378388

379389
list (APPEND module_dependencies ${module_appleDeps})
@@ -386,6 +396,9 @@ function (yup_add_module module_path)
386396
list (APPEND module_frameworks ${module_appleFrameworks})
387397

388398
elseif (YUP_PLATFORM_OSX)
399+
if (module_appleCppStandard)
400+
set (module_cpp_standard "${module_appleCppStandard}")
401+
endif()
389402
list (APPEND module_dependencies ${module_osxDeps})
390403
list (APPEND module_dependencies ${module_appleDeps})
391404
list (APPEND module_defines ${module_osxDefines})
@@ -402,8 +415,14 @@ function (yup_add_module module_path)
402415
list (APPEND module_frameworks ${module_osxFrameworks})
403416
_yup_module_prepare_frameworks ("${module_appleFrameworks}" "${module_appleWeakFrameworks}" module_appleFrameworks)
404417
list (APPEND module_frameworks ${module_appleFrameworks})
418+
if (module_osxCppStandard)
419+
set (module_cpp_standard "${module_osxCppStandard}")
420+
endif()
405421

406422
elseif (YUP_PLATFORM_LINUX)
423+
if (module_linuxCppStandard)
424+
set (module_cpp_standard "${module_linuxCppStandard}")
425+
endif()
407426
list (APPEND module_dependencies ${module_linuxDeps})
408427
list (APPEND module_defines ${module_linuxDefines})
409428
list (APPEND module_options ${module_linuxOptions})
@@ -416,6 +435,9 @@ function (yup_add_module module_path)
416435
endforeach()
417436

418437
elseif (YUP_PLATFORM_EMSCRIPTEN)
438+
if (module_wasmCppStandard)
439+
set (module_cpp_standard "${module_wasmCppStandard}")
440+
endif()
419441
list (APPEND module_dependencies ${module_wasmDeps})
420442
list (APPEND module_defines ${module_wasmDefines})
421443
list (APPEND module_options ${module_wasmOptions})
@@ -424,6 +446,9 @@ function (yup_add_module module_path)
424446
list (APPEND module_searchpaths ${module_wasmSearchpaths})
425447

426448
elseif (YUP_PLATFORM_ANDROID)
449+
if (module_androidCppStandard)
450+
set (module_cpp_standard "${module_androidCppStandard}")
451+
endif()
427452
list (APPEND module_dependencies ${module_androidDeps})
428453
list (APPEND module_defines ${module_androidDefines})
429454
list (APPEND module_options ${module_androidOptions})
@@ -432,15 +457,25 @@ function (yup_add_module module_path)
432457
list (APPEND module_searchpaths ${module_androidSearchpaths})
433458

434459
elseif (YUP_PLATFORM_MSFT)
460+
if (module_msftCppStandard)
461+
set (module_cpp_standard "${module_msftCppStandard}")
462+
endif()
435463
list (APPEND module_dependencies ${module_windowsDeps})
436464
list (APPEND module_defines ${module_windowsDefines})
437465
list (APPEND module_options ${module_windowsOptions})
438466
_yup_resolve_variable_paths ("${module_windowsSearchpaths}" module_windowsSearchpaths)
439467
list (APPEND module_searchpaths ${module_windowsSearchpaths})
468+
440469
if (MINGW)
441470
list (APPEND module_libs ${module_mingwLibs})
471+
if (module_mingwCppStandard)
472+
set (module_cpp_standard "${module_mingwCppStandard}")
473+
endif()
442474
else()
443475
list (APPEND module_libs ${module_windowsLibs})
476+
if (module_windowsCppStandard)
477+
set (module_cpp_standard "${module_windowsCppStandard}")
478+
endif()
444479
endif()
445480
endif()
446481

@@ -500,27 +535,30 @@ endfunction()
500535
#==============================================================================
501536

502537
function (_yup_add_default_modules modules_path)
503-
yup_add_module (${modules_path}/thirdparty/zlib)
504-
yup_add_module (${modules_path}/thirdparty/glad)
505-
yup_add_module (${modules_path}/thirdparty/harfbuzz)
506-
yup_add_module (${modules_path}/thirdparty/libpng)
507-
yup_add_module (${modules_path}/thirdparty/libwebp)
508-
yup_add_module (${modules_path}/thirdparty/sheenbidi)
509-
yup_add_module (${modules_path}/thirdparty/yoga_library)
510-
yup_add_module (${modules_path}/thirdparty/rive)
511-
yup_add_module (${modules_path}/thirdparty/rive_decoders)
512-
yup_add_module (${modules_path}/thirdparty/rive_renderer)
513-
yup_add_module (${modules_path}/thirdparty/oboe_library)
538+
set (thirdparty_group "Thirdparty")
539+
set (modules_group "Modules")
540+
541+
yup_add_module (${modules_path}/thirdparty/zlib ${thirdparty_group})
542+
yup_add_module (${modules_path}/thirdparty/glad ${thirdparty_group})
543+
yup_add_module (${modules_path}/thirdparty/harfbuzz ${thirdparty_group})
544+
yup_add_module (${modules_path}/thirdparty/libpng ${thirdparty_group})
545+
yup_add_module (${modules_path}/thirdparty/libwebp ${thirdparty_group})
546+
yup_add_module (${modules_path}/thirdparty/sheenbidi ${thirdparty_group})
547+
yup_add_module (${modules_path}/thirdparty/yoga_library ${thirdparty_group})
548+
yup_add_module (${modules_path}/thirdparty/rive ${thirdparty_group})
549+
yup_add_module (${modules_path}/thirdparty/rive_decoders ${thirdparty_group})
550+
yup_add_module (${modules_path}/thirdparty/rive_renderer ${thirdparty_group})
551+
yup_add_module (${modules_path}/thirdparty/oboe_library ${thirdparty_group})
514552

515553
# Original juce modules
516-
yup_add_module (${modules_path}/modules/juce_core)
517-
yup_add_module (${modules_path}/modules/juce_events)
518-
yup_add_module (${modules_path}/modules/juce_audio_basics)
519-
yup_add_module (${modules_path}/modules/juce_audio_devices)
554+
yup_add_module (${modules_path}/modules/juce_core ${modules_group})
555+
yup_add_module (${modules_path}/modules/juce_events ${modules_group})
556+
yup_add_module (${modules_path}/modules/juce_audio_basics ${modules_group})
557+
yup_add_module (${modules_path}/modules/juce_audio_devices ${modules_group})
520558

521559
# New yup modules
522-
yup_add_module (${modules_path}/modules/yup_audio_processors)
523-
yup_add_module (${modules_path}/modules/yup_audio_plugin_client)
524-
yup_add_module (${modules_path}/modules/yup_graphics)
525-
yup_add_module (${modules_path}/modules/yup_gui)
560+
yup_add_module (${modules_path}/modules/yup_audio_processors ${modules_group})
561+
yup_add_module (${modules_path}/modules/yup_audio_plugin_client ${modules_group})
562+
yup_add_module (${modules_path}/modules/yup_graphics ${modules_group})
563+
yup_add_module (${modules_path}/modules/yup_gui ${modules_group})
526564
endfunction()

‎examples/graphics/source/examples/VariableFonts.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class VariableFontsExample : public yup::Component
5555
if (! axisInfo)
5656
continue;
5757

58-
auto label = labels.add (std::make_unique<yup::Label>());
58+
auto label = labels.add (std::make_unique<yup::Label> (axisInfo->tagName + "Label"));
5959
label->setFont (font);
6060
addAndMakeVisible (label);
6161

@@ -155,7 +155,7 @@ class VariableFontsExample : public yup::Component
155155

156156
void addControl (yup::StringRef name, int index, float defaultValue, float minValue, float maxValue, float& valueToSet)
157157
{
158-
auto label = labels.add (std::make_unique<yup::Label>());
158+
auto label = labels.add (std::make_unique<yup::Label> (name + "Label"));
159159
label->setFont (font);
160160
addAndMakeVisible (label);
161161

0 commit comments

Comments
 (0)