Browse Source

Add RMLUI_NO_FONT_INTERFACE_DEFAULT macro checks to font providers

I'd rather not be compiling them at all though
Victor Luchits 6 years ago
parent
commit
1e0716c614

+ 5 - 0
Source/Core/BitmapFont/BitmapFontDefinitions.h

@@ -29,6 +29,8 @@
 #ifndef BITMAPFONTDEFINITIONS_H
 #ifndef BITMAPFONTDEFINITIONS_H
 #define BITMAPFONTDEFINITIONS_H
 #define BITMAPFONTDEFINITIONS_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include <RmlUi/Core/Header.h>
 #include <RmlUi/Core/Header.h>
 #include <RmlUi/Core/Types.h>
 #include <RmlUi/Core/Types.h>
 #include <RmlUi/Core/Dictionary.h>
 #include <RmlUi/Core/Dictionary.h>
@@ -145,4 +147,7 @@ namespace BitmapFont {
 }
 }
 }
 }
 }
 }
+
+#endif
+
 #endif
 #endif

+ 5 - 0
Source/Core/BitmapFont/FontFace.cpp

@@ -27,6 +27,9 @@
  */
  */
 
 
 #include "precompiled.h"
 #include "precompiled.h"
+
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "FontFace.h"
 #include "FontFace.h"
 #include "FontFaceHandle.h"
 #include "FontFaceHandle.h"
 #include <RmlUi/Core/Log.h>
 #include <RmlUi/Core/Log.h>
@@ -122,3 +125,5 @@ void BitmapFont::FontFace::ReleaseFace()
 
 
 }
 }
 }
 }
+
+#endif

+ 4 - 0
Source/Core/BitmapFont/FontFace.h

@@ -29,6 +29,8 @@
 #ifndef RMLUICOREBITMAPFONTFACE_H
 #ifndef RMLUICOREBITMAPFONTFACE_H
 #define RMLUICOREBITMAPFONTFACE_H
 #define RMLUICOREBITMAPFONTFACE_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "../FontFace.h"
 #include "../FontFace.h"
 #include "BitmapFontDefinitions.h"
 #include "BitmapFontDefinitions.h"
 
 
@@ -67,3 +69,5 @@ private:
 }
 }
 
 
 #endif
 #endif
+
+#endif

+ 6 - 0
Source/Core/BitmapFont/FontFaceHandle.cpp

@@ -27,6 +27,9 @@
  */
  */
 
 
 #include "precompiled.h"
 #include "precompiled.h"
+
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "FontFaceHandle.h"
 #include "FontFaceHandle.h"
 #include "FontFaceLayer.h"
 #include "FontFaceLayer.h"
 #include <algorithm>
 #include <algorithm>
@@ -177,3 +180,6 @@ Rml::Core::FontFaceLayer* BitmapFont::FontFaceHandle::CreateNewLayer()
 
 
 }
 }
 }
 }
+
+#endif
+

+ 4 - 0
Source/Core/BitmapFont/FontFaceHandle.h

@@ -29,6 +29,8 @@
 #ifndef RMLUICOREBITMAPFONTFONTFACEHANDLE_H
 #ifndef RMLUICOREBITMAPFONTFONTFACEHANDLE_H
 #define RMLUICOREBITMAPFONTFONTFACEHANDLE_H
 #define RMLUICOREBITMAPFONTFONTFACEHANDLE_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "../UnicodeRange.h"
 #include "../UnicodeRange.h"
 #include "../../../Include/RmlUi/Core/FontEffect.h"
 #include "../../../Include/RmlUi/Core/FontEffect.h"
 #include "../../../Include/RmlUi/Core/FontGlyph.h"
 #include "../../../Include/RmlUi/Core/FontGlyph.h"
@@ -92,3 +94,5 @@ private:
 }
 }
 
 
 #endif
 #endif
+
+#endif

+ 5 - 0
Source/Core/BitmapFont/FontFaceLayer.cpp

@@ -27,6 +27,9 @@
  */
  */
 
 
 #include "precompiled.h"
 #include "precompiled.h"
+
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "FontFaceLayer.h"
 #include "FontFaceLayer.h"
 #include "FontFaceHandle.h"
 #include "FontFaceHandle.h"
 
 
@@ -124,3 +127,5 @@ bool BitmapFont::FontFaceLayer::GenerateTexture(const byte*& texture_data, Vecto
 
 
 }
 }
 }
 }
+
+#endif

+ 4 - 0
Source/Core/BitmapFont/FontFaceLayer.h

@@ -29,6 +29,8 @@
 #ifndef RMLUICOREBITMAPFONTFACELAYER_H
 #ifndef RMLUICOREBITMAPFONTFACELAYER_H
 #define RMLUICOREBITMAPFONTFACELAYER_H
 #define RMLUICOREBITMAPFONTFACELAYER_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include <RmlUi/Core/Header.h>
 #include <RmlUi/Core/Header.h>
 #include <RmlUi/Core/FontGlyph.h>
 #include <RmlUi/Core/FontGlyph.h>
 #include <RmlUi/Core/Geometry.h>
 #include <RmlUi/Core/Geometry.h>
@@ -76,3 +78,5 @@ public:
 }
 }
 
 
 #endif
 #endif
+
+#endif

+ 5 - 0
Source/Core/BitmapFont/FontFamily.cpp

@@ -27,6 +27,9 @@
  */
  */
 
 
 #include "precompiled.h"
 #include "precompiled.h"
+
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "FontFamily.h"
 #include "FontFamily.h"
 #include "FontFace.h"
 #include "FontFace.h"
 
 
@@ -52,3 +55,5 @@ bool BitmapFont::FontFamily::AddFace( void *bm_face, Style::FontStyle style, Sty
 
 
 }
 }
 }
 }
+
+#endif

+ 4 - 0
Source/Core/BitmapFont/FontFamily.h

@@ -29,6 +29,8 @@
 #ifndef RMLUICOREBITMAPFONTFAMILY_H
 #ifndef RMLUICOREBITMAPFONTFAMILY_H
 #define RMLUICOREBITMAPFONTFAMILY_H
 #define RMLUICOREBITMAPFONTFAMILY_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "../FontFamily.h"
 #include "../FontFamily.h"
 #include "BitmapFontDefinitions.h"
 #include "BitmapFontDefinitions.h"
 
 
@@ -63,3 +65,5 @@ public:
 }
 }
 
 
 #endif
 #endif
+
+#endif

+ 6 - 0
Source/Core/BitmapFont/FontParser.cpp

@@ -27,6 +27,9 @@
  */
  */
 
 
 #include "precompiled.h"
 #include "precompiled.h"
+
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "FontParser.h"
 #include "FontParser.h"
 
 
 namespace Rml {
 namespace Rml {
@@ -113,3 +116,6 @@ void BitmapFont::FontParser::HandleData(const String& RMLUI_UNUSED_PARAMETER(dat
 
 
 }
 }
 }
 }
+
+#endif
+

+ 4 - 0
Source/Core/BitmapFont/FontParser.h

@@ -29,6 +29,8 @@
 #ifndef BITMAPFONTPARSER_H
 #ifndef BITMAPFONTPARSER_H
 #define BITMAPFONTPARSER_H
 #define BITMAPFONTPARSER_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include <RmlUi/Core/Header.h>
 #include <RmlUi/Core/Header.h>
 #include <RmlUi/Core/Types.h>
 #include <RmlUi/Core/Types.h>
 #include <RmlUi/Core/Dictionary.h>
 #include <RmlUi/Core/Dictionary.h>
@@ -66,3 +68,5 @@ private:
 }
 }
 }
 }
 #endif
 #endif
+
+#endif

+ 5 - 0
Source/Core/BitmapFont/FontProvider.cpp

@@ -27,6 +27,9 @@
  */
  */
 
 
 #include "precompiled.h"
 #include "precompiled.h"
+
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "FontProvider.h"
 #include "FontProvider.h"
 #include "FontFaceHandle.h"
 #include "FontFaceHandle.h"
 #include "../FontDatabaseDefault.h"
 #include "../FontDatabaseDefault.h"
@@ -204,3 +207,5 @@ void* BitmapFont::FontProvider::LoadFace(const byte* data, int data_length, cons
 
 
 }
 }
 }
 }
+
+#endif

+ 5 - 0
Source/Core/BitmapFont/FontProvider.h

@@ -29,6 +29,8 @@
 #ifndef RMLUICOREBITMAPFONTFONTPROVIDER_H
 #ifndef RMLUICOREBITMAPFONTFONTPROVIDER_H
 #define RMLUICOREBITMAPFONTFONTPROVIDER_H
 #define RMLUICOREBITMAPFONTFONTPROVIDER_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include <RmlUi/Core/StringUtilities.h>
 #include <RmlUi/Core/StringUtilities.h>
 #include "../FontProvider.h"
 #include "../FontProvider.h"
 
 
@@ -98,3 +100,6 @@ private:
 }
 }
 
 
 #endif
 #endif
+
+#endif
+

+ 4 - 0
Source/Core/BitmapFont/precompiled.h

@@ -29,6 +29,10 @@
 #ifndef RMLUICOREBITMAPFONTPRECOMPILED_H
 #ifndef RMLUICOREBITMAPFONTPRECOMPILED_H
 #define RMLUICOREBITMAPFONTPRECOMPILED_H
 #define RMLUICOREBITMAPFONTPRECOMPILED_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "../precompiled.h"
 #include "../precompiled.h"
 
 
 #endif
 #endif
+
+#endif

+ 5 - 0
Source/Core/FreeType/FontFace.cpp

@@ -27,6 +27,9 @@
  */
  */
 
 
 #include "precompiled.h"
 #include "precompiled.h"
+
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "FontFace.h"
 #include "FontFace.h"
 #include "FontFaceHandle.h"
 #include "FontFaceHandle.h"
 #include "../../../Include/RmlUi/Core/Log.h"
 #include "../../../Include/RmlUi/Core/Log.h"
@@ -133,3 +136,5 @@ void FontFace::ReleaseFace()
 }
 }
 }
 }
 }
 }
+
+#endif

+ 4 - 0
Source/Core/FreeType/FontFace.h

@@ -29,6 +29,8 @@
 #ifndef RMLUICOREFREETYPEFONTFACE_H
 #ifndef RMLUICOREFREETYPEFONTFACE_H
 #define RMLUICOREFREETYPEFONTFACE_H
 #define RMLUICOREFREETYPEFONTFACE_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "../FontFace.h"
 #include "../FontFace.h"
 #include <ft2build.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_FREETYPE_H
@@ -67,3 +69,5 @@ private:
 }
 }
 
 
 #endif
 #endif
+
+#endif

+ 6 - 0
Source/Core/FreeType/FontFaceHandle.cpp

@@ -27,6 +27,9 @@
  */
  */
 
 
 #include "precompiled.h"
 #include "precompiled.h"
+
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "FontFaceHandle.h"
 #include "FontFaceHandle.h"
 #include <algorithm>
 #include <algorithm>
 #include "../../../Include/RmlUi/Core.h"
 #include "../../../Include/RmlUi/Core.h"
@@ -257,3 +260,6 @@ int FontFaceHandle::GetKerning(word lhs, word rhs) const
 }
 }
 }
 }
 }
 }
+
+#endif
+

+ 4 - 0
Source/Core/FreeType/FontFaceHandle.h

@@ -29,6 +29,8 @@
 #ifndef RMLUICOREFREETYPEFONTFACEHANDLE_H
 #ifndef RMLUICOREFREETYPEFONTFACEHANDLE_H
 #define RMLUICOREFREETYPEFONTFACEHANDLE_H
 #define RMLUICOREFREETYPEFONTFACEHANDLE_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "../UnicodeRange.h"
 #include "../UnicodeRange.h"
 #include "../FontFaceHandleDefault.h"
 #include "../FontFaceHandleDefault.h"
 #include "../../../Include/RmlUi/Core/FontEffect.h"
 #include "../../../Include/RmlUi/Core/FontEffect.h"
@@ -77,3 +79,5 @@ private:
 }
 }
 
 
 #endif
 #endif
+
+#endif

+ 5 - 0
Source/Core/FreeType/FontFamily.cpp

@@ -27,6 +27,9 @@
  */
  */
 
 
 #include "precompiled.h"
 #include "precompiled.h"
+
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "FontFamily.h"
 #include "FontFamily.h"
 #include "FontFace.h"
 #include "FontFace.h"
 
 
@@ -54,3 +57,5 @@ bool FreeType::FontFamily::AddFace(void* ft_face, Style::FontStyle style, Style:
 
 
 }
 }
 }
 }
+
+#endif

+ 4 - 0
Source/Core/FreeType/FontFamily.h

@@ -29,6 +29,8 @@
 #ifndef RMLUICOREFREETYPEFONTFAMILY_H
 #ifndef RMLUICOREFREETYPEFONTFAMILY_H
 #define RMLUICOREFREETYPEFONTFAMILY_H
 #define RMLUICOREFREETYPEFONTFAMILY_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "../FontFamily.h"
 #include "../FontFamily.h"
 #include <ft2build.h>
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_FREETYPE_H
@@ -64,3 +66,5 @@ public:
 }
 }
 
 
 #endif
 #endif
+
+#endif

+ 5 - 0
Source/Core/FreeType/FontProvider.cpp

@@ -27,6 +27,9 @@
  */
  */
 
 
 #include "precompiled.h"
 #include "precompiled.h"
+
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "FontProvider.h"
 #include "FontProvider.h"
 #include "FontFaceHandle.h"
 #include "FontFaceHandle.h"
 #include "../FontDatabaseDefault.h"
 #include "../FontDatabaseDefault.h"
@@ -260,3 +263,5 @@ void* FontProvider::LoadFace(const byte* data, int data_length, const String& so
 }
 }
 }
 }
 }
 }
+
+#endif

+ 4 - 0
Source/Core/FreeType/FontProvider.h

@@ -29,6 +29,8 @@
 #ifndef RMLUICOREFREETYPEFONTPROVIDER_H
 #ifndef RMLUICOREFREETYPEFONTPROVIDER_H
 #define RMLUICOREFREETYPEFONTPROVIDER_H
 #define RMLUICOREFREETYPEFONTPROVIDER_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include <RmlUi/Core/StringUtilities.h>
 #include <RmlUi/Core/StringUtilities.h>
 #include "../FontProvider.h"
 #include "../FontProvider.h"
 
 
@@ -102,3 +104,5 @@ private:
 }
 }
 
 
 #endif
 #endif
+
+#endif

+ 4 - 0
Source/Core/FreeType/precompiled.h

@@ -29,6 +29,10 @@
 #ifndef RMLUICOREFREETYPEFONTPRECOMPILED_H
 #ifndef RMLUICOREFREETYPEFONTPRECOMPILED_H
 #define RMLUICOREFREETYPEFONTPRECOMPILED_H
 #define RMLUICOREFREETYPEFONTPRECOMPILED_H
 
 
+#ifndef RMLUI_NO_FONT_INTERFACE_DEFAULT
+
 #include "../precompiled.h"
 #include "../precompiled.h"
 
 
 #endif
 #endif
+
+#endif