diff --git a/wallet.vcxproj b/wallet.vcxproj index f14bafc..9616258 100644 --- a/wallet.vcxproj +++ b/wallet.vcxproj @@ -44,13 +44,13 @@ true GSL\include;wxWidgets\include\msvc;wxWidgets\include;libsodium\src\libsodium\include;mpir;$(IncludePath) - wxWidgets\lib\vc_x64_lib\;libsodium\Build\Debug\X64;mpir\msvc\vs19\lib_mpir_cxx\x64\Debug;mpir\msvc\vs19\lib_mpir_gc\x64\Debug;$(LibraryPath) + wxWidgets\lib\vc_x64_lib\;libsodium\Build\Debug\X64;mpir\lib\x64\Debug;$(LibraryPath) false GSL\include;wxWidgets\include\msvc;wxWidgets\include;libsodium\src\libsodium\include;mpir;$(IncludePath) - wxWidgets\lib\vc_x64_lib\;libsodium\Build\Release\X64;mpir\msvc\vs19\lib_mpir_cxx\x64\Release;mpir\msvc\vs19\lib_mpir_gc\x64\Release;$(LibraryPath) + wxWidgets\lib\vc_x64_lib\;libsodium\Build\Release\X64;mpir\lib\x64\Release;$(LibraryPath) diff --git a/winConfigure.bat b/winConfigure.bat index 096fd84..f79d56d 100644 --- a/winConfigure.bat +++ b/winConfigure.bat @@ -23,7 +23,7 @@ IF %ERRORLEVEL% NEQ 0 ( GOTO:EOF ) echo on -cd ..\mpir\msvc\vs19 +cd ..\mpir\msvc\vs22 call msbuild.bat gc lib x64 Debug echo off IF %ERRORLEVEL% NEQ 0 ( diff --git a/winConfigure.sh b/winConfigure.sh index f09f8f1..ae1bd07 100644 --- a/winConfigure.sh +++ b/winConfigure.sh @@ -40,7 +40,7 @@ cat $src | sed 's/SET[[:blank:]]\+CFLAGS=%CFLAGS%[[:blank:]]\(.*\)\/MT\(.*\)DSOD unix2dos tempx mv -v tempx $src -src=mpir/msvc/vs19/lib_mpir_gc/lib_mpir_gc.vcxproj +src=mpir/msvc/vs22/lib_mpir_gc/lib_mpir_gc.vcxproj dest=$src cat $src | grep -v RuntimeLibrary | sed 's/^\(.*\)NDEBUG\(.*\)$/\1NDEBUG\2\ MultiThreadedDLL<\/RuntimeLibrary>/g' | sed 's/v[[:digit:]]\{3\}/v143/g' | sed 's/^\(.*\)_DEBUG\(.*\)$/\1_DEBUG\2\ @@ -48,7 +48,7 @@ cat $src | grep -v RuntimeLibrary | sed 's/^\(.*\)NDEBU unix2dos tempx mv -v tempx $dest -src=mpir/msvc/vs19/dll_mpir_gc/dll_mpir_gc.vcxproj +src=mpir/msvc/vs22/dll_mpir_gc/dll_mpir_gc.vcxproj dest=$src cat $src | grep -v RuntimeLibrary | sed 's/^\(.*\)NDEBUG\(.*\)$/\1NDEBUG\2\ MultiThreadedDLL<\/RuntimeLibrary>/g' | sed 's/v[[:digit:]]\{3\}/v143/g' | sed 's/^\(.*\)_DEBUG\(.*\)$/\1_DEBUG\2\ @@ -56,7 +56,7 @@ cat $src | grep -v RuntimeLibrary | sed 's/^\(.*\)NDEBU unix2dos tempx mv -v tempx $dest -src=mpir/msvc/vs19/lib_mpir_cxx/lib_mpir_cxx.vcxproj +src=mpir/msvc/vs22/lib_mpir_cxx/lib_mpir_cxx.vcxproj dest=$src cat $src | grep -v RuntimeLibrary | sed 's/^\(.*\)NDEBUG\(.*\)$/\1NDEBUG\2\ MultiThreadedDLL<\/RuntimeLibrary>/g' | sed 's/v[[:digit:]]\{3\}/v143/g' | sed 's/^\(.*\)_DEBUG\(.*\)$/\1_DEBUG\2\