Fixup

microsoft · Aug 29, 2024 · ecda621 · ecda621
1 parent ea6f062
commit ecda621
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/ports/openvpn3/dependencies.diff b/ports/openvpn3/dependencies.diff
@@ -1,5 +1,5 @@
 diff --git a/cmake/findcoredeps.cmake b/cmake/findcoredeps.cmake
-index b7d00d4..b13eed1 100644
+index b7d00d4..bca73dc 100644
 --- a/cmake/findcoredeps.cmake
 +++ b/cmake/findcoredeps.cmake
 @@ -30,7 +30,7 @@ endif ()
@@ -20,7 +20,21 @@ index b7d00d4..b13eed1 100644
  endfunction()
 
 
-@@ -93,10 +93,10 @@ function(add_core_dependencies target)
+@@ -55,8 +55,12 @@ function(add_core_dependencies target)
+             )
+
+     if (WIN32)
++        set(win32_winnt 0x0600)
++        if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
++            set(win32_winnt 0x0603) # for asio/detail/config.hpp
++        endif()
+         target_compile_definitions(${target} PRIVATE
+-                -D_WIN32_WINNT=0x0600
++                -D_WIN32_WINNT=${win32_winnt}
+                 -DTAP_WIN_COMPONENT_ID=tap0901
+                 -D_CRT_SECURE_NO_WARNINGS
+                 -DASIO_DISABLE_LOCAL_SOCKETS
+@@ -93,10 +97,10 @@ function(add_core_dependencies target)
      # a patched version. So we want to prefer its include
      # directories.
      find_package(asio REQUIRED)
@@ -33,7 +47,7 @@ index b7d00d4..b13eed1 100644
 
      add_ssl_library(${target})
 
-@@ -105,14 +105,16 @@ function(add_core_dependencies target)
+@@ -105,14 +109,16 @@ function(add_core_dependencies target)
          find_library(iokit IOKit)
          find_library(coreServices CoreServices)
          find_library(systemConfiguration SystemConfiguration)

diff --git a/versions/o-/openvpn3.json b/versions/o-/openvpn3.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "4858782b6dbe9854c19dfa004bef3a4acfc55d25",
+      "git-tree": "745fa6d0653115895178f4ea1719c5ef2f832674",
       "version": "3.10",
       "port-version": 0
     },