From 16938adfc00b3c56a7b08a9eb97160b68902bae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= 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 --- util/travis/clang-format-whitelist.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'util') diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt index 66e312cdb..f276af282 100644 --- a/util/travis/clang-format-whitelist.txt +++ b/util/travis/clang-format-whitelist.txt @@ -3,10 +3,6 @@ src/ban.cpp src/camera.cpp src/camera.h src/cavegen.cpp -src/cguittfont/CGUITTFont.cpp -src/cguittfont/CGUITTFont.h -src/cguittfont/irrUString.h -src/cguittfont/xCGUITTFont.h src/chat.cpp src/chat.h src/chat_interface.h @@ -113,6 +109,9 @@ src/inventory.cpp src/inventory.h src/inventorymanager.cpp src/inventorymanager.h +src/irrlicht_changes/CGUITTFont.cpp +src/irrlicht_changes/CGUITTFont.h +src/irrlicht_changes/irrUString.h src/irrlicht_changes/static_text.cpp src/irrlicht_changes/static_text.h src/irrlichttypes.h -- cgit v1.2.3