From 65e52d0e75e291902f1c8348e4c961549cd88f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89der=20F=2E=20Zulian?= Date: Thu, 24 Sep 2015 17:39:37 +0200 Subject: [PATCH] DRAMSys and IceWrapper projects integrated. --- DRAMSys/dram.vp.system.pro | 5 ++++- DRAMSys/simulator/simulator.pro | 12 ++++++++++++ README.md | 5 +++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/DRAMSys/dram.vp.system.pro b/DRAMSys/dram.vp.system.pro index 3db74aa5..d1a3d29f 100644 --- a/DRAMSys/dram.vp.system.pro +++ b/DRAMSys/dram.vp.system.pro @@ -1,5 +1,8 @@ TEMPLATE = subdirs -SUBDIRS = simulator/simulator.pro +SUBDIRS = simulator/src/common/third_party/icewrapper/3D-ICE-SystemC-Client.pro +SUBDIRS += simulator/simulator.pro SUBDIRS += analyzer/traceAnalyzer.pro +# build the project sequentially as listed in SUBDIRS +CONFIG += ordered diff --git a/DRAMSys/simulator/simulator.pro b/DRAMSys/simulator/simulator.pro index 483de244..bc42aecc 100644 --- a/DRAMSys/simulator/simulator.pro +++ b/DRAMSys/simulator/simulator.pro @@ -131,3 +131,15 @@ HEADERS += \ src/controller/core/configuration/ConfigurationLoader.h \ src/error/errormodel.h + +LIBS += -L/opt/3D-ICE/lib -lthreed-ice-2.2.5 +LIBS += -L/opt/SuperLU_4.3/lib -lsuperlu_4.3 +LIBS += -lblas + +INCLUDEPATH += /opt/3D-ICE/include +INCLUDEPATH += /opt/SuperLU_4.3/SRC +INCLUDEPATH += /opt/systemc/include +INCLUDEPATH += src/common/third_party/icewrapper + +OBJECTS += $$(PWD)/src/common/third_party/icewrapper/IceWrapper.o + diff --git a/README.md b/README.md index 2536877b..e64630dd 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,9 @@ $ git clone --recursive https://@git.rhrk.uni-kl.de/EIT-Wehn/dram.vp.syste ``` The *--recursive* flag tells git to initialize all submodules within the -repository. **DRAMPower** [2] and **tinyxml** are examples third party -repositories that were embedded within the source tree as submodules. +repository. **DRAMPower** [2], **tinyxml** and **icewrapper** are examples +third party repositories that were embedded within the source tree as +submodules. It is possible to work with a **fork** of the official codebase. In that case, after pushing changes into your fork you should create a **pull request** in