OSX build fixes

fredcooke · Dec 20, 2013 · bdc05ed · bdc05ed
1 parent 225f262
commit bdc05ed
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/core/core.pro b/core/core.pro
@@ -56,9 +56,15 @@ DEFINES += GIT_DATE=\""$$system(date)"\"
 	#CONFIG(release, debug|release) {
 	#	LIBS += =lqwt
 	#}
-}
-
-unix {
+} else:mac {
+        QMAKE_CXXFLAGS += -Werror
+        INCLUDEPATH += /opt/local/include
+        INCLUDEPATH += /opt/local/include/qwt
+        LIBS += -L/opt/local/lib -lqjson -lqwt
+        DEFINES += GIT_COMMIT=$$system(git describe --dirty=-DEV --always)
+        DEFINES += GIT_HASH=$$system(git log -n 1 --pretty=format:%H)
+        DEFINES += GIT_DATE=\""$$system(date)"\"
+} else:unix {
 	QMAKE_CXXFLAGS += -Werror
 	target.path = /usr/bin
 	dashboard.path = /usr/share/EMStudio/dashboards
@@ -76,11 +82,7 @@ unix {
         DEFINES += GIT_HASH=$$system(git log -n 1 --pretty=format:%H)
         DEFINES += GIT_DATE=\""$$system(date)"\"
 }
-mac {
-	QMAKE_CXXFLAGS += -Werror
-	INCLUDEPATH += /opt/local/include
-	INCLUDEPATH += /opt/local/include/qwt
-}
+
 SOURCES += src/main.cpp\
 	src/mainwindow.cpp \
     src/logloader.cpp \

diff --git a/core/src/tablemap3d.cpp b/core/src/tablemap3d.cpp
@@ -21,8 +21,13 @@
 
 #include "tablemap3d.h"
 #include <QPainter>
+#if defined(Q_OS_MAC)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/gl.h>
 #include <GL/glu.h>
+#endif
 //This is required for some windows builds
 #ifndef GL_MULTISAMPLE
 #define GL_MULTISAMPLE  0x809D

diff --git a/plugins/freeems/freeems.pro b/plugins/freeems/freeems.pro
@@ -52,15 +52,23 @@ win32-x-g++ { #Linux based crossplatform 32bit build
 	DEFINES += GIT_COMMIT=$$system(\"c:/program files (x86)/git/bin/git.exe\" describe --dirty=-DEV --always)
 	DEFINES += GIT_HASH=$$system(\"c:/program files (x86)/git/bin/git.exe\" log -n 1 --pretty=format:%H)
         QMAKE_LFLAGS += -static-libgcc -static-libstdc++
-}
-unix {
+} else:mac {
+        TARGET = ../../core/plugins/freeemsplugi
+        INCLUDEPATH += /opt/local/include
+        INCLUDEPATH += /opt/local/include/qwt
+        LIBS += -L/opt/local/lib -lqjson
+        DEFINES += GIT_COMMIT=$$system(git describe --dirty=-DEV --always)
+        DEFINES += GIT_HASH=$$system(git log -n 1 --pretty=format:%H)
+        DEFINES += GIT_DATE=\""$$system(date)"\"
+} else:unix {
 	TARGET = ../../core/plugins/freeemsplugin
 	target.path = /usr/share/emstudio/plugins
 	INSTALLS += target
         DEFINES += GIT_COMMIT=$$system(git describe --dirty=-DEV --always)
         DEFINES += GIT_HASH=$$system(git log -n 1 --pretty=format:%H)
         DEFINES += GIT_DATE=\""$$system(date)"\"
 }
+
 # Input
 HEADERS += datapacketdecoder.h \
            table2ddata.h \