diff --git a/wallet.sln b/msvc/wallet.sln similarity index 88% rename from wallet.sln rename to msvc/wallet.sln index 60c3902..253f09c 100644 --- a/wallet.sln +++ b/msvc/wallet.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.7.34031.279 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wallet", "msvc\wallet.vcxproj", "{B1EC18D5-FA70-4A59-8CAE-EDC65A358314}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wallet", "wallet.vcxproj", "{B1EC18D5-FA70-4A59-8CAE-EDC65A358314}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/msvc/win.bat b/msvc/win.bat index 13a3401..1824e32 100644 --- a/msvc/win.bat +++ b/msvc/win.bat @@ -2,14 +2,14 @@ echo on 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 -msbuild wallet.sln -p:Configuration=Debug;Platform=x64 -m +msbuild msvc/wallet.sln -p:Configuration=Debug;Platform=x64 -m echo off IF %ERRORLEVEL% NEQ 0 ( PAUSE GOTO:EOF ) echo on -msbuild wallet.sln -p:Configuration=Release;Platform=x64 -m +msbuild msvc/wallet.sln -p:Configuration=Release;Platform=x64 -m echo off IF %ERRORLEVEL% NEQ 0 ( PAUSE diff --git a/msvc/winConfig.bat b/msvc/winConfig.bat index d5de85e..8cb7feb 100644 --- a/msvc/winConfig.bat +++ b/msvc/winConfig.bat @@ -95,14 +95,14 @@ IF %ERRORLEVEL% NEQ 0 ( echo on cd ..\..\.. -msbuild wallet.sln -p:Configuration=Debug;Platform=x64 -m +msbuild msvc/wallet.sln -p:Configuration=Debug;Platform=x64 -m echo off IF %ERRORLEVEL% NEQ 0 ( PAUSE GOTO:EOF ) echo on -msbuild wallet.sln -p:Configuration=Release;Platform=x64 -m +msbuild msvc/wallet.sln -p:Configuration=Release;Platform=x64 -m echo off IF %ERRORLEVEL% NEQ 0 ( PAUSE diff --git a/msvc/winConfigDebug.bat b/msvc/winConfigDebug.bat index 85bb725..3ba96c1 100644 --- a/msvc/winConfigDebug.bat +++ b/msvc/winConfigDebug.bat @@ -81,7 +81,7 @@ IF %ERRORLEVEL% NEQ 0 ( cd ..\..\.. -msbuild wallet.sln -p:Configuration=Debug;Platform=x64 -m +msbuild msvc/wallet.sln -p:Configuration=Debug;Platform=x64 -m .\build\Debug\wallet.exe --complete --test echo off IF %ERRORLEVEL% NEQ 0 ( diff --git a/msvc/winConfigRelease.bat b/msvc/winConfigRelease.bat index eb2396a..8093208 100644 --- a/msvc/winConfigRelease.bat +++ b/msvc/winConfigRelease.bat @@ -84,7 +84,7 @@ IF %ERRORLEVEL% NEQ 0 ( echo on cd ..\..\.. -msbuild wallet.sln -p:Configuration=Release;Platform=x64 -m +msbuild msvc/wallet.sln -p:Configuration=Release;Platform=x64 -m echo off IF %ERRORLEVEL% NEQ 0 ( PAUSE diff --git a/msvc/winConfigWidgets.bat b/msvc/winConfigWidgets.bat index e369691..c55e340 100644 --- a/msvc/winConfigWidgets.bat +++ b/msvc/winConfigWidgets.bat @@ -2,18 +2,7 @@ echo on 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 wxWidgets\build\msw -echo on -msbuild wx_vc17.sln -m -p:Configuration=Debug;Platform=x64;PlatformToolset=v143;WindowsTargetPlatformVersion=10.0 -echo off -IF %ERRORLEVEL% NEQ 0 ( - PAUSE - GOTO:EOF -) - -echo on -cd ..\..\.. -msbuild wallet.sln -p:Configuration=Debug;Platform=x64 -m +msbuild msvc/wallet.sln -p:Configuration=Debug;Platform=x64 -m echo off IF %ERRORLEVEL% NEQ 0 ( PAUSE