Skip to content

Commit 8ae8e2b

Browse files
committed
libs: make FreeType a submodule
1 parent e124fe0 commit 8ae8e2b

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
[submodule "libs/crunch"]
55
path = libs/crunch
66
url = https://github.com/DaemonEngine/crunch.git
7+
[submodule "libs/freetype"]
8+
path = libs/freetype
9+
url = https://github.com/DaemonEngine/freetype.git
710
[submodule "libs/googletest"]
811
path = libs/googletest
912
url = https://github.com/DaemonEngine/googletest.git

CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,8 @@ if (USE_BREAKPAD)
784784
endif()
785785
endif()
786786

787+
option(USE_SYSTEM_LIBS "Tries to use system libs where possible." ON)
788+
787789
if (BUILD_CLIENT)
788790
find_package(Ogg REQUIRED)
789791
include_directories(${OGG_INCLUDE_DIRS})
@@ -809,7 +811,12 @@ if (BUILD_CLIENT)
809811
include_directories(${PNG_INCLUDE_DIRS})
810812
set(LIBS_CLIENT ${LIBS_CLIENT} ${PNG_LIBRARIES})
811813

812-
find_package(Freetype REQUIRED)
814+
if (USE_SYSTEM_LIBS)
815+
find_package(Freetype REQUIRED)
816+
else()
817+
include(${DAEMON_DIR}/freetype.cmake)
818+
endif()
819+
813820
include_directories(${FREETYPE_INCLUDE_DIRS})
814821
set(LIBS_CLIENT ${LIBS_CLIENT} ${FREETYPE_LIBRARIES})
815822

freetype.cmake

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
set(FT_DISABLE_BROTLI ON CACHE STRING "Disable Brotli" FORCE)
2+
set(FT_DISABLE_BZIP2 ON CACHE STRING "Disable bzip2" FORCE)
3+
set(FT_DISABLE_HARFBUZZ ON CACHE STRING "Disable HarfBuzz" FORCE)
4+
set(FT_DISABLE_PNG ON CACHE STRING "Disable PNG" FORCE)
5+
6+
if (NACL)
7+
set(FREETYPE_INTERNAL_ZLIB ON)
8+
else()
9+
set(FREETYPE_INTERNAL_ZLIB OFF)
10+
endif()
11+
12+
set(FT_DISABLE_ZLIB ${FREETYPE_INTERNAL_ZLIB} CACHE STRING "Disable external zlib" FORCE)
13+
14+
set(FREETYPE_DIR ${DAEMON_DIR}/libs/freetype)
15+
set(FREETYPE_INCLUDE_DIRS ${FREETYPE_DIR}/include)
16+
17+
add_subdirectory(${FREETYPE_DIR})
18+
set(FREETYPE_LIBRARIES freetype)

libs/freetype

Submodule freetype added at 3f3e3de

0 commit comments

Comments
 (0)