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