mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-30 12:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update freetype module

Browse Source
This commit is contained in:
David Capello 2018-08-24 18:31:25 -03:00
parent 217ee45652
commit 0f18365d48
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
third_party/CMakeLists.txt vendored
View File

@ -56,21 +56,6 @@ if(NOT USE_SHARED_FREETYPE)
set(SKIP_INSTALL_ALL on)
set(WITH_BZip2 OFF CACHE BOOL "")
# If we don't do this, the compilation fails because it looks like
# ftgzip.c includes our zlib.h, but uses the zconf.h in the
# freetype2 library.
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/freetype2/src/gzip/zlib.h)
file(RENAME
${CMAKE_CURRENT_SOURCE_DIR}/freetype2/src/gzip/zlib.h
${CMAKE_CURRENT_SOURCE_DIR}/freetype2/src/gzip/zlib.h.included)
endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/freetype2/src/gzip/zconf.h)
file(RENAME
${CMAKE_CURRENT_SOURCE_DIR}/freetype2/src/gzip/zconf.h
${CMAKE_CURRENT_SOURCE_DIR}/freetype2/src/gzip/zconf.h.included)
endif()
add_subdirectory(freetype2)
if(NOT USE_SHARED_LIBPNG)

2
third_party/freetype2 vendored

@ -1 +1 @@
Subproject commit af89e445f8c44f133362e840553194a2144ab0d5
Subproject commit 77f0814a3162a945d6d6704f545827f883e451e5