diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-04-07 15:51:55 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-04-07 15:51:55 +0000 |
| commit | e1d51de41fafc515e9d2f17ed3c83d5b1fa5e847 (patch) | |
| tree | 1b0acef4957e2dd7ed04f336393e74fa9df65e0a | |
| parent | 81ee80ab88941658d7d427c76e1a6c94debfb4a3 (diff) | |
| download | openssl-new-e1d51de41fafc515e9d2f17ed3c83d5b1fa5e847.tar.gz | |
Harmonize cygwin/mingw and VC targets.
| -rwxr-xr-x | Configure | 6 | ||||
| -rw-r--r-- | TABLE | 6 | ||||
| -rw-r--r-- | crypto/cryptlib.c | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -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 @@ -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 = diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 3cfcb9e602..91f9dc4f58 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -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> |