Fix compilation for newer gcc versions.

Tested with gcc 5.4.0 and 6.2.0.
This commit is contained in:
Éder F. Zulian
2017-03-01 09:34:05 +01:00
parent 7ff6259447
commit 4ee30b383e
2 changed files with 10 additions and 7 deletions

View File

@@ -18,8 +18,11 @@ isEmpty(systemc_target_arch) {
message(SystemC target architecture is $${systemc_target_arch})
#QMAKE_RPATHDIR += $${systemc_home}/lib-$${systemc_target_arch}
#message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR})
unix:!macx {
message(Building on a GNU/Linux)
QMAKE_RPATHDIR += $${systemc_home}/lib-$${systemc_target_arch}
message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR})
}
DEFINES += TIXML_USE_STL
DEFINES += SC_INCLUDE_DYNAMIC_PROCESSES
@@ -38,9 +41,9 @@ INCLUDEPATH += $${systemc_home}/include
INCLUDEPATH += src/common/third_party/DRAMPower/src
INCLUDEPATH += src/common/third_party/DRAMPower/src/libdrampower
LIBS += -lsqlite3
LIBS += -L$${systemc_home}/lib-$${systemc_target_arch} -lsystemc
LIBS += libDRAMSys.a
LIBS += ../../DRAMSys/simulator/src/common/third_party/DRAMPower/src/libdrampower.a
LIBS += -lsqlite3
SOURCES += src/simulation/main.cpp

View File

@@ -147,7 +147,7 @@ $ qtcreator &
Use the menu bar and open the DRAMSys project.
**File -> Open Project -> dram.vp.system/DRAMSys/dram.vp.system.pro**
**File -> Open Project -> dram.vp.system/DRAMSys/DRAMSys.pro**
When you open the project for the first time a configuration window pops-up.
Then click in **Configure Project** and after that **Build** the project.
@@ -173,7 +173,7 @@ use **qmake** to generate a Makefile and then compile the project.
``` bash
$ mkdir build
$ cd build
$ qmake ../DRAMSys/dram.vp.system.pro
$ qmake ../DRAMSys/DRAMSys.pro
$ make
```
@@ -301,7 +301,7 @@ has to be changed like [this](https://trac.macports.org/attachment/ticket/44288/
``` bash
$ mkdir build
$ qmake ../DRAMSys/dram.vp.system.pro
$ qmake ../DRAMSys/DRAMSys.pro
$ make -j<number_jobs>
```
@@ -418,7 +418,7 @@ or
$ mkdir build
$ cd build
$ export THERMALSIM=true
$ qmake ../DRAMSys/dram.vp.system.pro
$ qmake ../DRAMSys/DRAMSys.pro
$ make
```