oops, should merge more often

Merge screwed up in confidently reconciling incompatible edits
This commit is contained in:
Cheng 2022-06-29 12:28:52 +10:00
parent 35946d782c
commit 51b4208cca
No known key found for this signature in database
GPG Key ID: D51301E176B31828

View File

@ -1,5 +1,7 @@
echo on echo off
call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat 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 cd libsodium
msbuild libsodium.vcxproj -p:Configuration=Release;Platform=x64;PlatformToolset=v143;WindowsTargetPlatformVersion=10.0 -m msbuild libsodium.vcxproj -p:Configuration=Release;Platform=x64;PlatformToolset=v143;WindowsTargetPlatformVersion=10.0 -m
echo off echo off