diff --git a/Installer/copy_build.cmd b/Installer/copy_build.cmd index 8744b149..8e053ebe 100644 --- a/Installer/copy_build.cmd +++ b/Installer/copy_build.cmd @@ -7,9 +7,9 @@ set qtPath=%~dp0..\..\Qt\5.15.2\msvc2019_64 set instPath=%~dp0\SbiePlus64 IF %archPath% == x86 ( set archPath=Win32 - set instPath=%~dp0\SbiePlus32 set sysPath=%windir%\SysWOW64 - set qtPath=%~dp0..\..\Qt\5.15.2\msvc2019 + set qtPath=%~dp0..\..\Qt\5.15.2\msvc2019 + set instPath=%~dp0\SbiePlus32 ) set srcPath=%~dp0..\SandboxiePlus\Bin\%archPath%\Release set sbiePath=%~dp0..\Sandboxie\Bin\%archPath%\SbieRelease @@ -24,9 +24,11 @@ mkdir %instPath% ECHO Copying VC Runtime files copy %sysPath%\msvcp140.dll %instPath%\ -copy %sysPath%\vcruntime140.dll %instPath%\ copy %sysPath%\msvcp140_1.dll %instPath%\ -copy %sysPath%\vcruntime140_1.dll %instPath%\ +copy %sysPath%\vcruntime140.dll %instPath%\ +IF %archPath% == x64 ( + copy %sysPath%\vcruntime140_1.dll %instPath%\ +) ECHO Copying Qt libraries @@ -118,7 +120,7 @@ IF %archPath% == x64 ( mkdir %instPath%\32\ copy /y %~dp0..\Sandboxie\Bin\Win32\SbieRelease\SbieSvc.exe %instPath%\32\ copy /y %~dp0..\Sandboxie\Bin\Win32\SbieRelease\SbieDll.dll %instPath%\32\ - + copy /y %~dp0..\SandboxiePlus\x64\Release\SbieShellExt.dll %instPath%\ copy /y %~dp0..\SandboxiePlus\x64\Release\SbieShellPkg.msix %instPath%\ ) diff --git a/Installer/get_openssl.cmd b/Installer/get_openssl.cmd index 927dbdf6..5bed9cf8 100644 --- a/Installer/get_openssl.cmd +++ b/Installer/get_openssl.cmd @@ -1,8 +1,8 @@ +set version=1.1.1o + mkdir %~dp0\OpenSSL +curl -LsSO --output-dir %~dp0\OpenSSL\ http://wiki.overbyte.eu/arch/openssl-%version%-win64.zip +"C:\Program Files\7-Zip\7z.exe" x -bd -o%~dp0\OpenSSL\x64\ %~dp0\OpenSSL\openssl-%version%-win64.zip -curl --ssl-no-revoke -L http://wiki.overbyte.eu/arch/openssl-1.1.1m-win64.zip -o %~dp0\OpenSSL\openssl-1.1.1m-win64.zip -"C:\Program Files\7-Zip\7z.exe" x -o%~dp0\OpenSSL\x64\ %~dp0\OpenSSL\openssl-1.1.1m-win64.zip - -curl --ssl-no-revoke -L http://wiki.overbyte.eu/arch/openssl-1.1.1m-win32.zip -o %~dp0\OpenSSL\openssl-1.1.1m-win32.zip -"C:\Program Files\7-Zip\7z.exe" x -o%~dp0\OpenSSL\Win32\ %~dp0\OpenSSL\openssl-1.1.1m-win32.zip - +curl -LsSO --output-dir %~dp0\OpenSSL\ http://wiki.overbyte.eu/arch/openssl-%version%-win32.zip +"C:\Program Files\7-Zip\7z.exe" x -bd -o%~dp0\OpenSSL\Win32\ %~dp0\OpenSSL\openssl-%version%-win32.zip diff --git a/Installer/get_qttranslations.cmd b/Installer/get_qttranslations.cmd index 53831e59..8352d8e1 100644 --- a/Installer/get_qttranslations.cmd +++ b/Installer/get_qttranslations.cmd @@ -3,6 +3,6 @@ mkdir %~dp0qttranslations\ts mkdir %~dp0qttranslations\qm set fileName=qttranslations-everywhere-src-6.2.3.zip set downloadUrl=https://download.qt.io/archive/qt/6.2/6.2.3/submodules/%filename% -curl -L %downloadUrl% -o %~dp0qttranslations\%filename% -"C:\Program Files\7-Zip\7z.exe" e -i!*\translations\qt_*.ts -i!*\translations\qtbase_*.ts -i!*\translations\qtmultimedia_*.ts %~dp0qttranslations\%filename% -o%~dp0qttranslations\ts\ +curl -LsSO --output-dir %~dp0qttranslations\ %downloadUrl% +"C:\Program Files\7-Zip\7z.exe" e -i!*\translations\qt_*.ts -i!*\translations\qtbase_*.ts -i!*\translations\qtmultimedia_*.ts %~dp0qttranslations\%filename% -bd -o%~dp0qttranslations\ts\ for %%a in (%~dp0qttranslations\ts\*.ts) do (lrelease.exe -silent %%a -qm %~dp0qttranslations\qm\%%~na.qm) diff --git a/Sandboxie/core/dll/SboxDll.vcxproj b/Sandboxie/core/dll/SboxDll.vcxproj index 8cd16d08..7394ae3f 100644 --- a/Sandboxie/core/dll/SboxDll.vcxproj +++ b/Sandboxie/core/dll/SboxDll.vcxproj @@ -128,6 +128,7 @@ true false false + /ignore:4281 %(AdditionalOptions) BUILD_UTILITY_PASS2;MY_WIN64_FLAG;%(PreprocessorDefinitions) @@ -168,6 +169,7 @@ true false false + /ignore:4281 %(AdditionalOptions) BUILD_UTILITY_PASS2;MY_WIN64_FLAG;%(PreprocessorDefinitions) diff --git a/Sandboxie/core/low/LowLevel.vcxproj b/Sandboxie/core/low/LowLevel.vcxproj index 98fcf770..919fb5f9 100644 --- a/Sandboxie/core/low/LowLevel.vcxproj +++ b/Sandboxie/core/low/LowLevel.vcxproj @@ -89,6 +89,7 @@ false UseLinkTimeCodeGeneration false + /ignore:4281 %(AdditionalOptions) diff --git a/SandboxiePlus/install_jom.cmd b/SandboxiePlus/install_jom.cmd index 6fa33a70..449f116a 100644 --- a/SandboxiePlus/install_jom.cmd +++ b/SandboxiePlus/install_jom.cmd @@ -1,6 +1,6 @@ -curl --ssl-no-revoke -L https://download.qt.io/official_releases/jom/jom.zip -o %~dp0..\..\jom.zip -"C:\Program Files\7-Zip\7z.exe" x -o%~dp0..\..\Qt\Tools\QtCreator\bin\ %~dp0..\..\jom.zip +curl -LsSO --output-dir %~dp0..\..\ https://download.qt.io/official_releases/jom/jom.zip +"C:\Program Files\7-Zip\7z.exe" x -aoa -o%~dp0..\..\Qt\Tools\QtCreator\bin\ %~dp0..\..\jom.zip -dir %~dp0..\..\ -dir %~dp0..\..\Qt -dir %~dp0..\..\Qt\Tools +REM dir %~dp0..\..\ +REM dir %~dp0..\..\Qt +REM dir %~dp0..\..\Qt\Tools