From 4d0c7924d22ffaa620884c8177e21f89261d057a Mon Sep 17 00:00:00 2001 From: Chun Kuan Lee Date: Tue, 14 Aug 2018 08:37:09 +0800 Subject: [PATCH 1/3] Make macro compatible with MSVC --- src/ui_interface.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui_interface.h b/src/ui_interface.h index 992c585b1..fe466b3ca 100644 --- a/src/ui_interface.h +++ b/src/ui_interface.h @@ -75,9 +75,9 @@ public: MSG_ERROR = (ICON_ERROR | BTN_OK | MODAL) }; -#define ADD_SIGNALS_DECL_WRAPPER(signal_name, rtype, args...) \ - rtype signal_name(args); \ - using signal_name##Sig = rtype(args); \ +#define ADD_SIGNALS_DECL_WRAPPER(signal_name, rtype, ...) \ + rtype signal_name(__VA_ARGS__); \ + using signal_name##Sig = rtype(__VA_ARGS__); \ boost::signals2::connection signal_name##_connect(std::function fn); \ void signal_name##_disconnect(std::function fn); From 90cc69c0c7b0fcfa604584e2666060488346e9fc Mon Sep 17 00:00:00 2001 From: Chun Kuan Lee Date: Tue, 14 Aug 2018 11:41:16 +0800 Subject: [PATCH 2/3] ci: Add appveyor.yml to build on MSVC --- appveyor.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 000000000..0c0c3d066 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,34 @@ +skip_tags: true +image: Visual Studio 2017 +configuration: Release +platform: x64 +environment: + APPVEYOR_SAVE_CACHE_ON_ERROR: true +cache: C:\tools\vcpkg\installed\ +before_build: +- ps: >- + $packages = @( + "boost-filesystem", + "boost-signals2", + "boost-interprocess", + "boost-test", + "libevent", + "openssl", + "zeromq", + "berkeleydb", + "secp256k1", + "leveldb" + ) + + for ($i=0; $i -lt $packages.length; $i++) { + $all_packages += $packages[$i] + ":" + $env:PLATFORM + "-windows-static " + } + + Invoke-Expression -Command "vcpkg install $all_packages" +build: + project: build_msvc\bitcoin.sln + parallel: true + verbosity: minimal +test_script: +- cmd: build_msvc\%PLATFORM%\Release\test_bitcoin.exe +deploy: off From 1f6ff04e59fcd1f2315d194f096665d73c8922d2 Mon Sep 17 00:00:00 2001 From: Chun Kuan Lee Date: Tue, 14 Aug 2018 09:18:19 +0000 Subject: [PATCH 3/3] Use wildcard path in test_bitcoin.vcxproj --- build_msvc/test_bitcoin/test_bitcoin.vcxproj | 68 +------------------- 1 file changed, 3 insertions(+), 65 deletions(-) diff --git a/build_msvc/test_bitcoin/test_bitcoin.vcxproj b/build_msvc/test_bitcoin/test_bitcoin.vcxproj index 0ab97643f..444a2ed72 100644 --- a/build_msvc/test_bitcoin/test_bitcoin.vcxproj +++ b/build_msvc/test_bitcoin/test_bitcoin.vcxproj @@ -20,72 +20,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - @@ -266,4 +204,4 @@ - \ No newline at end of file +