From 4edb3978feb8b175469142f18dfb691d18cfd0f1 Mon Sep 17 00:00:00 2001
From: Matthias Jung <jungma@eit.uni-kl.de>
Date: Wed, 4 May 2016 11:32:28 +0200
Subject: [PATCH] small fixes for MAC

---
 DRAMSys/analyzer/businessObjects/pythoncaller.cpp | 5 +++++
 DRAMSys/analyzer/traceAnalyzer.pro                | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/DRAMSys/analyzer/businessObjects/pythoncaller.cpp b/DRAMSys/analyzer/businessObjects/pythoncaller.cpp
index 27693d37..515bcf45 100644
--- a/DRAMSys/analyzer/businessObjects/pythoncaller.cpp
+++ b/DRAMSys/analyzer/businessObjects/pythoncaller.cpp
@@ -50,7 +50,12 @@ PythonCaller::PythonCaller() :
     testFunctionName("runTests"),
     metricModuleName("metrics"),
     metricFunctionName("calculateMetrics"),
+
+    #ifdef MAC
+    pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../../../../DRAMSys/analyzer/scripts/"),
+    #else
     pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../DRAMSys/analyzer/scripts/"),
+    #endif
     plotsModuleName("plots"),
     plotsFunctionName("generatePlots")
 {
diff --git a/DRAMSys/analyzer/traceAnalyzer.pro b/DRAMSys/analyzer/traceAnalyzer.pro
index e9388796..8831141d 100644
--- a/DRAMSys/analyzer/traceAnalyzer.pro
+++ b/DRAMSys/analyzer/traceAnalyzer.pro
@@ -15,11 +15,13 @@ unix:!macx {
         QMAKE_CXXFLAGS += -std=c++11
         CONFIG += qwt
         QMAKE_CXXFLAGS += -Xlinker -export-dynamic
+        QMAKE_RPATHDIR += $${libqwt_home}
+        message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR})
 }
 
 macx: {
         CONFIG += c++11
-        QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++
+        QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++ -DMAC
         QMAKE_LFLAGS += -F/opt/qwt-6.1.2/lib
         LIBS += -F/opt/qwt-6.1.2/lib/ -framework qwt
         INCLUDEPATH += /opt/qwt-6.1.2/lib/qwt.framework/Headers
@@ -35,8 +37,6 @@ isEmpty(libqwt_home) {
 }
 message(LIBQWT path is $${libqwt_home})
 
-QMAKE_RPATHDIR += $${libqwt_home}
-message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR})
 
 libqwt_headers = $$(LIBQWT_HEADERS)
 isEmpty(libqwt_headers) {