mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-09 18:39:18 +08:00
a6ef376f0d
* [Poco] update to 1.11.0 * update version * fix ci error * update version * Modernizes the port * update poco * update portfile.cmake * update version
63 lines
2.1 KiB
Diff
63 lines
2.1 KiB
Diff
diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h
|
|
index 9a945f3..f5a9a7f 100644
|
|
--- a/Foundation/include/Poco/Platform.h
|
|
+++ b/Foundation/include/Poco/Platform.h
|
|
@@ -191,7 +191,7 @@
|
|
#else
|
|
#define POCO_ARCH_LITTLE_ENDIAN 1
|
|
#endif
|
|
-#elif defined(__arm64__) || defined(__arm64)
|
|
+#elif defined(__arm64__) || defined(__arm64) || defined(_M_ARM64)
|
|
#define POCO_ARCH POCO_ARCH_ARM64
|
|
#if defined(__ARMEB__)
|
|
#define POCO_ARCH_BIG_ENDIAN 1
|
|
diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp
|
|
index 1f51296..c67b71b 100644
|
|
--- a/Foundation/src/EventLogChannel.cpp
|
|
+++ b/Foundation/src/EventLogChannel.cpp
|
|
@@ -11,6 +11,7 @@
|
|
// SPDX-License-Identifier: BSL-1.0
|
|
//
|
|
|
|
+#pragma comment(lib,"advapi32.lib")
|
|
|
|
#include "Poco/EventLogChannel.h"
|
|
#include "Poco/Message.h"
|
|
diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h
|
|
index 4328344..5eeafcd 100644
|
|
--- a/Foundation/src/utils.h
|
|
+++ b/Foundation/src/utils.h
|
|
@@ -91,7 +91,7 @@ int main(int argc, char** argv) {
|
|
//
|
|
// If it prints "correct" then the architecture should be here, in the "correct" section.
|
|
#if defined(_M_X64) || defined(__x86_64__) || \
|
|
- defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
|
|
+ defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || defined(_M_ARM64) || \
|
|
defined(__hppa__) || defined(__ia64__) || \
|
|
defined(__mips__) || \
|
|
defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
|
|
diff --git a/Net/src/Net.cpp b/Net/src/Net.cpp
|
|
index 1a75379..b4081fd 100644
|
|
--- a/Net/src/Net.cpp
|
|
+++ b/Net/src/Net.cpp
|
|
@@ -11,6 +11,7 @@
|
|
// SPDX-License-Identifier: BSL-1.0
|
|
//
|
|
|
|
+#pragma comment(lib,"advapi32.lib")
|
|
|
|
#include "Poco/Net/Net.h"
|
|
|
|
diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp
|
|
index 7fd1a28..a07c5d2 100644
|
|
--- a/Util/src/WinRegistryKey.cpp
|
|
+++ b/Util/src/WinRegistryKey.cpp
|
|
@@ -11,6 +11,7 @@
|
|
// SPDX-License-Identifier: BSL-1.0
|
|
//
|
|
|
|
+#pragma comment(lib,"advapi32.lib")
|
|
|
|
#include "Poco/Util/WinRegistryKey.h"
|
|
#include "Poco/Exception.h"
|