Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@
[submodule "examples_tests"]
path = examples_tests
url = git@github.com:Devsh-Graphics-Programming/Nabla-Examples-and-Tests.git
[submodule "3rdparty/msdfgen"]
path = 3rdparty/msdfgen
url = git@github.com:Chlumsky/msdfgen.git
branch = master
[submodule "3rdparty/dxc/dxc"]
path = 3rdparty/dxc/dxc
url = git@github.com:Devsh-Graphics-Programming/DirectXShaderCompiler.git
Expand Down
18 changes: 0 additions & 18 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,6 @@ add_subdirectory(simdjson simdjson EXCLUDE_FROM_ALL)
# freetype2
set(FT_WITH_HARFBUZZ OFF)
add_subdirectory(freetype2 freetype2 EXCLUDE_FROM_ALL)
add_library(Freetype::Freetype ALIAS freetype) # alias target for MSDFGEN not trying to find freetype system-wide but rather to use the logical target available in our build tree

# msdfgen
set(MSDFGEN_USE_VCPKG OFF)
set(MSDFGEN_USE_SKIA OFF)
set(MSDFGEN_CORE_ONLY OFF) # if turned on then MSDFGEN will be built without dependencies like freetype or skia
set(MSDFGEN_INSTALL OFF)
set(MSDFGEN_BUILD_STANDALONE OFF)
set(MSDFGEN_USE_CPP11 ON)
set(MSDFGEN_DISABLE_SVG ON)
set(MSDFGEN_DISABLE_PNG ON)
add_subdirectory(msdfgen msdfgen EXCLUDE_FROM_ALL)

if(MSDFGEN_CORE_ONLY)
message(FATAL_ERROR "Internal error, MSDF must be used with extension target as well!")
else()
set(NBL_MSDFGEN_TARGETS msdfgen-ext msdfgen-core)
endif()

set_property(TARGET simdjson PROPERTY CXX_STANDARD 17)

Expand Down
1 change: 0 additions & 1 deletion 3rdparty/msdfgen
Submodule msdfgen deleted from 755c45
2 changes: 1 addition & 1 deletion examples_tests
293 changes: 0 additions & 293 deletions include/nbl/ext/TextRendering/TextRendering.h

This file was deleted.

Loading
Loading