Merge remote-tracking branch 'origin/master' into project_setup_refactor
# Conflicts: # CMakeLists.txt
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user