diff --git a/openssl/makefile.mk b/openssl/makefile.mk index a4540b9b5130..6b46c888aa4c 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: rt $ $Date: 2007-10-23 13:41:31 $ +# last change: $Author: tkr $ $Date: 2007-10-24 15:07:49 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -81,11 +81,16 @@ PATCH_FILE_NAME=opensslsol.patch .ENDIF .IF "$(OS)" == "WNT" + +#CYGWIN +OUT2BIN = cygcrypto-0.9.8.dll +OUT2BIN += cygssl-0.9.8.dll +# 4NT +.IF "$(USE_SHELL)== "4nt" PATCH_FILE_NAME=openssl.patch CONFIGURE_DIR=. CONFIGURE_ACTION=$(PERL) configure CONFIGURE_FLAGS=VC-WIN32 - BUILD_DIR=. BUILD_ACTION=cmd /c "ms\do_ms $(PERL)" && nmake -f ms/ntdll.mak @@ -97,6 +102,7 @@ OUT2BIN = out32dll\ssleay32.dll OUT2BIN += out32dll\libeay32.dll OUT2INC = inc32\openssl\* .ENDIF +.ENDIF #set INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\ && set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin && diff --git a/openssl/prj/d.lst b/openssl/prj/d.lst index 103cdb741d66..1db49f96b5af 100644 --- a/openssl/prj/d.lst +++ b/openssl/prj/d.lst @@ -5,6 +5,8 @@ mkdir: %_DEST%\inc%_EXT%\external\openssl ..\%__SRC%\lib\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.lib ..\%__SRC%\lib\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.exp ..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll +..\%__SRC%\bin\cygssl-0.9.8.dll %_DEST%\bin%_EXT%\ssleay32.dll +..\%__SRC%\bin\cygcrypto-0.9.8.dll %_DEST%\bin%_EXT%\libeay32.dll ..\%__SRC%\lib\libeay32.lib %_DEST%\lib%_EXT%\libeay32.lib ..\%__SRC%\lib\libeay32.lib %_DEST%\lib%_EXT%\libeay32.exp ..\%__SRC%\bin\libeay32.dll %_DEST%\bin%_EXT%\libeay32.dll