Commit 9be54812 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Add initial support for mingw64. 

PR: 1693
Submitted by: Alon Bar-Lev
parent 8fe8bae1

Configure

+2 −1
Original line number Diff line number Diff line
@@ -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 "");

TABLE

+30 −0
Original line number Diff line number Diff line
@@ -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

engines/e_aep.c

+1 −1
Original line number Diff line number Diff line
@@ -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