aboutsummaryrefslogtreecommitdiff
path: root/qtmips_cli
diff options
context:
space:
mode:
authorPavel Pisa <pisa@cmp.felk.cvut.cz>2019-07-15 14:46:09 +0200
committerPavel Pisa <pisa@cmp.felk.cvut.cz>2019-07-15 14:46:09 +0200
commit54ac86405049364df763e8ce002cf7aed4b69bed (patch)
tree0e383d2bcbe758adcfe0c9aed9ef352dce20cc02 /qtmips_cli
parentb40329ca01006c299c94de24a7d35365e10974ef (diff)
downloadqtmips-54ac86405049364df763e8ce002cf7aed4b69bed.tar.gz
qtmips-54ac86405049364df763e8ce002cf7aed4b69bed.tar.bz2
qtmips-54ac86405049364df763e8ce002cf7aed4b69bed.zip
Move fixmatheval to initial directory for assembler library.
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Diffstat (limited to 'qtmips_cli')
-rw-r--r--qtmips_cli/qtmips_cli.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/qtmips_cli/qtmips_cli.pro b/qtmips_cli/qtmips_cli.pro
index 8cacde6..6cc1909 100644
--- a/qtmips_cli/qtmips_cli.pro
+++ b/qtmips_cli/qtmips_cli.pro
@@ -12,8 +12,10 @@ else:win32:CONFIG(debug, debug|release): LIBS_SUBDIR = debug
else:unix: LIBS_SUBDIR = .
LIBS += -L$$OUT_PWD/../qtmips_machine/$${LIBS_SUBDIR} -lqtmips_machine -lelf
+LIBS += -L$$OUT_PWD/../qtmips_asm/$${LIBS_SUBDIR} -lqtmips_asm -lelf
PRE_TARGETDEPS += $$OUT_PWD/../qtmips_machine/$${LIBS_SUBDIR}/libqtmips_machine.a
+PRE_TARGETDEPS += $$OUT_PWD/../qtmips_asm/$${LIBS_SUBDIR}/libqtmips_asm.a
DOLAR=$
@@ -21,8 +23,8 @@ unix: LIBS += \
-Wl,-rpath,\'$${DOLAR}$${DOLAR}ORIGIN/../lib\' \
# --enable-new-dtags \
-INCLUDEPATH += $$PWD/../qtmips_machine
-DEPENDPATH += $$PWD/../qtmips_machine
+INCLUDEPATH += $$PWD/../qtmips_machine $$PWD/../qtmips_asm
+DEPENDPATH += $$PWD/../qtmips_machine $$PWD/../qtmips_asm
QMAKE_CXXFLAGS += -std=c++0x
QMAKE_CXXFLAGS_DEBUG += -ggdb