Merge pull request #122 from afedchin/win10

[win10] update patch for libxml2
kodi-pvr · Apr 26, 2019 · 92ab8e8 · 92ab8e8
2 parents 05a4245 + 2dfce6c
commit 92ab8e8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 19 deletions.
diff --git a/depends/windowsstore/libxml2/02-fix-uwp-api.patch b/depends/windowsstore/libxml2/02-fix-uwp-api.patch
@@ -1,21 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 913da3e..07cbec1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,7 +147,12 @@ target_include_directories(
- target_compile_definitions(libxml2 
-   PRIVATE 
-   _CRT_SECURE_NO_WARNINGS
--  _CRT_STDC_NO_DEPRECATE)
-+  _CRT_SECURE_NO_DEPRECATE
-+  _CRT_STDC_NO_DEPRECATE
-+  _CRT_NONSTDC_NO_DEPRECATE
-+  HAVE_WIN32_THREADS
-+  _WINSOCK_DEPRECATED_NO_WARNINGS
-+)
-
- if(BUILD_SHARED_LIBS AND MSVC)
-   target_link_libraries(libxml2 PRIVATE ws2_32.lib)
 diff --git a/catalog.c b/catalog.c
 index 6dfdfbb..a5655f0 100644
 --- a/catalog.c

diff --git a/depends/windowsstore/libxml2/CMakeLists.txt b/depends/windowsstore/libxml2/CMakeLists.txt
@@ -421,7 +421,7 @@ target_link_libraries(xml2 ${ZLIB_LIBRARIES})
 if(NOT WIN32)
   set_target_properties(xml2 PROPERTIES COMPILE_FLAGS "-fPIC")
 else()
-  add_definitions(-DHAVE_ZLIB_H -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+  add_definitions(-DHAVE_ZLIB_H -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_STDC_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS)
   set_target_properties(xml2 PROPERTIES COMPILE_FLAGS "/W1")
 endif()