diff --git a/specter/freetype2 b/specter/freetype2 index b5f9faacb..6f049e5c9 160000 --- a/specter/freetype2 +++ b/specter/freetype2 @@ -1 +1 @@ -Subproject commit b5f9faacba67b37d52fb788117e39f797f5b04e8 +Subproject commit 6f049e5c977aaae9d206c33cd26fd847eca34ea4 diff --git a/specter/include/specter/TextView.hpp b/specter/include/specter/TextView.hpp index 8aa040dc5..3d2b1288b 100644 --- a/specter/include/specter/TextView.hpp +++ b/specter/include/specter/TextView.hpp @@ -91,7 +91,9 @@ public: boo::ObjToken m_subpixel; boo::ObjToken m_vtxFmt; /* Not OpenGL */ +#if BOO_HAS_GL void init(boo::GLDataFactory::Context& ctx, FontCache* fcache); +#endif #if _WIN32 void init(boo::ID3DDataFactory::Context& ctx, FontCache* fcache); #endif diff --git a/specter/include/specter/View.hpp b/specter/include/specter/View.hpp index 9984c37a1..9f44fba0d 100644 --- a/specter/include/specter/View.hpp +++ b/specter/include/specter/View.hpp @@ -205,7 +205,9 @@ public: boo::ObjToken m_texShader; boo::ObjToken m_texVtxFmt; /* Not OpenGL */ +#if BOO_HAS_GL void init(boo::GLDataFactory::Context& ctx, const IThemeData& theme); +#endif #if _WIN32 void init(boo::ID3DDataFactory::Context& ctx, const IThemeData& theme); #endif diff --git a/specter/lib/TextView.cpp b/specter/lib/TextView.cpp index e9ae9c1ae..453489e7f 100644 --- a/specter/lib/TextView.cpp +++ b/specter/lib/TextView.cpp @@ -10,6 +10,7 @@ namespace specter { static logvisor::Module Log("specter::TextView"); +#if BOO_HAS_GL static const char* GLSLVS = "#version 330\n" BOO_GLSL_BINDING_HEAD @@ -85,6 +86,7 @@ void TextView::Resources::init(boo::GLDataFactory::Context& ctx, FontCache* fcac boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); } +#endif #if _WIN32 diff --git a/specter/lib/View.cpp b/specter/lib/View.cpp index 75ff52819..a825bcc82 100644 --- a/specter/lib/View.cpp +++ b/specter/lib/View.cpp @@ -6,6 +6,7 @@ namespace specter { static logvisor::Module Log("specter::View"); +#if BOO_HAS_GL static const char* GLSLSolidVS = "#version 330\n" BOO_GLSL_BINDING_HEAD @@ -89,6 +90,7 @@ void View::Resources::init(boo::GLDataFactory::Context& ctx, const IThemeData& t boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); } +#endif #if _WIN32 diff --git a/specter/lib/ViewResources.cpp b/specter/lib/ViewResources.cpp index ea45818d9..078742645 100644 --- a/specter/lib/ViewResources.cpp +++ b/specter/lib/ViewResources.cpp @@ -22,9 +22,11 @@ void ViewResources::init(boo::IGraphicsDataFactory* factory, FontCache* fcache, { switch (ctx.platform()) { +#if BOO_HAS_GL case boo::IGraphicsDataFactory::Platform::OpenGL: init(static_cast(ctx), *theme, fcache); break; +#endif #if _WIN32 case boo::IGraphicsDataFactory::Platform::D3D11: case boo::IGraphicsDataFactory::Platform::D3D12: