[liblzma] Enabled UWP builds

This commit is contained in:
Aybe 2018-07-14 23:03:36 +02:00
parent 8d389323a7
commit 8cfc78e890
2 changed files with 31 additions and 4 deletions

View File

@ -0,0 +1,26 @@
diff --git a/src/common/tuklib_physmem.c b/src/common/tuklib_physmem.c
index 4053ad0..c49db6d 100644
--- a/src/common/tuklib_physmem.c
+++ b/src/common/tuklib_physmem.c
@@ -79,6 +79,13 @@ tuklib_physmem(void)
uint64_t ret = 0;
#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined (WINAPI_FAMILY_PARTITION) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
+ MEMORYSTATUSEX ms;
+ ms.dwLength = sizeof(ms);
+ if(!GlobalMemoryStatusEx(&ms))
+ return 0;
+ return ms.ullTotalPhys;
+#else
if ((GetVersion() & 0xFF) >= 5) {
// Windows 2000 and later have GlobalMemoryStatusEx() which
// supports reporting values greater than 4 GiB. To keep the
@@ -107,6 +114,7 @@ tuklib_physmem(void)
GlobalMemoryStatus(&meminfo);
ret = meminfo.dwTotalPhys;
}
+#endif
#elif defined(__OS2__)
unsigned long mem;

View File

@ -1,7 +1,3 @@
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
message(FATAL_ERROR "${PORT} does not currently support UWP")
endif()
include(vcpkg_common_functions) include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
@ -12,6 +8,11 @@ vcpkg_from_github(
HEAD_REF master HEAD_REF master
) )
vcpkg_apply_patches(
SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/v5.2.3-b3437cea7b
PATCHES "${CMAKE_CURRENT_LIST_DIR}/enable-uwp-builds.patch"
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake( vcpkg_configure_cmake(