Merge pull request #27 from adam-p/master

fix compilation with new clang and new MSVC
Psiphon-Inc · Dec 18, 2024 · c8d849a · c8d849a
2 parents a62459e + ab4cc0e
commit c8d849a
Show file tree

Hide file tree

Showing 4 changed files with 5,362 additions and 1,857 deletions.
diff --git a/base64.hpp b/base64.hpp
@@ -22,6 +22,7 @@
 
 #include <vector>
 #include <string>
+#include <cstdint>
 
 namespace base64 {
 

diff --git a/build-windows.bat b/build-windows.bat
@@ -12,12 +12,12 @@ chdir build
 
 
 REM Make the MSVC project
-cmake -G "Visual Studio 16 2019" -A Win32 ..
+cmake -G "Visual Studio 17 2022" -A Win32 ..
 if "%ERRORLEVEL%" == "1" exit /B 1
 
 REM Build for Debug and MinSizeRel
 REM This doesn't need to be called in the GitHub Action build
-if "%GITHUB_ACTION%" == "" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
+if "%GITHUB_ACTION%" == "" call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars32.bat"
 if "%ERRORLEVEL%" == "1" exit /B 1
 msbuild.exe -p:Configuration=Debug -p:PlatformToolset=v140 -p:PreferredToolArchitecture=x86 -p:Platform=x86 -p:PlatformTarget=x86 psicash.vcxproj
 if "%ERRORLEVEL%" == "1" exit /B 1