Changes in project structure.

Now we have a root project file - dram.vp.system.pro - that includes
dramSys.pro and traceAnanlyzer.pro files. This way it is possible to build
both projects easily.

After buiding from QTCreator the results will be in dram.vp.system/build* and
its sub-directories.
This commit is contained in:
Éder Ferreira Zulian
2015-06-22 17:15:29 +02:00
parent 494ae584ad
commit 6f776c067e
225 changed files with 43 additions and 35 deletions

2
.gitignore vendored
View File

@@ -11,7 +11,7 @@
/build-simulation /build-simulation
/release-simulation /release-simulation
*.*~ *.*~
dram/build-*/ build-*/
._.DS_Store ._.DS_Store
.DS_Store .DS_Store
*.swp *.swp

8
.gitmodules vendored
View File

@@ -1,6 +1,6 @@
[submodule "dram/src/common/third_party/DRAMPower"] [submodule "DRAMSys/dram/src/common/third_party/DRAMPower"]
path = dram/src/common/third_party/DRAMPower path = DRAMSys/dram/src/common/third_party/DRAMPower
url = https://github.com/ravenrd/DRAMPower.git url = https://github.com/ravenrd/DRAMPower.git
[submodule "dram/src/common/third_party/tinyxml2"] [submodule "DRAMSys/dram/src/common/third_party/tinyxml2"]
path = dram/src/common/third_party/tinyxml2 path = DRAMSys/dram/src/common/third_party/tinyxml2
url = https://github.com/leethomason/tinyxml2.git url = https://github.com/leethomason/tinyxml2.git

View File

Before

Width:  |  Height:  |  Size: 169 KiB

After

Width:  |  Height:  |  Size: 169 KiB

View File

Before

Width:  |  Height:  |  Size: 171 KiB

After

Width:  |  Height:  |  Size: 171 KiB

View File

@@ -0,0 +1,5 @@
TEMPLATE = subdirs
SUBDIRS = dram/dramSys/dramSys.pro
SUBDIRS += analyzer/analyzer/traceAnalyzer.pro

View File

@@ -3,13 +3,13 @@ CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle
CONFIG -= qt 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/systemc/lib-linux64 -lsystemc
LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system
LIBS += -lsqlite3 LIBS += -lsqlite3
LIBS += -lpthread 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/systemc/include
INCLUDEPATH += /opt/boost/include INCLUDEPATH += /opt/boost/include

Some files were not shown because too many files have changed in this diff Show More