Merge remote-tracking branch 'origin/master' into project_setup_refactor

# Conflicts:
#	CMakeLists.txt
This commit is contained in:
Georg Hagen
2024-08-14 22:47:19 +02:00
61 changed files with 2489 additions and 96 deletions

View File

@@ -30,6 +30,7 @@ option(USE_ASSIMP "If assimp should be used" ON)
option(TRACY_ENABLE "Enable Tracy Profiler" OFF)
option(ENABLE_TEST "Enable testing" ON)
option(ENABLE_EXAMPLE "Enable examples" ON)
option(ENABLE_MSDF "Enable msdf library" ON)
# -----------------------------------------------------------------
if (IOS)