diff options
| author | Pavel Pisa <pisa@cmp.felk.cvut.cz> | 2019-07-15 14:46:09 +0200 |
|---|---|---|
| committer | Pavel Pisa <pisa@cmp.felk.cvut.cz> | 2019-07-15 14:46:09 +0200 |
| commit | 54ac86405049364df763e8ce002cf7aed4b69bed (patch) | |
| tree | 0e383d2bcbe758adcfe0c9aed9ef352dce20cc02 | |
| parent | b40329ca01006c299c94de24a7d35365e10974ef (diff) | |
| download | qtmips-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>
| -rw-r--r-- | qtmips.pro | 3 | ||||
| -rw-r--r-- | qtmips_asm/fixmatheval.cpp (renamed from qtmips_gui/fixmatheval.cpp) | 0 | ||||
| -rw-r--r-- | qtmips_asm/fixmatheval.h (renamed from qtmips_gui/fixmatheval.h) | 0 | ||||
| -rw-r--r-- | qtmips_asm/qtmips_asm.pro | 20 | ||||
| -rw-r--r-- | qtmips_cli/qtmips_cli.pro | 6 | ||||
| -rw-r--r-- | qtmips_gui/qtmips_gui.pro | 8 |
6 files changed, 30 insertions, 7 deletions
@@ -2,7 +2,8 @@ TEMPLATE = subdirs SUBDIRS += \ qtmips_machine \ - qtmips_osemu + qtmips_osemu \ + qtmips_asm !wasm: SUBDIRS += \ qtmips_machine/tests \ diff --git a/qtmips_gui/fixmatheval.cpp b/qtmips_asm/fixmatheval.cpp index 8852938..8852938 100644 --- a/qtmips_gui/fixmatheval.cpp +++ b/qtmips_asm/fixmatheval.cpp diff --git a/qtmips_gui/fixmatheval.h b/qtmips_asm/fixmatheval.h index 3312bfa..3312bfa 100644 --- a/qtmips_gui/fixmatheval.h +++ b/qtmips_asm/fixmatheval.h diff --git a/qtmips_asm/qtmips_asm.pro b/qtmips_asm/qtmips_asm.pro new file mode 100644 index 0000000..20b988f --- /dev/null +++ b/qtmips_asm/qtmips_asm.pro @@ -0,0 +1,20 @@ +QT -= gui + +TARGET = qtmips_asm +CONFIG += c++11 + +TEMPLATE = lib +CONFIG += staticlib + +LIBS += -lelf +QMAKE_CXXFLAGS += -std=c++0x +QMAKE_CXXFLAGS_DEBUG += -ggdb + +DEFINES += QTMIPS_MACHINE_LIBRARY +DEFINES += QT_DEPRECATED_WARNINGS + +SOURCES += \ + fixmatheval.cpp + +HEADERS += \ + fixmatheval.h 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 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 += \ |