Fix for mac

TheGame/TheGame.pro

@@ -24,7 +24,12 @@ HEADERS  += mainwindow.h \
 
 FORMS    += mainwindow.ui
 
+unix:!macx {
 LIBS += -lGLU
+}
+macx:{
+LIBS += -framework OpenGL
+}
 
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../UGameEngine/release/ -lUGameEngine
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../UGameEngine/debug/ -lUGameEngine

TheGame/openglrenderdevice.cpp

@@ -1,7 +1,12 @@
 #include "openglrenderdevice.h"
 #include <QRgb>
-#include "GL/gl.h"
-#include "GL/glu.h"
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+#endif
 
 OpenGLRenderDevice::OpenGLRenderDevice(QObject *parent)
     : AbstractRenderDevice(parent)

UGameEngine/UGameEngine.pro

@@ -57,7 +57,13 @@ HEADERS += engine/ugameengine.h\
 
 # FLEX && BISON
 
-LIBS += -lfl -ly
+LIBS += -ly
+unix:!macx {
+LIBS += -lfl
+}
+macx:{
+LIBS += -ll
+}
 
 FLEXSOURCES = utils/lexer-wavefront-obj.l \
     utils/lexer-wavefront-mtl.l

UGameEngine/utils/matrixmxn.hxx

@@ -51,7 +51,7 @@ uge_gm_tmpl_mnt bool GenericMatrix<M, N, T>::equal(const T &other) const
 {
     for (int i = 0; i < M; ++i) {
         for (int j = 0; j < N; ++j) {
-            if (_scalars[i][j] != other._scalars[i][j]) {
+            if (_scalars[i][j] != other.getScalar(i, j)) {
                 return false;
             }
         }
@@ -103,7 +103,7 @@ uge_gm_tmpl_mnt T &GenericMatrix<M, N, T>::add(const T &other)
 {
     for (int i = 0; i < M; ++i) {
         for (int j = 0; j < N; ++j) {
-            _scalars[i][j] += other._scalars[i][j];
+            _scalars[i][j] += other.getScalar(i, j);
         }
     }
     return *getThis();
@@ -123,7 +123,7 @@ uge_gm_tmpl_mnt T &GenericMatrix<M, N, T>::sub(const T &other)
 {
     for (int i = 0; i < M; ++i) {
         for (int j = 0; j < N; ++j) {
-            _scalars[i][j] -= other._scalars[i][j];
+            _scalars[i][j] -= other.getScalar(i, j);
         }
     }
     return *getThis();
@@ -148,7 +148,7 @@ uge_gm_tmpl_mnt T &GenericMatrix<M, N, T>::mult(const T &other)
 {
     for (int i = 0; i < M; ++i) {
         for (int j = 0; j < N; ++j) {
-            _scalars[i][j] *= other._scalars[i][j];
+            _scalars[i][j] *= other.getScalar(i, j);
         }
     }
     return *getThis();
@@ -190,7 +190,7 @@ uge_gm_tmpl_mnt T &GenericMatrix<M, N, T>::div(const T &other)
 {
     for (int i = 0; i < M; ++i) {
         for (int j = 0; j < N; ++j) {
-            _scalars[i][j] /= other._scalars[i][j];
+            _scalars[i][j] /= other.getScalar(i, j);
         }
     }
     return *getThis();