diff options
| author | Ilya Kitaev <mbg033@gmail.com> | 2016-09-01 23:22:06 +0300 |
|---|---|---|
| committer | Ilya Kitaev <mbg033@gmail.com> | 2016-09-01 23:22:06 +0300 |
| commit | db965e1265dbbcfd8b2874b0ac0e8efd346322a4 (patch) | |
| tree | 115dfffc2fe80620451a87f77a983cc0fdedab44 | |
| parent | 497a6b8de3bec6bc266246d0e02bdfbc37d64782 (diff) | |
| download | monzero-gui-db965e1265dbbcfd8b2874b0ac0e8efd346322a4.tar.gz monzero-gui-db965e1265dbbcfd8b2874b0ac0e8efd346322a4.tar.xz monzero-gui-db965e1265dbbcfd8b2874b0ac0e8efd346322a4.zip | |
changes due updates in bitmonero
| -rwxr-xr-x | get_libwallet_api.sh | 2 | ||||
| -rw-r--r-- | monero-core.pro | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index bbfdb04c..414b1f90 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -2,7 +2,7 @@ BITMONERO_URL=https://github.com/mbg033/bitmonero.git -BITMONERO_BRANCH=develop +BITMONERO_BRANCH=master # thanks to SO: http://stackoverflow.com/a/20283965/4118915 CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu) pushd $(pwd) diff --git a/monero-core.pro b/monero-core.pro index 2dde61fe..4b2bbf25 100644 --- a/monero-core.pro +++ b/monero-core.pro @@ -45,8 +45,7 @@ SOURCES = *.qml \ } LIBS += -L$$WALLET_ROOT/lib \ - -lwallet_merged \ - -lwallet_merged2 + -lwallet_merged win32 { #QMAKE_LFLAGS += -static |