From 61f4db61ecb785f95a2ab6f925015227a388b308 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Sun, 22 Jan 2017 21:00:34 +0100 Subject: [PATCH 1/2] Update submodule + fix epee link --- monero | 2 +- monero-wallet-gui.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monero b/monero index 16b8b66a..daf66621 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit 16b8b66adcad57983b099fdf3ac1b52519390bc6 +Subproject commit daf66621dcf43f36067465a1f1c99f5b1390c400 diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index dab04749..e6a9a675 100644 --- 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 From 84824814783239f652de92c4b79db628477eeb7e Mon Sep 17 00:00:00 2001 From: Jaquee Date: Sun, 22 Jan 2017 21:13:13 +0100 Subject: [PATCH 2/2] pin submodule to monero head --- get_libwallet_api.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 9d52b911..d66c4c8f 100755 --- 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