Merge pull request #336

f45099b add qmake rpath for linux build (Jaquee)
This commit is contained in:
Riccardo Spagni 2016-12-22 22:43:53 +02:00
commit d8f9e7360f
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 6 additions and 1 deletions

View File

@ -21,7 +21,7 @@ cp -v /usr/lib/x86_64-linux-gnu/libQt5XmlPatterns.so.5 $TARGET/libs
# Create start script # Create start script
cat > $TARGET/start-gui.sh <<EOL cat > $TARGET/start-gui.sh <<EOL
#!/bin/bash #!/bin/bash
export LD_LIBRARY_PATH=\`pwd\`/libs # export LD_LIBRARY_PATH=\`pwd\`/libs
export QT_PLUGIN_PATH=\`pwd\`/plugins export QT_PLUGIN_PATH=\`pwd\`/plugins
export QML2_IMPORT_PATH=\`pwd\`/qml export QML2_IMPORT_PATH=\`pwd\`/qml
./$GUI_EXEC ./$GUI_EXEC

View File

@ -154,6 +154,11 @@ linux {
message(Building with libunwind) message(Building with libunwind)
LIBS += -Wl,-Bdynamic -lunwind LIBS += -Wl,-Bdynamic -lunwind
} }
QMAKE_LFLAGS_RPATH=
QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN/libs\'"
} }
macx { macx {