diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-20 17:18:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 17:18:34 +0200 |
| commit | 16938adfc00b3c56a7b08a9eb97160b68902bae6 (patch) | |
| tree | 6e818b95c8557872e39f23c00f5a60e09f2f11bc /src/CMakeLists.txt | |
| parent | 318106223fc7351bd879980c17ee9c4bee65a272 (diff) | |
| download | minetest-16938adfc00b3c56a7b08a9eb97160b68902bae6.tar.gz minetest-16938adfc00b3c56a7b08a9eb97160b68902bae6.tar.bz2 minetest-16938adfc00b3c56a7b08a9eb97160b68902bae6.zip | |
Merge cguittfont lib in irrlicht change folder. (#6016)
* Merge cguittfont lib in irrlicht change folder.
This remove hack and static lib for FreeType
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ad5639a48..9e53b0e2c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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() |