Skip to content

Commit 77f77a6

Browse files
committed
Add Visual Studio 2022 support
1 parent aed28f9 commit 77f77a6

24 files changed

Lines changed: 1558 additions & 0 deletions

builds/msvc/build/buildall.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
@ECHO OFF
22

3+
CALL buildbase.bat ..\vs2022\libsodium.sln 17
4+
ECHO.
35
CALL buildbase.bat ..\vs2019\libsodium.sln 16
46
ECHO.
57
CALL buildbase.bat ..\vs2017\libsodium.sln 15

builds/msvc/build/buildbase.bat

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,17 @@ SET version=%2
88
SET log=build_%version%.log
99
SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat
1010

11+
IF %version% == 17 (
12+
SET tools=Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
13+
SET environment="%programfiles%\!tools!"
14+
IF NOT EXIST !environment! (
15+
SET environment="%programfiles(x86)%\!tools!"
16+
IF NOT EXIST !environment! (
17+
SET tools=Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat
18+
)
19+
)
20+
)
21+
1122
IF %version% == 16 (
1223
SET tools=Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
1324
SET environment="%programfiles%\!tools!"

builds/msvc/vs2010/libsodium/libsodium.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hchacha20.h" />
201201
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
202202
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
203+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
203204
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
204205
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
205206
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,9 @@
389389
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
390390
<Filter>include\sodium</Filter>
391391
</ClInclude>
392+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
393+
<Filter>include\sodium</Filter>
394+
</ClInclude>
392395
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
393396
<Filter>include\sodium</Filter>
394397
</ClInclude>

builds/msvc/vs2012/libsodium/libsodium.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hchacha20.h" />
201201
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
202202
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
203+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
203204
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
204205
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
205206
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,9 @@
389389
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
390390
<Filter>include\sodium</Filter>
391391
</ClInclude>
392+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
393+
<Filter>include\sodium</Filter>
394+
</ClInclude>
392395
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
393396
<Filter>include\sodium</Filter>
394397
</ClInclude>

builds/msvc/vs2013/libsodium/libsodium.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hchacha20.h" />
201201
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
202202
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
203+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
203204
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
204205
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
205206
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,9 @@
389389
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
390390
<Filter>include\sodium</Filter>
391391
</ClInclude>
392+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
393+
<Filter>include\sodium</Filter>
394+
</ClInclude>
392395
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
393396
<Filter>include\sodium</Filter>
394397
</ClInclude>

builds/msvc/vs2015/libsodium/libsodium.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hchacha20.h" />
201201
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
202202
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
203+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
203204
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
204205
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
205206
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,9 @@
389389
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
390390
<Filter>include\sodium</Filter>
391391
</ClInclude>
392+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
393+
<Filter>include\sodium</Filter>
394+
</ClInclude>
392395
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
393396
<Filter>include\sodium</Filter>
394397
</ClInclude>

0 commit comments

Comments
 (0)