Ui: workaround the dreaded std::to_string() issue on Android.

mosra · Jan 21, 2017 · 9fcd95b · 9fcd95b
1 parent c080e1b
commit 9fcd95b
Showing 1 changed file with 34 additions and 10 deletions.
diff --git a/src/Magnum/Ui/Style.cpp b/src/Magnum/Ui/Style.cpp
@@ -33,6 +33,10 @@
 
 #include "Magnum/Ui/Widget.h"
 
+#ifdef CORRADE_TARGET_ANDROID
+#include <sstream>
+#endif
+
 #ifdef MAGNUM_BUILD_STATIC
 static void importShaderResources() {
     CORRADE_RESOURCE_INITIALIZE(MagnumUi_RESOURCES)
@@ -786,10 +790,17 @@ BackgroundShader::BackgroundShader() {
         Version::GLES300,
         #endif
         Shader::Type::Fragment};
-    vert.addSource("#define BACKGROUND_COLOR_COUNT " + std::to_string(Implementation::BackgroundColorCount) + "\n")
-        .addSource(rs.get("BackgroundShader.vert"));
-    frag.addSource("#define BACKGROUND_COLOR_COUNT " + std::to_string(Implementation::BackgroundColorCount) + "\n")
-        .addSource(rs.get("BackgroundShader.frag"));
+    #ifndef CORRADE_TARGET_ANDROID
+    vert.addSource("#define BACKGROUND_COLOR_COUNT " + std::to_string(Implementation::BackgroundColorCount) + "\n");
+    frag.addSource("#define BACKGROUND_COLOR_COUNT " + std::to_string(Implementation::BackgroundColorCount) + "\n");
+    #else
+    std::ostringstream out;
+    out << Implementation::BackgroundColorCount;
+    vert.addSource("#define BACKGROUND_COLOR_COUNT " + out.str() + "\n");
+    frag.addSource("#define BACKGROUND_COLOR_COUNT " + out.str() + "\n");
+    #endif
+    vert.addSource(rs.get("BackgroundShader.vert"));
+    frag.addSource(rs.get("BackgroundShader.frag"));
 
     CORRADE_INTERNAL_ASSERT(Shader::compile({vert, frag}));
     attachShaders({vert, frag});
@@ -828,10 +839,17 @@ ForegroundShader::ForegroundShader() {
         Version::GLES300,
         #endif
         Shader::Type::Fragment};
-    vert.addSource("#define FOREGROUND_COLOR_COUNT " + std::to_string(Implementation::ForegroundColorCount) + "\n")
-        .addSource(rs.get("ForegroundShader.vert"));
-    frag.addSource("#define FOREGROUND_COLOR_COUNT " + std::to_string(Implementation::ForegroundColorCount) + "\n")
-        .addSource(rs.get("ForegroundShader.frag"));
+    #ifndef CORRADE_TARGET_ANDROID
+    vert.addSource("#define FOREGROUND_COLOR_COUNT " + std::to_string(Implementation::ForegroundColorCount) + "\n");
+    frag.addSource("#define FOREGROUND_COLOR_COUNT " + std::to_string(Implementation::ForegroundColorCount) + "\n");
+    #else
+    std::ostringstream out;
+    out << Implementation::ForegroundColorCount;
+    vert.addSource("#define FOREGROUND_COLOR_COUNT " + out.str() + "\n");
+    frag.addSource("#define FOREGROUND_COLOR_COUNT " + out.str() + "\n");
+    #endif
+    vert.addSource(rs.get("ForegroundShader.vert"));
+    frag.addSource(rs.get("ForegroundShader.frag"));
 
     CORRADE_INTERNAL_ASSERT(Shader::compile({vert, frag}));
     attachShaders({vert, frag});
@@ -871,8 +889,14 @@ TextShader::TextShader() {
         #endif
         Shader::Type::Fragment};
     vert.addSource(rs.get("TextShader.vert"));
-    frag.addSource("#define TEXT_COLOR_COUNT " + std::to_string(Implementation::TextColorCount) + "\n")
-        .addSource(rs.get("TextShader.frag"));
+    #ifndef CORRADE_TARGET_ANDROID
+    frag.addSource("#define TEXT_COLOR_COUNT " + std::to_string(Implementation::TextColorCount) + "\n");
+    #else
+    std::ostringstream out;
+    out << Implementation::TextColorCount;
+    frag.addSource("#define TEXT_COLOR_COUNT " + out.str() + "\n");
+    #endif
+    frag.addSource(rs.get("TextShader.frag"));
 
     CORRADE_INTERNAL_ASSERT(Shader::compile({vert, frag}));
     attachShaders({vert, frag});