diff --git a/DRAMSys/analyzer/traceAnalyzer.pro b/DRAMSys/analyzer/traceAnalyzer.pro index b07b3ec1..dfb63aa9 100644 --- a/DRAMSys/analyzer/traceAnalyzer.pro +++ b/DRAMSys/analyzer/traceAnalyzer.pro @@ -62,11 +62,11 @@ macx: { DEPENDPATH += $$replace(LIBQWT_HOME, lib, ) #DEPENDPATH += $$(python_headers) - #INCLUDEPATH += $$(python_headers) - #LIBS += -L$$(python_home) -lpython3.6 + INCLUDEPATH += $$(python_headers) + LIBS += -L$$(python_home) -lpython3.6 - INCLUDEPATH += /usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/Headers/ - LIBS += -L/usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/lib/ -lpython3.6 + #INCLUDEPATH += /usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/Headers/ + #LIBS += -L/usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/lib/ -lpython3.6 CONFIG-=app_bundle } diff --git a/DRAMSys/simulator/simulator.pro b/DRAMSys/simulator/simulator.pro index e7d0dd4d..be3d6430 100644 --- a/DRAMSys/simulator/simulator.pro +++ b/DRAMSys/simulator/simulator.pro @@ -25,6 +25,7 @@ INCLUDEPATH += src/common/third_party/DRAMPower/src/libdrampower LIBS += -lsqlite3 LIBS += -L$${systemc_home}/lib-$${systemc_target_arch} -lsystemc LIBS += -L../../DRAMSys/simulator/src/common/third_party/DRAMPower/src/ -ldrampower -LIBS += -L$${OUT_PWD} -ldramSys +#LIBS += -L$${OUT_PWD} -ldramSys +LIBS += libDRAMSys.a SOURCES += src/simulation/main.cpp diff --git a/README.md b/README.md index 3c1b7646..e5182c22 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ They are: For further information refer to [this](http://qwt.sourceforge.net/) -- python3.5 +- python3.5 or 3.6 In Debian like distros: @@ -96,14 +96,6 @@ They are: $ sudo apt-get install python3.5-dev ``` -- libboost_filesystem and libboost_system - - In Debian like distros: - - ```bash - $ sudo apt-get install libboost-all-dev - ``` - - Others Some basic libraries may be already installed in your system. If not you can @@ -135,8 +127,6 @@ export PYTHON_HOME= export PYTHON_HEADERS= export LIBQWT_HOME= export LIBQWT_HEADERS= -export LIBBOOST_HOME= -export LIBBOOST_HEADERS= ``` Users interested in thermal simulation can also add some extra environment @@ -276,26 +266,6 @@ export PATH $ cd /Library/Frameworks $ sudo ln -s /opt/qwt-6.1.2/lib/qwt.framework/ . ``` - -- The boost library can be installed manually or through homebrew: - -Manually: Install boost lib (filesystem & system) in /opt/boost - -``` bash -$ ./bootstrap.sh --prefix=/opt/boost --with-libraries=filesystem,system -$ sudo ./b2 install -``` - -Homebrew: Install boost lib (all, which consumes large storage) in -``` -/usr/local/Cellar -``` - -``` bash -$ brew install boost -``` - - - Export correct Environment Variables in your terminal's profile, e.g: ``` bash @@ -317,12 +287,6 @@ export PYTHON_HEADERS=/Library/Frameworks/Python.framework/Versions/3.5/Headers export LIBQWT_HOME=/opt/qwt-6.1.4/lib export LIBQWT_HEADERS=/opt/qwt-6.1.4/lib/qwt.framework/Headers -export LIBBOOST_HOME=/opt/boost/lib -export LIBBOOST_HEADERS=/opt/boost/include - -# Add Boost Lib into Dynamic Lib Path -DYLD_LIBRARY_PATH="/opt/boost/lib:${DYLD_LIBRARY_PATH}" -export DYLD_LIBRARY_PATH ``` - For the trace analyzer the file: