derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'library' of git.rhrk.uni-kl.de:EIT-Wehn/dram.vp.system into library

Browse Source
This commit is contained in:
Matthias Jung
2017-02-21 22:59:28 +01:00
parent 59cbf4d6a8 d7ef8a5d3a
commit 68948fc43e
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DRAMSys/simulator/library.pro
View File

@@ -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

15
DRAMSys/simulator/simulator.pro
View File

@@ -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