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

Harmonize cygwin/mingw and VC targets.

parent 81ee80ab

Configure

+3 −3
Original line number Diff line number Diff line
@@ -484,15 +484,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:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_coff_asm}:win32:cygwin-shared:-D_DLL:-mno-cygwin -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_WINDLL:-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}: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",

"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_WINDLL:-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_WINDLL:-shared:.dll",



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

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

TABLE

+3 −3
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ $rmd160_obj = rm86-cof.o 
$rc5_obj      = r586-cof.o

$dso_scheme   = dlfcn

$shared_target= cygwin-shared

$shared_cflag = -D_DLL

$shared_cflag = -D_WINDLL

$shared_ldflag = -shared

$shared_extension = .dll

$ranlib       =
@@ -1236,7 +1236,7 @@ $rmd160_obj = 
$rc5_obj      = 

$dso_scheme   = dlfcn

$shared_target= cygwin-shared

$shared_cflag = -D_DLL

$shared_cflag = -D_WINDLL

$shared_ldflag = -shared

$shared_extension = .dll

$ranlib       =
@@ -3099,7 +3099,7 @@ $rmd160_obj = rm86-cof.o 
$rc5_obj      = r586-cof.o

$dso_scheme   = win32

$shared_target= cygwin-shared

$shared_cflag = -D_DLL

$shared_cflag = -D_WINDLL

$shared_ldflag = -mno-cygwin -shared

$shared_extension = .dll

$ranlib       =

crypto/cryptlib.c

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ void OPENSSL_cpuid_setup(void) 
void OPENSSL_cpuid_setup(void) {}

#endif



#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_DLL)

#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_WINDLL)

#ifdef __CYGWIN__

/* pick DLL_[PROCESS|THREAD]_[ATTACH|DETACH] definitions */

#include <windows.h>