From 3cb46253fc0e6d7abf4af889a8fcc882a95ffc09 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 11 Aug 2010 02:37:13 +0200 Subject: [PATCH] enable openssl --- build/build-x64.bat | 4 ++-- build/build-x86.bat | 4 ++-- build/release-x64.bat | 6 +++--- build/release-x86.bat | 6 +++--- src/makeinc.mak | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/build-x64.bat b/build/build-x64.bat index dad4b249..bd26f5ad 100644 --- a/build/build-x64.bat +++ b/build/build-x64.bat @@ -1,6 +1,6 @@ @echo off -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev64\include;c:\mozilla-build\build\openssl-0.9.8j-wdk-x64\include -set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\openssl-0.9.8j-wdk-x64\lib +set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev64\include;c:\mozilla-build\build\openssl-1.0.0a-wdk-x64\include +set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\openssl-1.0.0a-wdk-x64\lib set OPATH=%PATH% set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\build\xchat-dev64\bin;c:\mozilla-build\perl-5.10-x64\bin cd ..\src diff --git a/build/build-x86.bat b/build/build-x86.bat index f5b825d8..6268b0b8 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -1,6 +1,6 @@ @echo off -set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include;c:\mozilla-build\build\openssl-0.9.8j-wdk-x86\include -set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\openssl-0.9.8j-wdk-x86\lib +set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include;c:\mozilla-build\build\openssl-1.0.0a-wdk-x86\include +set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\openssl-1.0.0a-wdk-x86\lib set OPATH=%PATH% set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw\bin;c:\mozilla-build\perl-5.10-x86\bin cd ..\src diff --git a/build/release-x64.bat b/build/release-x64.bat index aea7a05f..f75c5269 100644 --- a/build/release-x64.bat +++ b/build/release-x64.bat @@ -1,6 +1,6 @@ @echo off set GTK_BIN=c:\mozilla-build\build\xchat-dev64\bin -set SSL_BIN=c:\mozilla-build\build\openssl-0.9.8j-wdk-x64\bin +set SSL_BIN=c:\mozilla-build\build\openssl-1.0.0a-wdk-x64\bin set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x64 rmdir /Q /S %XCHAT_DEST% mkdir %XCHAT_DEST% @@ -29,8 +29,8 @@ xcopy /S /I %GTK_BIN%\..\lib\gtk-2.0 %XCHAT_DEST%\lib\gtk-2.0 rmdir /Q /S %XCHAT_DEST%\lib\gtk-2.0\include xcopy /S /I etc %XCHAT_DEST%\etc xcopy ..\COPYING %XCHAT_DEST% -::xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST% -::xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% +xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST% +xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% ::xcopy /S /I ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\ diff --git a/build/release-x86.bat b/build/release-x86.bat index 902dc628..99097a8e 100644 --- a/build/release-x86.bat +++ b/build/release-x86.bat @@ -1,6 +1,6 @@ @echo off set GTK_BIN=c:\mozilla-build\build\xchat-dev32\bin -set SSL_BIN=c:\mozilla-build\build\openssl-0.9.8j-wdk-x86\bin +set SSL_BIN=c:\mozilla-build\build\openssl-1.0.0a-wdk-x86\bin set XCHAT_DEST=c:\mozilla-build\build\xchat-wdk-x86 rmdir /Q /S %XCHAT_DEST% mkdir %XCHAT_DEST% @@ -29,8 +29,8 @@ xcopy /S /I %GTK_BIN%\..\lib\gtk-2.0 %XCHAT_DEST%\lib\gtk-2.0 rmdir /Q /S %XCHAT_DEST%\lib\gtk-2.0\include xcopy /S /I etc %XCHAT_DEST%\etc xcopy ..\COPYING %XCHAT_DEST% -::xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST% -::xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% +xcopy %SSL_BIN%\libeay32.dll %XCHAT_DEST% +xcopy %SSL_BIN%\ssleay32.dll %XCHAT_DEST% ::xcopy /S /I ..\plugins\dns\xcdns.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\ewc\xcewc.dll %XCHAT_DEST%\plugins\ xcopy /S /I ..\plugins\perl\xcperl.dll %XCHAT_DEST%\plugins\ diff --git a/src/makeinc.mak b/src/makeinc.mak index 1497d3f6..aad61aec 100644 --- a/src/makeinc.mak +++ b/src/makeinc.mak @@ -1,6 +1,6 @@ #X64 = YES #PORTABLE = YES -#OPENSSL = YES +OPENSSL = YES IPV6 = YES CC = cl