Skip to content

Simplify windows build #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions windows/openssl/build_openssl.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 0 additions & 14 deletions windows/openssl/build_openssl_win32.bat

This file was deleted.

14 changes: 0 additions & 14 deletions windows/openssl/build_openssl_win64.bat

This file was deleted.