aboutsummaryrefslogtreecommitdiff
path: root/qtmips_gui/qtmips_gui.pro
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_gui/qtmips_gui.pro
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_gui/qtmips_gui.pro')
-rw-r--r--qtmips_gui/qtmips_gui.pro8
1 files changed, 4 insertions, 4 deletions
diff --git a/qtmips_gui/qtmips_gui.pro b/qtmips_gui/qtmips_gui.pro
index ae4f525..8e27fe2 100644
--- a/qtmips_gui/qtmips_gui.pro
+++ b/qtmips_gui/qtmips_gui.pro
@@ -13,9 +13,11 @@ else:unix: LIBS_SUBDIR = .
LIBS += -L$$OUT_PWD/../qtmips_osemu/$${LIBS_SUBDIR} -lqtmips_osemu
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_osemu/$${LIBS_SUBDIR}/libqtmips_osemu.a
PRE_TARGETDEPS += $$OUT_PWD/../qtmips_machine/$${LIBS_SUBDIR}/libqtmips_machine.a
+PRE_TARGETDEPS += $$OUT_PWD/../qtmips_asm/$${LIBS_SUBDIR}/libqtmips_asm.a
DOLAR=$
@@ -23,8 +25,8 @@ unix: LIBS += \
-Wl,-rpath,\'$${DOLAR}$${DOLAR}ORIGIN/../lib\' \
# --enable-new-dtags \
-INCLUDEPATH += $$PWD/../qtmips_machine $$PWD/../qtmips_osemu
-DEPENDPATH += $$PWD/../qtmips_machine $$PWD/../qtmips_osemu
+INCLUDEPATH += $$PWD/../qtmips_machine $$PWD/../qtmips_osemu $$PWD/../qtmips_asm
+DEPENDPATH += $$PWD/../qtmips_machine $$PWD/../qtmips_osemu $$PWD/../qtmips_asm
QMAKE_CXXFLAGS += -std=c++0x
QMAKE_CXXFLAGS_DEBUG += -ggdb
@@ -74,7 +76,6 @@ SOURCES += \
hinttabledelegate.cpp \
coreview/minimux.cpp \
srceditor.cpp \
- fixmatheval.cpp \
highlighter.cpp
HEADERS += \
@@ -120,7 +121,6 @@ HEADERS += \
hinttabledelegate.h \
coreview/minimux.h \
srceditor.h \
- fixmatheval.h \
highlighter.h
wasm: SOURCES += \