1
0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-12 16:15:20 +02:00

Merge cguittfont lib in irrlicht change folder. (#6016)

* Merge cguittfont lib in irrlicht change folder.

This remove hack and static lib for FreeType
This commit is contained in:
Loïc Blot
2017-06-20 17:18:34 +02:00
committed by GitHub
parent 318106223f
commit 16938adfc0
12 changed files with 21 additions and 67 deletions

View File

@@ -151,8 +151,6 @@ if(ENABLE_FREETYPE)
if(FREETYPE_FOUND)
message(STATUS "Freetype enabled.")
set(USE_FREETYPE TRUE)
set(CGUITTFONT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cguittfont")
set(CGUITTFONT_LIBRARY cguittfont)
endif()
endif(ENABLE_FREETYPE)
@@ -560,7 +558,7 @@ include_directories(
if(USE_FREETYPE)
include_directories(${FREETYPE_INCLUDE_DIRS} ${CGUITTFONT_INCLUDE_DIR})
include_directories(${FREETYPE_INCLUDE_DIRS})
endif()
if(USE_CURL)
@@ -619,7 +617,6 @@ if(BUILD_CLIENT)
target_link_libraries(
${PROJECT_NAME}
${FREETYPE_LIBRARY}
${CGUITTFONT_LIBRARY}
)
endif()
if (USE_CURSES)
@@ -878,10 +875,3 @@ if (USE_GETTEXT)
add_custom_target(translations ALL COMMENT "mo update" DEPENDS ${MO_FILES})
endif()
# Subdirectories
if (BUILD_CLIENT AND USE_FREETYPE)
add_subdirectory(cguittfont)
endif()