Commit 16420007 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Cygwin to use DSO_FLFCN and mingw to use DSO_WIN32.

parent f7f21255

Configure

+3 −3
Original line number Diff line number Diff line
@@ -473,15 +473,15 @@ my %table=( 
"BC-16","bcc:::(unknown):WIN16::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::",



# MinGW

"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-mno-cygwin -lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:win32:cygwin-shared:-D_DLL:-shared:.dll",

"mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:win32:cygwin-shared:-D_DLL:-mno-cygwin -shared:.dll",



# UWIN 

"UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",



# Cygwin

"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32",

"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:win32:cygwin-shared:-D_DLL:-shared:.dll",

"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll",

"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:dlfcn:cygwin-shared:-D_DLL:-shared:.dll",

"debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_DLL:-shared:.dll",



# NetWare from David Ward (dsward@novell.com) - requires MetroWerks NLM development tools

# netware-clib => legacy CLib c-runtime support

TABLE

+6 −6
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ $cast_obj = cx86-cof.o 
$rc4_obj      = rx86-cof.o

$rmd160_obj   = /rm86-cof.o

$rc5_obj      = r586-cof.o

$dso_scheme   = win32

$dso_scheme   = dlfcn

$shared_target= cygwin-shared

$shared_cflag = -D_DLL

$shared_ldflag = -shared
@@ -1234,10 +1234,10 @@ $cast_obj = 
$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$dso_scheme   = win32

$dso_scheme   = dlfcn

$shared_target= cygwin-shared

$shared_cflag = 

$shared_ldflag = 

$shared_cflag = -D_DLL

$shared_ldflag = -shared

$shared_extension = .dll

$ranlib       = 

$arflags      =
@@ -3084,7 +3084,7 @@ $cflags = -mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wal 
$unistd       = 

$thread_cflag = 

$sys_id       = MINGW32

$lflags       = -mno-cygwin -lwsock32 -lgdi32

$lflags       = -lwsock32 -lgdi32

$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT

$cpuid_obj    = x86cpuid-cof.o

$bn_obj       = bn86-cof.o co86-cof.o
@@ -3100,7 +3100,7 @@ $rc5_obj = r586-cof.o 
$dso_scheme   = win32

$shared_target= cygwin-shared

$shared_cflag = -D_DLL

$shared_ldflag = -shared

$shared_ldflag = -mno-cygwin -shared

$shared_extension = .dll

$ranlib       = 

$arflags      =

crypto/dso/dso_win32.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#include "cryptlib.h"

#include <openssl/dso.h>



#if !defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WINCE)

#if !defined(DSO_WIN32)

DSO_METHOD *DSO_METHOD_win32(void)

	{

	return NULL;