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/irrlicht_changes/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/irrlicht_changes/CMakeLists.txt')
| -rw-r--r-- | src/irrlicht_changes/CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/irrlicht_changes/CMakeLists.txt b/src/irrlicht_changes/CMakeLists.txt index 3a265c99d..d2f66ab77 100644 --- a/src/irrlicht_changes/CMakeLists.txt +++ b/src/irrlicht_changes/CMakeLists.txt @@ -1,7 +1,16 @@ if (BUILD_CLIENT) set(client_irrlicht_changes_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/static_text.cpp - PARENT_SCOPE ) + + if (ENABLE_FREETYPE) + set(client_irrlicht_changes_SRCS ${client_irrlicht_changes_SRCS} + ${CMAKE_CURRENT_SOURCE_DIR}/CGUITTFont.cpp + ) + endif() + + # CMake require us to set a local scope and then parent scope + # Else the last set win in parent scope + set(client_irrlicht_changes_SRCS ${client_irrlicht_changes_SRCS} PARENT_SCOPE) endif() |