aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2018-01-01 16:02:52 +0100
committerKarel Kočí <cynerd@email.cz>2018-01-01 16:02:52 +0100
commitb5855f0e496f2f9267c9a3eb29191f2ed7a3cfef (patch)
tree1c46a8945a2efcd7848a7a3c7de8c8d004084562
parent6bd82cda5f609d4758cf5c430a32f8a4bb6c6ec8 (diff)
downloadqtmips-b5855f0e496f2f9267c9a3eb29191f2ed7a3cfef.tar.gz
qtmips-b5855f0e496f2f9267c9a3eb29191f2ed7a3cfef.tar.bz2
qtmips-b5855f0e496f2f9267c9a3eb29191f2ed7a3cfef.zip
Rework compilation so we don't have to use LD_LIBRARY_PATH
-rw-r--r--README.md19
-rwxr-xr-xbuild.sh12
2 files changed, 19 insertions, 12 deletions
diff --git a/README.md b/README.md
index e9c3fe9..be5667e 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@ MIPS CPU simulator for education purposes.
Dependencies
------------
* Qt 5
-* elfutils (libelf works too but you might have problems with it)
+* elfutils (libelf might works too but you can have problems with it)
-Compilation
------------
+General compilation
+-------------------
To compile whole project just run these commands:
```
qmake /path/to/qtmips
@@ -16,13 +16,16 @@ make
```
Where `/path/to/qtmips` is path to this project root.
-Running
--------
+(Be sure to use qt5 qmake.)
+
+Compilation for local execution
+-------------------------------
Because simulator it self is implemented as library you need to have that library
-in common path where loader can found it. Which is not commonly a case, so you can
-also run it using this command (in case of cli version, gui version is the same)
+in path where loader can found it. Which is not commonly a case, so you have to
+compile it with following additional option:
```
-LD_LIBRARY_PATH=qtmips_machine qtmips_cli/qtmips_cli
+qmake /path/to/qtmips "QMAKE_RPATHDIR += ../qtmips_machine"
+make
```
Tests
diff --git a/build.sh b/build.sh
index bfde7c4..6848d31 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,14 @@
#!/bin/sh
-mkdir -p build
-
ROOT="$(dirname "$(readlink -f "$0")")"
+mkdir -p build
cd build
-qtchooser -run-tool=qmake -qt=5 "$ROOT"
-make sub-qtmips_cli sub-qtmips_gui
+# Compile
+qtchooser -run-tool=qmake -qt=5 "$ROOT" "QMAKE_RPATHDIR += ../qtmips_machine"
+make
+
+# Link executables to more suitable place
+ln -fs qtmips_cli/qtmips_cli cli
+ln -fs qtmips_gui/qtmips_gui gui