Merge pull request #424

8482481 pin submodule to monero head (Jaquee) 61f4db6 Update submodule + fix epee link (Jaquee)
2017-01-23 08:03:40 -05:00
parent 6d73fba14c 8482481478
commit 4cc838f1ff
3 changed files with 3 additions and 3 deletions
--- a/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -15,7 +15,7 @@ BUILD_LIBWALLET=false
 if [ ! -d $MONERO_DIR/src ]; then
    git submodule init monero
 fi
-git submodule update
+git submodule update --remote

 # get monero core tag
 get_tag
--- a/2
+++ b/2
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -73,7 +73,7 @@ SOURCES = *.qml \

 LIBS += -L$$WALLET_ROOT/lib \
        -lwallet_merged \
-        monero/build/release/contrib/epee/src/libepee.a \
+         $$WALLET_ROOT/build/release/contrib/epee/src/libepee.a \
        -lunbound