Merge pull request #1443

377c56d Add libwinscard to link line on Windows
Merge pull request #1442
2018-06-05 12:58:42 -05:00 · 2018-06-05 12:57:21 -05:00 · 2018-06-02 20:21:24 +02:00 · 2018-06-02 19:19:47 +02:00 · 2018-05-27 08:38:04 -05:00 · 2018-05-27 13:05:50 +02:00
2 changed files with 2 additions and 1 deletions
--- a/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -17,7 +17,7 @@ if [ ! -d $MONERO_DIR/src ]; then
 fi
 git submodule update --remote
 git -C $MONERO_DIR fetch
-git -C $MONERO_DIR checkout release-v0.12
+git -C $MONERO_DIR checkout v0.12.2.0

 # get monero core tag
 get_tag
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -245,6 +245,7 @@ win32 {
        -lssl \
        -lcrypto \
        -Wl,-Bdynamic \
+        -lwinscard \
        -lws2_32 \
        -lwsock32 \
        -lIphlpapi \
Author	SHA1	Message	Date
luigi1111	d85f3eae7c	Merge pull request #1443 `377c56d` Add libwinscard to link line on Windows	2018-06-05 12:58:42 -05:00
luigi1111	5f46c41598	Merge pull request #1442 `5bb24cf` Update submodule for v0.12.2.0	2018-06-05 12:57:21 -05:00
iDunk5400	377c56d4a4	Add libwinscard to link line on Windows This fixes monero-wallet-gui linking error in MSYS2 since PC/SC hw device support was added to Windows builds	2018-06-02 20:21:24 +02:00
dEBRUYNE-1	5bb24cfc92	Update submodule for v0.12.2.0	2018-06-02 19:19:47 +02:00
luigi1111	b40363cd88	Merge pull request #1432 `a412ab7` Submodule: use v0.12.1.0 tag instead of branch	2018-05-27 08:38:04 -05:00
dEBRUYNE-1	a412ab7b80	Submodule: use v0.12.1.0 tag instead of branch	2018-05-27 13:05:50 +02:00