From 5146bbbadc92cfb349c88dfa6e5682cbdf672482 Mon Sep 17 00:00:00 2001
From: Yihong Wu <contact@domosekai.com>
Date: Sat, 28 May 2022 12:16:35 +0900
Subject: [PATCH 1/2] Remove vcpkg baseline as openssl build has been fixed
 upstream

---
 vcpkg.json | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/vcpkg.json b/vcpkg.json
index 60a28e22..46686595 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -6,12 +6,5 @@
     "libsodium",
     "openssl",
     "zlib"
-  ],
-  "overrides": [
-    {
-      "name": "openssl",
-      "version-string": "1.1.1n"
-    }
-  ],
-  "builtin-baseline": "f6af75acc923c833a5620943e3fc7d5e4930f0df"
+  ]
 }
\ No newline at end of file

From 333cbb3f29c143fe08311790452c13c01f86c18c Mon Sep 17 00:00:00 2001
From: Yihong Wu <54519668+domosekai@users.noreply.github.com>
Date: Wed, 18 May 2022 13:53:27 +0900
Subject: [PATCH 2/2] Update Windows build instructions

Co-authored-by: Davide Beatrici <github@davidebeatrici.dev>
---
 src/BUILD_WINDOWS.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/BUILD_WINDOWS.md b/src/BUILD_WINDOWS.md
index 07ca5bd8..2b691371 100644
--- a/src/BUILD_WINDOWS.md
+++ b/src/BUILD_WINDOWS.md
@@ -43,6 +43,19 @@ into it. So that is what will be described below.
   C:\vcpkg> vcpkg integrate install
   ```
 
+## Update
+
+- vcpkg
+
+  You are recommended to update vcpkg from time to time, so that the latest libraries are used in the build.
+
+  Go to the installation path, pull the latest repo and the binary:
+
+  ```
+  C:\vcpkg> git pull
+  C:\vcpkg> bootstrap-vcpkg.bat
+  ```
+  
 ## Building
 
 1. Launch Visual Studio
@@ -55,6 +68,8 @@ into it. So that is what will be described below.
 
    **Note**: This step is not necessary if you have chosen **Clone a repository** as Visual Studio automatically takes care of it.
 
+1. Switch to folder view in the solution explorer
+
 1. Select a configuration from the dropdown menu below the search box. The default configurations are:
 
    - x64-native
@@ -88,3 +103,25 @@ into it. So that is what will be described below.
    Run `vpnsetup.exe` to install desired components.
 
 1. Congrats, you now have a complete CMake development environment for SoftEtherVPN on Windows, enjoy and happy contributing!
+
+## Notes
+
+1. Build number
+
+   You can change the build number in `CMakeSettings.json`. Use any integer no less than 5180.
+
+   Delete and regenerate CMake cache after the change.
+
+1. 32-bit Windows
+
+   You don't need 32-bit Windows to build 32-bit executables. However, if 32-bit Windows is what you only have, things become a little complicated.
+
+   Visual Studio 2019 is the last version that works on 32-bit Windows. It does the job but its bundled CMake and Ninja are 64-bit versions.
+
+   After the installation of VS 2019, you need to download 32-bit CMake and Ninja and replace those that come with VS in:
+
+   ```
+   C:\Program Files\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake
+   ```
+
+   Currently CMake has an official x86 installer but Ninja does not. You may need to download from a 3rd party or build from source.