blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 07:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updating freetype and freetype-gl

Browse source
This commit is contained in:
Dan Paulat 2021-12-18 00:39:30 -06:00
parent 86a43fb761
commit 999d322985
3 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
include(${PROJECT_SOURCE_DIR}/external/cmake-conan/conan.cmake) include(${PROJECT_SOURCE_DIR}/external/cmake-conan/conan.cmake)
conan_cmake_configure(REQUIRES boost/1.77.0 conan_cmake_configure(REQUIRES boost/1.77.0
freetype/2.10.4 freetype/2.11.1
geographiclib/1.52 geographiclib/1.52
glew/2.2.0 glew/2.2.0
glm/0.9.9.8 glm/0.9.9.8

2
external/freetype-gl vendored

@ -1 +1 @@
Subproject commit 1cbe5518844db279174b24e6529135870c396744 Subproject commit 41193bc9200993215c3a22b107be60fa964c7422

22
external/freetype-gl.cmake vendored
View file

@ -14,6 +14,10 @@ set(freetype-gl_BUILD_HARFBUZZ OFF)
set(freetype-gl_BUILD_MAKEFONT ON) set(freetype-gl_BUILD_MAKEFONT ON)
set(freetype-gl_BUILD_TESTS OFF) set(freetype-gl_BUILD_TESTS OFF)
set(freetype-gl_BUILD_SHARED OFF) set(freetype-gl_BUILD_SHARED OFF)
set(freetype-gl_OFF_SCREEN OFF)
configure_file(freetype-gl/cmake/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/freetype-gl/config.h)
set(FREETYPE_GL_HDR freetype-gl/distance-field.h set(FREETYPE_GL_HDR freetype-gl/distance-field.h
freetype-gl/edtaa3func.h freetype-gl/edtaa3func.h
@ -31,7 +35,8 @@ set(FREETYPE_GL_HDR freetype-gl/distance-field.h
freetype-gl/vector.h freetype-gl/vector.h
freetype-gl/vertex-attribute.h freetype-gl/vertex-attribute.h
freetype-gl/vertex-buffer.h freetype-gl/vertex-buffer.h
freetype-gl/freetype-gl-errdef.h) freetype-gl/freetype-gl-errdef.h
${CMAKE_CURRENT_BINARY_DIR}/freetype-gl/config.h)
set(FREETYPE_GL_SRC freetype-gl/distance-field.c set(FREETYPE_GL_SRC freetype-gl/distance-field.c
freetype-gl/edtaa3func.c freetype-gl/edtaa3func.c
freetype-gl/font-manager.c freetype-gl/font-manager.c
@ -83,13 +88,26 @@ endif()
if(freetype-gl_USE_VAO) if(freetype-gl_USE_VAO)
target_compile_definitions(freetype-gl PRIVATE FREETYPE_GL_USE_VAO) target_compile_definitions(freetype-gl PRIVATE FREETYPE_GL_USE_VAO)
target_compile_definitions(makefont PRIVATE FREETYPE_GL_USE_VAO) target_compile_definitions(makefont PRIVATE FREETYPE_GL_USE_VAO)
endif(freetype-gl_USE_VAO) endif()
if(freetype-gl_USE_WITH_GLAD)
target_compile_definitions(freetype-gl PRIVATE GL_WITH_GLAD)
target_compile_definitions(makefont PRIVATE GL_WITH_GLAD)
endif()
if(freetype-gl_USE_WITH_GLEW)
target_compile_definitions(freetype-gl PRIVATE FREETYPE_GL_USE_GLEW)
target_compile_definitions(makefont PRIVATE FREETYPE_GL_USE_GLEW)
endif()
if(MSVC) if(MSVC)
target_compile_definitions(freetype-gl PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE) target_compile_definitions(freetype-gl PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
target_compile_definitions(makefont PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE) target_compile_definitions(makefont PRIVATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
endif(MSVC) endif(MSVC)
target_include_directories(freetype-gl PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl)
target_include_directories(makefont PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/freetype-gl)
set(FTGL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/freetype-gl PARENT_SCOPE) set(FTGL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/freetype-gl PARENT_SCOPE)
set_target_properties(doc PROPERTIES EXCLUDE_FROM_ALL True) set_target_properties(doc PROPERTIES EXCLUDE_FROM_ALL True)