From 61aa3ff141a33409db9f4c1d3d53279f63498d9c Mon Sep 17 00:00:00 2001
From: Cheng <ChengSheng@fakemail.ch>
Date: Sun, 17 Sep 2023 18:25:49 +1000
Subject: [PATCH] Updating libsodium - they finally made a release, though I
 have been using their unreleased versions for a very long time.

The release has radically reorganized the build process, probably
to support arm builds
---
 libsodium          | 2 +-
 msvc/winConfig.bat | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libsodium b/libsodium
index 11d0a17..5bfb49a 160000
--- a/libsodium
+++ b/libsodium
@@ -1 +1 @@
-Subproject commit 11d0a17dbbe3f484f2b214c022d244773f26b5ec
+Subproject commit 5bfb49a8e40afe7aa349dd469bd11d9d76c71930
diff --git a/msvc/winConfig.bat b/msvc/winConfig.bat
index f07f430..e07468d 100644
--- a/msvc/winConfig.bat
+++ b/msvc/winConfig.bat
@@ -2,8 +2,8 @@ echo on
 call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat
 call C:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
 echo on
-cd libsodium
-msbuild libsodium.vcxproj -p:Configuration=Release;Platform=x64;PlatformToolset=v143;WindowsTargetPlatformVersion=10.0 -m
+cd libsodium/builds/msvc/vs2022
+msbuild libsodium.sln -p:Configuration=StaticRelease;Platform=x64 -m
 echo off
 IF %ERRORLEVEL% NEQ 0 (
 	cd ..
@@ -11,7 +11,7 @@ IF %ERRORLEVEL% NEQ 0 (
 	GOTO:EOF
 )
 echo on
-msbuild libsodium.vcxproj -p:Configuration=Debug;Platform=x64;PlatformToolset=v143;WindowsTargetPlatformVersion=10.0 -m
+msbuild libsodium.sln -p:Configuration=StaticDebug;Platform=x64 -m
 echo off
 IF %ERRORLEVEL% NEQ 0 (
 	cd ..
@@ -19,7 +19,8 @@ IF %ERRORLEVEL% NEQ 0 (
 	GOTO:EOF
 )
 echo on
-cd ..\mpir\msvc\vs22
+cd ../../../..
+cd mpir\msvc\vs22
 call msbuild.bat gc lib x64 Debug
 echo off
 IF %ERRORLEVEL% NEQ 0 (