diff --git a/windows/openssl/build_openssl.bat b/windows/openssl/build_openssl.bat index bafa6b2..cb0f4e3 100644 --- a/windows/openssl/build_openssl.bat +++ b/windows/openssl/build_openssl.bat @@ -3,9 +3,25 @@ SET BUILDARCH=%1 cd openssl-* +SET PATH=%PATH%;C:\Program Files\NASM +SET CL=/FS if "%BUILDARCH%" == "win32" ( - CALL ..\windows\openssl\build_openssl_win32.bat + CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x86 + CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 + + perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN32 ) else ( - CALL ..\windows\openssl\build_openssl_win64.bat + CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x64 + CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 + + perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN64A ) + +jom if %errorlevel% neq 0 exit /b %errorlevel% + +mkdir ..\build +mkdir ..\build\lib +move libcrypto.lib ..\build\lib\ +move libssl.lib ..\build\lib\ +move include ..\build\include diff --git a/windows/openssl/build_openssl_win32.bat b/windows/openssl/build_openssl_win32.bat deleted file mode 100644 index 5192882..0000000 --- a/windows/openssl/build_openssl_win32.bat +++ /dev/null @@ -1,14 +0,0 @@ -call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x86 -call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86 -SET PATH=%PATH%;C:\Program Files\NASM -SET CL=/FS - -perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN32 -jom -if %errorlevel% neq 0 exit /b %errorlevel% - -mkdir ..\build -mkdir ..\build\lib -move libcrypto.lib ..\build\lib\ -move libssl.lib ..\build\lib\ -move include ..\build\include diff --git a/windows/openssl/build_openssl_win64.bat b/windows/openssl/build_openssl_win64.bat deleted file mode 100644 index ec42216..0000000 --- a/windows/openssl/build_openssl_win64.bat +++ /dev/null @@ -1,14 +0,0 @@ -call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x64 -call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 -SET PATH=%PATH%;C:\Program Files\NASM -SET CL=/FS - -perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN64A -jom -if %errorlevel% neq 0 exit /b %errorlevel% - -mkdir ..\build -mkdir ..\build\lib -move libcrypto.lib ..\build\lib\ -move libssl.lib ..\build\lib\ -move include ..\build\include