From e1ab23616d5a9cc4cf56d29b3cbe548f2ae54823 Mon Sep 17 00:00:00 2001
From: Matthias Jung <jungma@eit.uni-kl.de>
Date: Mon, 20 Feb 2017 10:49:06 +0100
Subject: [PATCH 1/2] Fixed build errors on linux

---
 DRAMSys/simulator/simulator.pro | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/DRAMSys/simulator/simulator.pro b/DRAMSys/simulator/simulator.pro
index be3d6430..abdbd29a 100644
--- a/DRAMSys/simulator/simulator.pro
+++ b/DRAMSys/simulator/simulator.pro
@@ -17,6 +17,18 @@ isEmpty(systemc_target_arch) {
 }
 message(SystemC target architecture is $${systemc_target_arch})
 
+DEFINES += TIXML_USE_STL
+DEFINES += SC_INCLUDE_DYNAMIC_PROCESSES
+
+unix:!macx {
+        QMAKE_CXXFLAGS += -std=c++11 -O0 -g
+}
+
+macx: {
+        CONFIG += c++11
+        QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++ -O0 -g
+}
+
 INCLUDEPATH += src/simulation/
 INCLUDEPATH += $${systemc_home}/include
 INCLUDEPATH += src/common/third_party/DRAMPower/src
@@ -24,8 +36,7 @@ INCLUDEPATH += src/common/third_party/DRAMPower/src/libdrampower
 
 LIBS += -lsqlite3
 LIBS += -L$${systemc_home}/lib-$${systemc_target_arch} -lsystemc
-LIBS += -L../../DRAMSys/simulator/src/common/third_party/DRAMPower/src/ -ldrampower
-#LIBS += -L$${OUT_PWD} -ldramSys
 LIBS += libDRAMSys.a
+LIBS += ../../DRAMSys/simulator/src/common/third_party/DRAMPower/src/libdrampower.a
 
 SOURCES += src/simulation/main.cpp

From d7ef8a5d3aa768d263e785f5cf793769114b1a8f Mon Sep 17 00:00:00 2001
From: Matthias Jung <jungma@eit.uni-kl.de>
Date: Mon, 20 Feb 2017 16:55:33 +0100
Subject: [PATCH 2/2] small fixes

---
 DRAMSys/simulator/library.pro | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/DRAMSys/simulator/library.pro b/DRAMSys/simulator/library.pro
index d026282c..52802376 100644
--- a/DRAMSys/simulator/library.pro
+++ b/DRAMSys/simulator/library.pro
@@ -23,12 +23,6 @@ message(SystemC target architecture is $${systemc_target_arch})
 QMAKE_RPATHDIR += $${systemc_home}/lib-$${systemc_target_arch}
 message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR})
 
-LIBS += -L$${systemc_home}/lib-$${systemc_target_arch} -lsystemc
-
-LIBS += -lsqlite3
-LIBS += -lpthread
-LIBS += -L../../DRAMSys/simulator/src/common/third_party/DRAMPower/src/ -ldrampower
-
 INCLUDEPATH += $${systemc_home}/include
 INCLUDEPATH += src/common/third_party/DRAMPower/src
 INCLUDEPATH += src/common/third_party/DRAMPower/src/libdrampower