diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f9fde8..7e2d61d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -194,8 +194,8 @@ elseif (NOT APPLE) endif() if (CMAKE_CXX_COMPILER_ID MATCHES MSVC) - find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_5 PATHS "external/lib/libzmq/Debug") - find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_5 PATHS "external/lib/libzmq/Release") + find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_6 PATHS "external/lib/libzmq/Debug") + find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_6 PATHS "external/lib/libzmq/Release") find_library(UV_LIBRARY_DEBUG NAMES libuv PATHS "external/lib/libuv/Debug") find_library(UV_LIBRARY NAMES libuv PATHS "external/lib/libuv/Release") find_library(CURL_LIBRARY_DEBUG NAMES libcurl-d PATHS "external/lib/libcurl/Debug") diff --git a/external/lib/libuv/Debug/libuv.lib b/external/lib/libuv/Debug/libuv.lib index ba33541..07d0950 100644 Binary files a/external/lib/libuv/Debug/libuv.lib and b/external/lib/libuv/Debug/libuv.lib differ diff --git a/external/lib/libuv/Debug/libuv.pdb b/external/lib/libuv/Debug/libuv.pdb index a6a801d..be4169e 100644 Binary files a/external/lib/libuv/Debug/libuv.pdb and b/external/lib/libuv/Debug/libuv.pdb differ diff --git a/external/lib/libuv/Release/libuv.lib b/external/lib/libuv/Release/libuv.lib index bceb9d2..586462b 100644 Binary files a/external/lib/libuv/Release/libuv.lib and b/external/lib/libuv/Release/libuv.lib differ diff --git a/external/lib/libuv/Release/libuv.pdb b/external/lib/libuv/Release/libuv.pdb index 11a3114..ebe0978 100644 Binary files a/external/lib/libuv/Release/libuv.pdb and b/external/lib/libuv/Release/libuv.pdb differ diff --git a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_5.pdb b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_5.pdb deleted file mode 100644 index 8f59462..0000000 Binary files a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_5.pdb and /dev/null differ diff --git a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_5.lib b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.lib similarity index 73% rename from external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_5.lib rename to external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.lib index 68a9b56..4c60341 100644 Binary files a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_5.lib and b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.lib differ diff --git a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.pdb b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.pdb new file mode 100644 index 0000000..9faeb01 Binary files /dev/null and b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.pdb differ diff --git a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_5.pdb b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_5.pdb deleted file mode 100644 index de89492..0000000 Binary files a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_5.pdb and /dev/null differ diff --git a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_5.lib b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.lib similarity index 55% rename from external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_5.lib rename to external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.lib index 8dd80b5..49f4d77 100644 Binary files a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_5.lib and b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.lib differ diff --git a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.pdb b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.pdb new file mode 100644 index 0000000..907b8e7 Binary files /dev/null and b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.pdb differ diff --git a/external/src/cppzmq b/external/src/cppzmq index c94c207..6164cf7 160000 --- a/external/src/cppzmq +++ b/external/src/cppzmq @@ -1 +1 @@ -Subproject commit c94c20743ed7d4aa37835a5c46567ab0790d4acc +Subproject commit 6164cf7dbc1df6d1bd8e4c6c5f8e52d7dea63aa7 diff --git a/external/src/libuv b/external/src/libuv index 26d43f4..98d70a9 160000 --- a/external/src/libuv +++ b/external/src/libuv @@ -1 +1 @@ -Subproject commit 26d43f49ffaeb0c59471b3bdf6e189a5f2a51d63 +Subproject commit 98d70a9a09a9814b2ab45e7741b0b170f0cec37a diff --git a/external/src/libzmq b/external/src/libzmq index ec013f3..3b26401 160000 --- a/external/src/libzmq +++ b/external/src/libzmq @@ -1 +1 @@ -Subproject commit ec013f3a17beaa475c18e8cf5e93970800e2f94a +Subproject commit 3b264019a24b08246e8a75f5014f893d7b6ffef9 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 00f640d..6cc9880 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -120,8 +120,8 @@ if (STATIC_LIBS) set(CURL_LIBRARY "${CMAKE_SOURCE_DIR}/../external/src/curl/lib/.libs/libcurl.a") else() if (CMAKE_CXX_COMPILER_ID MATCHES MSVC) - find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_5 PATHS "../external/lib/libzmq/Debug") - find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_5 PATHS "../external/lib/libzmq/Release") + find_library(ZMQ_LIBRARY_DEBUG NAMES libzmq-v142-mt-sgd-4_3_6 PATHS "../external/lib/libzmq/Debug") + find_library(ZMQ_LIBRARY NAMES libzmq-v142-mt-s-4_3_6 PATHS "../external/lib/libzmq/Release") find_library(UV_LIBRARY_DEBUG NAMES libuv PATHS "../external/lib/libuv/Debug") find_library(UV_LIBRARY NAMES libuv PATHS "../external/lib/libuv/Release") find_library(CURL_LIBRARY_DEBUG NAMES libcurl-d PATHS "../external/lib/libcurl/Debug") diff --git a/tests/src/check_win7.py b/tests/src/check_win7.py index 234356a..a50e6d5 100644 --- a/tests/src/check_win7.py +++ b/tests/src/check_win7.py @@ -259,6 +259,8 @@ allowedAPIs = { "InitializeSecurityDescriptor", "BCryptGenRandom", "GetConsoleCP", + "DeleteFileW", + "GetTempPathW", } f = open(sys.argv[1], 'r')