Remove xCGUITTFont.cpp and xCGUITTFont.h wrapper files

They were an attempt to avoid modifying CGUITTFont.cpp/CGUITTFont.h, an attempt which clearly failed.
minetest · Oct 4, 2014 · 278b83c · 278b83c
1 parent 173beee
commit 278b83c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 20 deletions.
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
@@ -248,7 +248,7 @@ LOCAL_SRC_FILES +=                                \
 
 #freetype2 support
 LOCAL_SRC_FILES +=                                \
-		jni/src/cguittfont/xCGUITTFont.cpp
+		jni/src/cguittfont/CGUITTFont.cpp
 
 # lua
 LOCAL_SRC_FILES +=                                \

diff --git a/src/cguittfont/CGUITTFont.cpp b/src/cguittfont/CGUITTFont.cpp
@@ -29,6 +29,8 @@
 */
 
 #include <irrlicht.h>
+#include <stddef.h>
+#include "irrUString.h"
 #include "CGUITTFont.h"
 
 namespace irr

diff --git a/src/cguittfont/CMakeLists.txt b/src/cguittfont/CMakeLists.txt
@@ -1,8 +1,4 @@
-# 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 xCGUITTFont.cpp)
+add_library(cguittfont CGUITTFont.cpp)
 
 if(FREETYPE_PKGCONFIG_FOUND)
 	set_target_properties(cguittfont

diff --git a/src/cguittfont/xCGUITTFont.cpp b/src/cguittfont/xCGUITTFont.cpp
diff --git a/src/cguittfont/xCGUITTFont.h b/src/cguittfont/xCGUITTFont.h
diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp
@@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gettext.h"
 
 #if USE_FREETYPE
-#include "xCGUITTFont.h"
+#include "CGUITTFont.h"
 #endif
 
 inline u32 clamp_u8(s32 value)

diff --git a/src/main.cpp b/src/main.cpp
@@ -70,7 +70,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "mods.h"
 #if USE_FREETYPE
-#include "xCGUITTFont.h"
+#include "CGUITTFont.h"
 #endif
 #include "util/string.h"
 #include "subgame.h"