get tinyxml as submodule and build DRAMPower with qmake

This commit is contained in:
Matthias Jung
2015-05-13 15:55:07 +02:00
parent be408a65bf
commit f74350a750
10 changed files with 12 additions and 4269 deletions

3
.gitmodules vendored
View File

@@ -1,3 +1,6 @@
[submodule "dram/src/common/third_party/DRAMPower"]
path = 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
url = https://github.com/leethomason/tinyxml2.git

View File

@@ -3,6 +3,7 @@ CONFIG += console
CONFIG -= app_bundle
CONFIG -= qt
system(cd ../src/common/third_party/DRAMPower; make parserlib; make lib;)
LIBS += -L/opt/systemc/lib-linux64 -lsystemc
LIBS += -L/opt/boost/lib -lboost_filesystem -lboost_system
@@ -33,7 +34,7 @@ QMAKE_CXXFLAGS += -isystem /opt/boost/include
QMAKE_CXXFLAGS += -iquote ../src/common/third_party/DRAMPower/src/
SOURCES += \
../src/common/third_party/tinyxml2.cpp \
../src/common/third_party/tinyxml2/tinyxml2.cpp \
../src/common/xmlAddressdecoder.cpp \
../src/common/Utils.cpp \
../src/common/TlmRecorder.cpp \
@@ -77,7 +78,7 @@ SOURCES += \
../src/error/flip_memory.cpp
HEADERS += \
../src/common/third_party/tinyxml2.h \
../src/common/third_party/tinyxml2/tinyxml2.h \
../src/common/xmlAddressdecoder.h \
../src/common/Utils.h \
../src/common/TlmRecorder.h \

View File

@@ -16,7 +16,7 @@
#include <boost/preprocessor.hpp>
#include <iomanip>
#include "dramExtension.h"
#include "third_party/tinyxml2.h"
#include "third_party/tinyxml2/tinyxml2.h"
//TODO : move to timing specific header
sc_time getDistance(sc_time a, sc_time b);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -20,7 +20,7 @@
#include <math.h>
#include <map>
#include "third_party/tinyxml2.h"
#include "third_party/tinyxml2/tinyxml2.h"
struct DecodedAddress
{

View File

@@ -9,7 +9,7 @@
#define CONFIGURATIONLOADER_H_
#include <string>
#include "../../../common/third_party/tinyxml2.h"
#include "../../../common/third_party/tinyxml2/tinyxml2.h"
#include "../../../common/Utils.h"
#include "Configuration.h"

View File

@@ -17,7 +17,7 @@
#include <string>
#include <systemc.h>
#include "TracePlayerListener.h"
#include "../common/third_party/tinyxml2.h"
#include "../common/third_party/tinyxml2/tinyxml2.h"
#include "../error/flip_memory.h"
struct DramSetup

View File

@@ -12,7 +12,7 @@
#include <string>
#include <map>
#include "Simulation.h"
#include "../common/third_party/tinyxml2.h"
#include "../common/third_party/tinyxml2/tinyxml2.h"
struct SimulationBatch
{