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/cguittfont/CMakeLists.txt | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 src/cguittfont/CMakeLists.txt (limited to 'src/cguittfont/CMakeLists.txt') diff --git a/src/cguittfont/CMakeLists.txt b/src/cguittfont/CMakeLists.txt deleted file mode 100644 index 6cd35f310..000000000 --- a/src/cguittfont/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -# CGUITTFont authors, y u no include headers you use? -# Do not add CGUITTFont.cpp to the line below. -# xCGUITTFont.cpp is a wrapper file that includes -# additional required headers. -add_library(cguittfont STATIC xCGUITTFont.cpp) - -if(FREETYPE_PKGCONFIG_FOUND) - set_target_properties(cguittfont - PROPERTIES - COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}" - LINK_FLAGS "${FREETYPE_LDFLAGS_STR}" - ) - - include_directories( - ${IRRLICHT_INCLUDE_DIR} - ) -else(FREETYPE_PKGCONFIG_FOUND) - include_directories( - ${IRRLICHT_INCLUDE_DIR} - ${FREETYPE_INCLUDE_DIRS} - ) -endif(FREETYPE_PKGCONFIG_FOUND) - -target_link_libraries( - cguittfont - ${IRRLICHT_LIBRARY} - ${FREETYPE_LIBRARY} - ${ZLIB_LIBRARIES} # needed by freetype, repeated here for safety - ) - -- cgit v1.2.3