diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-22 22:43:53 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-22 22:43:53 +0200 |
| commit | d8f9e7360fdbab910283c465aafe36149b1d7f26 (patch) | |
| tree | 01479416f9b6dce73667ce305649c7644c78babc | |
| parent | 3b1ad0be27be44186d64bbd35841e20a6d3db208 (diff) | |
| parent | f45099b398aac30235e084b042341330f4d0b1fa (diff) | |
| download | monzero-gui-d8f9e7360fdbab910283c465aafe36149b1d7f26.tar.gz monzero-gui-d8f9e7360fdbab910283c465aafe36149b1d7f26.tar.xz monzero-gui-d8f9e7360fdbab910283c465aafe36149b1d7f26.zip | |
Merge pull request #336
f45099b add qmake rpath for linux build (Jaquee)
| -rwxr-xr-x | linuxdeploy_helper.sh | 2 | ||||
| -rw-r--r-- | monero-wallet-gui.pro | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/linuxdeploy_helper.sh b/linuxdeploy_helper.sh index 21bc5b8a..37f1e59e 100755 --- a/linuxdeploy_helper.sh +++ b/linuxdeploy_helper.sh @@ -21,7 +21,7 @@ cp -v /usr/lib/x86_64-linux-gnu/libQt5XmlPatterns.so.5 $TARGET/libs # Create start script cat > $TARGET/start-gui.sh <<EOL #!/bin/bash -export LD_LIBRARY_PATH=\`pwd\`/libs +# export LD_LIBRARY_PATH=\`pwd\`/libs export QT_PLUGIN_PATH=\`pwd\`/plugins export QML2_IMPORT_PATH=\`pwd\`/qml ./$GUI_EXEC diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index d71f299c..1f3b4024 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -154,6 +154,11 @@ linux { message(Building with libunwind) LIBS += -Wl,-Bdynamic -lunwind } + + + QMAKE_LFLAGS_RPATH= + QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN/libs\'" + } macx { |