working msdf atlas gen lib on windows

This commit is contained in:
ohyzha
2024-07-26 16:07:28 +03:00
parent 29311207db
commit 656d6f1371
3 changed files with 23 additions and 3 deletions

View File

@@ -10,6 +10,10 @@ if(NOT DEFINED MSDFGEN_REPO)
set(MSDFGEN_REPO https://github.com/Chlumsky/msdfgen.git) set(MSDFGEN_REPO https://github.com/Chlumsky/msdfgen.git)
endif () endif ()
if(NOT DEFINED MSDFGEN_ATRLAS_REPO)
set(MSDFGEN_ATRLAS_REPO https://github.com/Chlumsky/msdf-atlas-gen.git)
endif()
if(NOT DEFINED VCPKG_REPO) if(NOT DEFINED VCPKG_REPO)
set(VCPKG_REPO https://github.com/microsoft/vcpkg.git) set(VCPKG_REPO https://github.com/microsoft/vcpkg.git)
endif() endif()
@@ -62,8 +66,6 @@ if(WIN32)
set(FREETYPE_INCLUDE_DIRS "${VCPKG_SRC_DIR}/packages/freetype_${TRIPLET}/include" CACHE STRING "freetype include path on win") set(FREETYPE_INCLUDE_DIRS "${VCPKG_SRC_DIR}/packages/freetype_${TRIPLET}/include" CACHE STRING "freetype include path on win")
endif() endif()
#find_package(Freetype REQUIRED)
set(MSDFGEN_DISABLE_SVG TRUE CACHE INTERNAL "disable msdfgen svg") set(MSDFGEN_DISABLE_SVG TRUE CACHE INTERNAL "disable msdfgen svg")
set(MSDFGEN_DISABLE_PNG TRUE CACHE INTERNAL "disable msdfgen png") set(MSDFGEN_DISABLE_PNG TRUE CACHE INTERNAL "disable msdfgen png")
set(MSDFGEN_USE_SKIA OFF CACHE BOOL "use skia" FORCE) set(MSDFGEN_USE_SKIA OFF CACHE BOOL "use skia" FORCE)
@@ -76,3 +78,17 @@ FetchContent_Declare(
GIT_SHALLOW TRUE GIT_SHALLOW TRUE
) )
FetchContent_MakeAvailable(msdfgen) FetchContent_MakeAvailable(msdfgen)
set(MSDFGEN_DISABLE_SVG TRUE CACHE INTERNAL "disable msdfgen svg")
set(MSDFGEN_DISABLE_PNG TRUE CACHE INTERNAL "disable msdfgen png")
set(MSDF_ATLAS_USE_SKIA OFF CACHE BOOL "use skia" FORCE)
set(MSDF_ATLAS_MSDFGEN_EXTERNAL ON CACHE BOOL "do not build msdfgen submodule" FORCE)
FetchContent_Declare(
msdfgen_atlas
EXCLUDE_FROM_ALL
GIT_REPOSITORY ${MSDFGEN_ATRLAS_REPO}
GIT_TAG master
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(msdfgen_atlas)

View File

@@ -119,7 +119,7 @@ endif()
list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL)
target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal target_link_libraries(openVulkanoCpp PRIVATE magic_enum yaml-cpp fmt spdlog glm pugixml stb eigen utf8cpp imgui_internal
TracyClient stud-uuid ryml unordered_dense Boost::regex units msdfgen::msdfgen msdfgen::msdfgen-ext) TracyClient stud-uuid ryml unordered_dense Boost::regex units msdfgen::msdfgen msdfgen::msdfgen-ext msdf-atlas-gen)
if (NOT IOS) if (NOT IOS)
LinkCurl(openVulkanoCpp) LinkCurl(openVulkanoCpp)
endif() endif()

View File

@@ -17,6 +17,10 @@
#endif #endif
#include <stdexcept> #include <stdexcept>
#include "msdfgen.h"
#include "msdfgen-ext.h"
#include "msdf-atlas-gen/msdf-atlas-gen.h"
namespace OpenVulkano::Scene namespace OpenVulkano::Scene
{ {
Geometry::Geometry(const Geometry& other) Geometry::Geometry(const Geometry& other)