diff --git a/DRAMSys/analyzer/businessObjects/pythoncaller.cpp b/DRAMSys/analyzer/businessObjects/pythoncaller.cpp index 2ca89d5b..4442b020 100644 --- a/DRAMSys/analyzer/businessObjects/pythoncaller.cpp +++ b/DRAMSys/analyzer/businessObjects/pythoncaller.cpp @@ -53,11 +53,7 @@ PythonCaller::PythonCaller() : metricFunctionName("calculateMetrics"), getMetricFunctionName("getMetrics"), - #ifdef MAC - pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../../../../DRAMSys/analyzer/scripts/"), - #else pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../DRAMSys/analyzer/scripts/"), - #endif plotsModuleName("plots"), plotsFunctionName("generatePlots") { @@ -67,10 +63,10 @@ PythonCaller::PythonCaller() : PyList_Insert(sysPath, 0, path); Py_DECREF(path); - qDebug() << testModuleName.c_str() << testFunctionName.c_str(); - qDebug() << metricModuleName.c_str() << metricFunctionName.c_str(); - qDebug() << plotsModuleName.c_str() << plotsFunctionName.c_str(); - qDebug() << "XXX: " << pathToScripts.c_str(); + qDebug() << "Test:" << testModuleName.c_str() << testFunctionName.c_str(); + qDebug() << "Metric:" << metricModuleName.c_str() << metricFunctionName.c_str(); + qDebug() << "Plot:" << plotsModuleName.c_str() << plotsFunctionName.c_str(); + qDebug() << "Script: " << pathToScripts.c_str(); pRunTestsFunction = loadFunctionFromModule(testModuleName, testFunctionName); pCalculateMetricsFunction = loadFunctionFromModule(metricModuleName, metricFunctionName); diff --git a/DRAMSys/analyzer/traceAnalyzer.pro b/DRAMSys/analyzer/traceAnalyzer.pro index 057ed8f8..d80dff2b 100644 --- a/DRAMSys/analyzer/traceAnalyzer.pro +++ b/DRAMSys/analyzer/traceAnalyzer.pro @@ -21,13 +21,14 @@ unix:!macx { macx: { CONFIG += c++11 - QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++ -DMAC + QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++ QMAKE_LFLAGS += -F$$(LIBQWT_HOME) LIBS += -F$$(LIBQWT_HOME) -framework qwt INCLUDEPATH += $$(LIBQWT_HEADERS) DEPENDPATH += $$replace(LIBQWT_HOME, lib, ) INCLUDEPATH += $$(PYTHON_HEADERS) LIBS += -L$$(PYTHON_HOME) -lpython3.5 + CONFIG-=app_bundle } # QWT library and header files