Merge pull request #16 from fzeder/master
Please see individual commits
This commit is contained in:
Matthias Jung
2
.gitignore
vendored
2
.gitignore
vendored
@@ -11,7 +11,7 @@
|
||||
/build-simulation
|
||||
/release-simulation
|
||||
*.*~
|
||||
dram/build-*/
|
||||
build-*/
|
||||
._.DS_Store
|
||||
.DS_Store
|
||||
*.swp
|
||||
|
||||
8
.gitmodules
vendored
8
.gitmodules
vendored
@@ -1,6 +1,6 @@
|
||||
[submodule "dram/src/common/third_party/DRAMPower"]
|
||||
path = dram/src/common/third_party/DRAMPower
|
||||
[submodule "DRAMSys/dram/src/common/third_party/DRAMPower"]
|
||||
path = DRAMSys/dram/src/common/third_party/DRAMPower
|
||||
url = https://github.com/ravenrd/DRAMPower.git
|
||||
[submodule "dram/src/common/third_party/tinyxml2"]
|
||||
path = dram/src/common/third_party/tinyxml2
|
||||
[submodule "DRAMSys/dram/src/common/third_party/tinyxml2"]
|
||||
path = DRAMSys/dram/src/common/third_party/tinyxml2
|
||||
url = https://github.com/leethomason/tinyxml2.git
|
||||
|
||||
|
Before Width: | Height: | Size: 169 KiB After Width: | Height: | Size: 169 KiB |
|
Before Width: | Height: | Size: 171 KiB After Width: | Height: | Size: 171 KiB |
5
DRAMSys/dram.vp.system.pro
Normal file
5
DRAMSys/dram.vp.system.pro
Normal file
@@ -0,0 +1,5 @@
|
||||
TEMPLATE = subdirs
|
||||
|
||||
SUBDIRS = dram/dramSys/dramSys.pro
|
||||
SUBDIRS += analyzer/analyzer/traceAnalyzer.pro
|
||||
|
||||
@@ -3,13 +3,13 @@ CONFIG += console
|
||||
CONFIG -= app_bundle
|
||||
CONFIG -= qt
|
||||
|
||||
system(cd ../src/common/third_party/DRAMPower; make lib;)
|
||||
system(cd ../../../DRAMSys/dram/src/common/third_party/DRAMPower; make lib;)
|
||||
|
||||
LIBS += -L/opt/systemc/lib-linux64 -lsystemc
|
||||
LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system
|
||||
LIBS += -lsqlite3
|
||||
LIBS += -lpthread
|
||||
LIBS += -L../src/common/third_party/DRAMPower/src/ -ldrampower
|
||||
LIBS += -L../../../DRAMSys/dram/src/common/third_party/DRAMPower/src/ -ldrampower
|
||||
|
||||
INCLUDEPATH += /opt/systemc/include
|
||||
INCLUDEPATH += /opt/boost/include
|
||||
@@ -24,6 +24,8 @@ release {
|
||||
}
|
||||
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
QMAKE_CXXFLAGS += -isystem /opt/systemc/include
|
||||
QMAKE_CXXFLAGS += -isystem /opt/boost/include
|
||||
|
||||
SOURCES += \
|
||||
../src/common/third_party/tinyxml2/tinyxml2.cpp \
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user