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/static_text.cpp | |
| 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/static_text.cpp')
| -rw-r--r-- | src/irrlicht_changes/static_text.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/irrlicht_changes/static_text.cpp b/src/irrlicht_changes/static_text.cpp index 50c6c6a68..455dbf437 100644 --- a/src/irrlicht_changes/static_text.cpp +++ b/src/irrlicht_changes/static_text.cpp @@ -7,18 +7,13 @@ #include "static_text.h" #ifdef _IRR_COMPILE_WITH_GUI_ -#include <vector> -#include <string> -#include <iostream> -#include <IGUISkin.h> -#include <IGUIEnvironment.h> #include <IGUIFont.h> #include <IVideoDriver.h> #include <rect.h> #include <SColor.h> #if USE_FREETYPE - #include "cguittfont/xCGUITTFont.h" + #include "CGUITTFont.h" #endif #ifndef _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX // newer Irrlicht versions no longer have this |