diff --git a/DRAMSys/simulator/simulator.pro b/DRAMSys/simulator/simulator.pro index a0b27493..de259186 100644 --- a/DRAMSys/simulator/simulator.pro +++ b/DRAMSys/simulator/simulator.pro @@ -11,13 +11,6 @@ isEmpty(systemc_home) { } message(SystemC home is $${systemc_home}) -systemc_target_arch = $$(SYSTEMC_TARGET_ARCH) -isEmpty(systemc_target_arch) { - systemc_target_arch = linux64 -} - -message(SystemC target architecture is $${systemc_target_arch}) - dramsys_disable_coverage_check = $$(DRAMSYS_DISABLE_COVERAGE_CHECK) isEmpty(dramsys_disable_coverage_check) { coverage_check = true @@ -29,16 +22,16 @@ isEmpty(dramsys_disable_coverage_check) { unix:!macx { message(Building on a GNU/Linux) - QMAKE_RPATHDIR += $${systemc_home}/lib-$${systemc_target_arch} - message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR}) + QMAKE_RPATHDIR += $${systemc_home}/lib + message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR}) } DEFINES += TIXML_USE_STL DEFINES += SC_INCLUDE_DYNAMIC_PROCESSES unix:!macx { - QMAKE_CXXFLAGS += -std=c++11 -O0 -g - $$eval(coverage_check) { + QMAKE_CXXFLAGS += -std=c++0x -O0 -g + $$eval(coverage_check) { QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage -fPIC -O0 QMAKE_LFLAGS += -lgcov --coverage } @@ -59,7 +52,7 @@ INCLUDEPATH += $${systemc_home}/include INCLUDEPATH += ../library/src/common/third_party/DRAMPower/src INCLUDEPATH += ../library/src/common/third_party/DRAMPower/src/libdrampower -LIBS += -L$${systemc_home}/lib-$${systemc_target_arch} -lsystemc +LIBS += -L$${systemc_home}/lib -lsystemc LIBS += ../library/libDRAMSys.a LIBS += ../../DRAMSys/library/src/common/third_party/DRAMPower/src/libdrampower.a LIBS += -lsqlite3