From 16938adfc00b3c56a7b08a9eb97160b68902bae6 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Tue, 20 Jun 2017 17:18:34 +0200 Subject: Merge cguittfont lib in irrlicht change folder. (#6016) * Merge cguittfont lib in irrlicht change folder. This remove hack and static lib for FreeType --- src/irrlicht_changes/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/irrlicht_changes/CMakeLists.txt') 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() -- cgit v1.2.3