Merge #420

420: Update libsodium submodule to latest stable branch commit. r=kpp a=adamreichold Co-authored-by: Adam Reichold <adam.reichold@t-online.de>
sodiumoxide · Jul 2, 2020 · 21d510c · 21d510c
2 parents 5730d8e + 486eb25
commit 21d510c
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 5 deletions.
diff --git a/libsodium-sys/build.rs b/libsodium-sys/build.rs
@@ -312,18 +312,18 @@ fn is_release_profile() -> bool {
 #[cfg(all(target_env = "msvc", target_pointer_width = "32"))]
 fn get_lib_dir() -> PathBuf {
     if is_release_profile() {
-        get_crate_dir().join("msvc/Win32/Release/v140/")
+        get_crate_dir().join("msvc/Win32/Release/v142/")
     } else {
-        get_crate_dir().join("msvc/Win32/Debug/v140/")
+        get_crate_dir().join("msvc/Win32/Debug/v142/")
     }
 }
 
 #[cfg(all(target_env = "msvc", target_pointer_width = "64"))]
 fn get_lib_dir() -> PathBuf {
     if is_release_profile() {
-        get_crate_dir().join("msvc/x64/Release/v140/")
+        get_crate_dir().join("msvc/x64/Release/v142/")
     } else {
-        get_crate_dir().join("msvc/x64/Debug/v140/")
+        get_crate_dir().join("msvc/x64/Debug/v142/")
     }
 }
 

diff --git a/libsodium-sys/libsodium b/libsodium-sys/libsodium
diff --git a/libsodium-sys/mingw/win32/libsodium.a b/libsodium-sys/mingw/win32/libsodium.a
diff --git a/libsodium-sys/mingw/win64/libsodium.a b/libsodium-sys/mingw/win64/libsodium.a
diff --git a/libsodium-sys/msvc/Win32/Debug/v140/libsodium.lib b/libsodium-sys/msvc/Win32/Debug/v140/libsodium.lib
diff --git a/libsodium-sys/msvc/Win32/Debug/v142/libsodium.lib b/libsodium-sys/msvc/Win32/Debug/v142/libsodium.lib
diff --git a/libsodium-sys/msvc/Win32/Release/v140/libsodium.lib b/libsodium-sys/msvc/Win32/Release/v140/libsodium.lib
diff --git a/libsodium-sys/msvc/Win32/Release/v142/libsodium.lib b/libsodium-sys/msvc/Win32/Release/v142/libsodium.lib
diff --git a/libsodium-sys/msvc/x64/Debug/v140/libsodium.lib b/libsodium-sys/msvc/x64/Debug/v140/libsodium.lib
diff --git a/libsodium-sys/msvc/x64/Debug/v142/libsodium.lib b/libsodium-sys/msvc/x64/Debug/v142/libsodium.lib
diff --git a/libsodium-sys/msvc/x64/Release/v140/libsodium.lib b/libsodium-sys/msvc/x64/Release/v140/libsodium.lib
diff --git a/libsodium-sys/msvc/x64/Release/v142/libsodium.lib b/libsodium-sys/msvc/x64/Release/v142/libsodium.lib