Working on OSX compilability

libraries/render-utils/src/MatrixStack.cpp

@@ -2,6 +2,5 @@
 
 QMatrix4x4 fromGlm(const glm::mat4 & m) {
   return QMatrix4x4(&m[0][0]).transposed();
-  return QMatrix4x4(&m[0][0]);
 }
 

libraries/render-utils/src/MatrixStack.h

@@ -27,6 +27,9 @@
 #include <stack>
 #include <QMatrix4x4>
 
+#include <gpu/GPUConfig.h>
+
+
 
 class MatrixStack : public std::stack<glm::mat4> {
 

libraries/render-utils/src/TextRenderer.cpp

@@ -54,7 +54,7 @@ void readStream(QIODevice & in, T & t) {
 }
 
 template <typename T, size_t N>
-void readStream(T(&t)[N]) {
+void readStream(QIODevice & in, T(&t)[N]) {
   in.read((char*)t, N);
 }
 
@@ -228,7 +228,7 @@ public:
   QImage _image;
   ProgramPtr _program;
 
-  const Glyph & Font::getGlyph(const QChar & c) const;
+  const Glyph & getGlyph(const QChar & c) const;
   void read(QIODevice & path);
   // Initialize the OpenGL structures
   void setupGL();

libraries/render-utils/src/TextRenderer.h

@@ -46,6 +46,8 @@ const char SOLID_BLOCK_CHAR = 127;
 #define INCONSOLATA_FONT_WEIGHT QFont::Bold
 #endif
 
+class Font;
+
 // TextRenderer is actually a fairly thin wrapper around a Font class
 // defined in the cpp file.  
 class TextRenderer {
@@ -80,7 +82,6 @@ private:
     // text color
     const QColor _color;
 
-    friend class Font;
     Font * _font;
 };
 

tests/render-utils/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME render-utils-tests)
-
-setup_hifi_project(Quick)
+ 
+setup_hifi_project(Quick Gui OpenGL)
 
 include_glm()
 

tests/render-utils/src/main.cpp

@@ -115,7 +115,8 @@ QTestWindow::QTestWindow() {
   resizeGl();
 }
 
-static const wchar_t * EXAMPLE_TEXT = L"Áy Hello 1.0\nyÁ line 2\nÁy";
+
+static const wchar_t * EXAMPLE_TEXT = L"\xC1y Hello 1.0\ny\xC1 line 2\n\xC1y";
 static const glm::uvec2 QUAD_OFFSET(10, 10);
 static const glm::vec3 COLORS[4] = {
   { 1.0, 1.0, 1.0 },
@@ -173,4 +174,4 @@ int main(int argc, char** argv) {
   return 0;
 }
 
-#include "main.moc"
+#include "main.moc"