diff options
author | Andy Polyakov <appro@openssl.org> | 2008-11-03 21:15:07 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2008-11-03 21:15:07 +0000 |
commit | 9be548129771e7285856cd7d8d2623cbb5d1a919 (patch) | |
tree | be554cca8f2d52980868cde8e9b8e5e0d66d77ee | |
parent | 8fe8bae15a159730928a6f031a4e9af5744eac19 (diff) |
Add initial support for mingw64.
PR: 1693
Submitted by: Alon Bar-Lev
-rwxr-xr-x | Configure | 3 | ||||
-rw-r--r-- | TABLE | 30 | ||||
-rw-r--r-- | engines/e_aep.c | 2 |
3 files changed, 33 insertions, 2 deletions
@@ -496,6 +496,7 @@ my %table=( # MinGW "mingw", "gcc:-mno-cygwin -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_coff_asm}:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a", +"mingw64", "gcc:-mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE:::MINGW64:-lws2_32 -lgdi32:SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:${no_asm}:win32:cygwin-shared:-D_WINDLL:-mno-cygwin:.dll.a", # UWIN "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32", @@ -969,7 +970,7 @@ foreach (sort (keys %disabled)) my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; -$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target eq "mingw"); +$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); $exe_ext=".nlm" if ($target =~ /netware/); $exe_ext=".pm" if ($target =~ /vos/); $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); @@ -3570,6 +3570,36 @@ $shared_extension = .dll.a $ranlib = $arflags = +*** mingw64 +$cc = gcc +$cflags = -mno-cygwin -DL_ENDIAN -O3 -Wall -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE +$unistd = +$thread_cflag = +$sys_id = MINGW64 +$lflags = -lws2_32 -lgdi32 +$bn_ops = SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN +$cpuid_obj = +$bn_obj = +$des_obj = +$aes_obj = +$bf_obj = +$md5_obj = +$sha1_obj = +$cast_obj = +$rc4_obj = +$rmd160_obj = +$rc5_obj = +$wp_obj = +$cmll_obj = +$perlasm_scheme = void +$dso_scheme = win32 +$shared_target= cygwin-shared +$shared_cflag = -D_WINDLL +$shared_ldflag = -mno-cygwin +$shared_extension = .dll.a +$ranlib = +$arflags = + *** ncr-scde $cc = cc $cflags = -O6 -Xa -Hoff=BEHAVED -686 -Hwide -Hiw diff --git a/engines/e_aep.c b/engines/e_aep.c index ffdc354cdc..a91a39f018 100644 --- a/engines/e_aep.c +++ b/engines/e_aep.c @@ -57,7 +57,7 @@ #include <string.h> #include <openssl/e_os2.h> -#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__) +#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__) || defined(__MINGW32__) #include <sys/types.h> #include <unistd.h> #else |