Skip to content

Commit df0edaa

Browse files
authored
Simplify windows build (#667)
1 parent 84636fd commit df0edaa

File tree

3 files changed

+18
-30
lines changed

3 files changed

+18
-30
lines changed

windows/openssl/build_openssl.bat

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,25 @@ SET BUILDARCH=%1
33

44
cd openssl-*
55

6+
SET PATH=%PATH%;C:\Program Files\NASM
7+
SET CL=/FS
68
if "%BUILDARCH%" == "win32" (
7-
CALL ..\windows\openssl\build_openssl_win32.bat
9+
CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x86
10+
CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
11+
12+
perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN32
813
) else (
9-
CALL ..\windows\openssl\build_openssl_win64.bat
14+
CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x64
15+
CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
16+
17+
perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN64A
1018
)
19+
20+
jom
1121
if %errorlevel% neq 0 exit /b %errorlevel%
22+
23+
mkdir ..\build
24+
mkdir ..\build\lib
25+
move libcrypto.lib ..\build\lib\
26+
move libssl.lib ..\build\lib\
27+
move include ..\build\include

windows/openssl/build_openssl_win32.bat

Lines changed: 0 additions & 14 deletions
This file was deleted.

windows/openssl/build_openssl_win64.bat

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)