aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Kitaev <mbg033@gmail.com>2016-07-13 10:30:12 +0300
committerIlya Kitaev <mbg033@gmail.com>2016-07-13 10:30:12 +0300
commitc027922cb710ca78e400c30268f5ceaec10a7e49 (patch)
tree7ea917d3f23ec9683ddcb09905728d1ef8d843d8
parent5b1ab69d70a29c4ddf66d5f107f621ed3340d066 (diff)
downloadmonzero-gui-c027922cb710ca78e400c30268f5ceaec10a7e49.tar.gz
monzero-gui-c027922cb710ca78e400c30268f5ceaec10a7e49.tar.xz
monzero-gui-c027922cb710ca78e400c30268f5ceaec10a7e49.zip
fixed multicore build; statically link boost, libcrypto and libssl for
Linux;
-rwxr-xr-xget_libwallet_api.sh4
-rw-r--r--monero-core.pro8
2 files changed, 8 insertions, 4 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh
index 520bba17..9e69235e 100755
--- a/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -2,9 +2,9 @@
BITMONERO_URL=https://github.com/mbg033/bitmonero.git
-BITMONERO_BRANCH=fee-mul
+BITMONERO_BRANCH=devel
# thanks to SO: http://stackoverflow.com/a/20283965/4118915
-CPU_CORE_COUNTS=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
+CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
pushd $(pwd)
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
diff --git a/monero-core.pro b/monero-core.pro
index b345a3d7..84d4f35a 100644
--- a/monero-core.pro
+++ b/monero-core.pro
@@ -67,6 +67,7 @@ win32 {
unix {
LIBS+= \
+ -Wl,-Bstatic \
-lboost_serialization \
-lboost_thread \
-lboost_system \
@@ -74,8 +75,11 @@ unix {
-lboost_filesystem \
-lboost_regex \
-lboost_chrono \
- -lboost_program_options
-
+ -lboost_program_options \
+ -lssl \
+ -lcrypto \
+ -Wl,-Bdynamic \
+ -ldl
}