diff options
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/build-openssl.bat | 54 | ||||
| -rw-r--r-- | projects/generate.bat | 6 | ||||
| -rw-r--r-- | projects/wolfssl_options.h | 1 |
3 files changed, 30 insertions, 31 deletions
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index 98daff529..96fccf87a 100644 --- a/projects/build-openssl.bat +++ b/projects/build-openssl.bat @@ -110,23 +110,23 @@ rem *************************************************************************** ) else if /i "%~1" == "-help" ( goto syntax ) else if /i "%~1" == "-VSpath" ( - if "%~2" == "" ( - echo. - echo Error. Please provide VS Path. - goto error - ) else ( - set "ABS_VC_PATH=%~2\VC" - shift - ) + if "%~2" == "" ( + echo. + echo Error. Please provide VS Path. + goto error + ) else ( + set "ABS_VC_PATH=%~2\VC" + shift + ) ) else if /i "%~1" == "-perlpath" ( if "%~2" == "" ( - echo. - echo Error. Please provide Perl root Path. - goto error - ) else ( - set "PERL_PATH=%~2" - shift - ) + echo. + echo Error. Please provide Perl root Path. + goto error + ) else ( + set "PERL_PATH=%~2" + shift + ) ) else ( if not defined START_DIR ( set START_DIR=%~1% @@ -144,12 +144,12 @@ rem *************************************************************************** rem Default the start directory if one isn't specified if not defined START_DIR set START_DIR=..\..\openssl - if not defined ABS_VC_PATH ( + if not defined ABS_VC_PATH ( rem Check we have a program files directory - if not defined PF goto nopf - set "ABS_VC_PATH=%PF%\%VC_PATH%" + if not defined PF goto nopf + set "ABS_VC_PATH=%PF%\%VC_PATH%" ) - + rem Check we have Visual Studio installed if not exist "%ABS_VC_PATH%" goto novc @@ -260,17 +260,17 @@ rem *************************************************************************** rem Move the PDB files move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug" 1>nul move tmp32dll.dbg\lib.pdb "%OUTDIR%\DLL Debug" 1>nul - + rem Remove the intermediate directories rd tmp32.dbg /s /q rd tmp32dll.dbg /s /q if "%BUILD_CONFIG%" == "debug" goto success - + :x64release rem Configuring 64-bit Release Build perl Configure VC-WIN64A --prefix=%CD% - + rem Perform the build call ms\do_win64a nmake -f ms\nt.mak @@ -299,14 +299,14 @@ rem *************************************************************************** rd tmp32dll /s /q goto success - + :x86 rem Calculate our output directory set OUTDIR=build\Win32\%VC_DESC% if not exist %OUTDIR% md %OUTDIR% if "%BUILD_CONFIG%" == "release" goto x86release - + :x86debug rem Configuring 32-bit Debug Build perl Configure debug-VC-WIN32 no-asm --prefix=%CD% @@ -339,7 +339,7 @@ rem *************************************************************************** rd tmp32dll.dbg /s /q if "%BUILD_CONFIG%" == "debug" goto success - + :x86release rem Configuring 32-bit Release Build perl Configure VC-WIN32 no-asm --prefix=%CD% @@ -405,13 +405,13 @@ rem *************************************************************************** echo. echo directory - Specifies the OpenSSL source directory echo. - echo -VSpath - Specify the custom VS path if Visual Studio is installed at other location + echo -VSpath - Specify the custom VS path if Visual Studio is installed at other location echo then "C:/<ProgramFiles>/Microsoft Visual Studio[version] echo For e.g. -VSpath "C:\apps\MVS14" echo. echo -perlpath - Specify the custom perl root path if perl is not located at "C:\Perl" and it is a echo portable copy of perl and not installed on the win system - echo For e.g. -perlpath "D:\strawberry-perl-5.24.3.1-64bit-portable" + echo For e.g. -perlpath "D:\strawberry-perl-5.24.3.1-64bit-portable" goto error :unknown diff --git a/projects/generate.bat b/projects/generate.bat index d1fc6088c..32a88f51b 100644 --- a/projects/generate.bat +++ b/projects/generate.bat @@ -77,7 +77,7 @@ rem *************************************************************************** ) shift & goto parseArgs - + :start if exist ..\buildconf.bat ( if "%MODE%" == "GENERATE" ( @@ -264,7 +264,7 @@ rem exit /B ) - if exist %3 ( + if exist %3 ( del %3 ) @@ -391,7 +391,7 @@ rem :clean echo * %CD%\%1 - if exist %1 ( + if exist %1 ( del %1 ) diff --git a/projects/wolfssl_options.h b/projects/wolfssl_options.h index 04ac8da64..946e1000d 100644 --- a/projects/wolfssl_options.h +++ b/projects/wolfssl_options.h @@ -221,4 +221,3 @@ functioning correctly yet. https://github.com/wolfSSL/wolfssl/pull/943 #endif /* WOLFSSL_OPTIONS_H */ - |