aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Pisa <pisa@cmp.felk.cvut.cz>2019-08-02 11:43:21 +0200
committerPavel Pisa <pisa@cmp.felk.cvut.cz>2019-08-02 11:43:21 +0200
commit9fbafd5786977ab062caf72c7e6bb63c8eae2eae (patch)
tree54c01f995218f370c5dbeaa8c4193fa43c37867c
parentd94231bc05f56252416857725ae8a4398436f12a (diff)
downloadqtmips-9fbafd5786977ab062caf72c7e6bb63c8eae2eae.tar.gz
qtmips-9fbafd5786977ab062caf72c7e6bb63c8eae2eae.tar.bz2
qtmips-9fbafd5786977ab062caf72c7e6bb63c8eae2eae.zip
Update standalone build scripts (generic and MacOS) to include qtmips_asm.
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
-rwxr-xr-xbuild-macos.sh2
-rwxr-xr-xbuild.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/build-macos.sh b/build-macos.sh
index ac4422d..5a3703a 100755
--- a/build-macos.sh
+++ b/build-macos.sh
@@ -28,7 +28,7 @@ qmake \
-config release \
-recursive \
"$ROOT" \
- "QMAKE_RPATHDIR += ../qtmips_machine ../qtmips_osemu" \
+ "QMAKE_RPATHDIR += ../qtmips_machine ../qtmips_osemu ../qtmips_asm" \
"INCLUDEPATH += /usr/local/Cellar/libelf/0.8.13_1/include/libelf /usr/local/Cellar/libelf/0.8.13_1/include" \
"LIBS += -L/usr/local/Cellar/libelf/0.8.13_1/lib -lelf" \
"QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14"
diff --git a/build.sh b/build.sh
index 06511c3..362a5b9 100755
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,7 @@ mkdir -p build
cd build
# Compile
-qtchooser -run-tool=qmake -qt=5 -recursive "$ROOT" "QMAKE_RPATHDIR += ../qtmips_machine ../qtmips_osemu"
+qtchooser -run-tool=qmake -qt=5 -recursive "$ROOT" "QMAKE_RPATHDIR += ../qtmips_machine ../qtmips_osemu ../qtmips_asm"
make sub-qtmips_cli sub-qtmips_gui # Note: we are building these to to not build tests
# Link executables to more suitable place