Merge pull request #313

4b62b8a linux: build with static boost (Jaquee) 3515180 linux deploy scripts (Jaquee)
2016-12-21 00:32:54 +02:00
parent fc1c59ddb4 4b62b8aa45
commit 4713228d96
2 changed files with 33 additions and 3 deletions
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -129,9 +129,7 @@ win32 {
 }

 linux {
-    CONFIG(static) {
-        LIBS+= -Wl,-Bstatic
-    }
+    LIBS+= -Wl,-Bstatic
    LIBS+= \
        -lboost_serialization \
        -lboost_thread \
@@ -263,6 +261,10 @@ win32 {
    }
 }

+linux {
+    deploy.commands += $$escape_expand(\n\t) $$PWD/linuxdeploy_helper.sh $$DESTDIR $$TARGET
+}
+


 OTHER_FILES += \