瀏覽代碼

Final(?) touches to mingw shared support. .dll.a as shared lib extention might
appear controversial, but that's the only way to avoid relinks...

Andy Polyakov 19 年之前
父節點
當前提交
a34f2d42b4
共有 3 個文件被更改,包括 7 次插入7 次删除
  1. 2 2
      Configure
  2. 3 3
      TABLE
  3. 2 2
      e_os2.h

+ 2 - 2
Configure

@@ -530,14 +530,14 @@ my %table=(
 "BC-16","bcc:::(unknown):WIN16::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::",
 "BC-16","bcc:::(unknown):WIN16::BN_LLONG DES_PTR RC4_INDEX SIXTEEN_BIT:::",
 
 
 # MinGW
 # MinGW
-"mingw", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:-D_WINDLL:-mno-cygwin:.dll",
+"mingw", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall -D_WIN32_WINNT=0x333:::MINGW32:-lwsock32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:-D_WINDLL:-mno-cygwin:.dll.a",
 
 
 # UWIN 
 # UWIN 
 "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
 "UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
 
 
 # Cygwin
 # Cygwin
 "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
 "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
-"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:cygwin-shared:-D_WINDLL::.dll",
+"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:cygwin-shared:-D_WINDLL::.dll.a",
 
 
 # DJGPP
 # DJGPP
 "DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall -DDEVRANDOM=\"/dev/urandom\\x24\":::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::",
 "DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall -DDEVRANDOM=\"/dev/urandom\\x24\":::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::",

+ 3 - 3
TABLE

@@ -96,7 +96,7 @@ $dso_scheme   = dlfcn
 $shared_target= cygwin-shared
 $shared_target= cygwin-shared
 $shared_cflag = -D_WINDLL
 $shared_cflag = -D_WINDLL
 $shared_ldflag = 
 $shared_ldflag = 
-$shared_extension = .dll
+$shared_extension = .dll.a
 $ranlib       = 
 $ranlib       = 
 $arflags      = 
 $arflags      = 
 
 
@@ -3552,7 +3552,7 @@ $arflags      =
 
 
 *** mingw
 *** mingw
 $cc           = gcc
 $cc           = gcc
-$cflags       = -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall
+$cflags       = -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -mno-cygwin -Wall -D_WIN32_WINNT=0x333
 $unistd       = 
 $unistd       = 
 $thread_cflag = 
 $thread_cflag = 
 $sys_id       = MINGW32
 $sys_id       = MINGW32
@@ -3571,7 +3571,7 @@ $dso_scheme   = win32
 $shared_target= cygwin-shared
 $shared_target= cygwin-shared
 $shared_cflag = -D_WINDLL
 $shared_cflag = -D_WINDLL
 $shared_ldflag = -mno-cygwin
 $shared_ldflag = -mno-cygwin
-$shared_extension = .dll
+$shared_extension = .dll.a
 $ranlib       = 
 $ranlib       = 
 $arflags      = 
 $arflags      = 
 
 

+ 2 - 2
e_os2.h

@@ -237,8 +237,8 @@ extern "C" {
 # define OPENSSL_IMPORT globalref
 # define OPENSSL_IMPORT globalref
 # define OPENSSL_GLOBAL globaldef
 # define OPENSSL_GLOBAL globaldef
 #elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
 #elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
-# define OPENSSL_EXPORT extern _declspec(dllexport)
-# define OPENSSL_IMPORT extern _declspec(dllimport)
+# define OPENSSL_EXPORT extern __declspec(dllexport)
+# define OPENSSL_IMPORT extern __declspec(dllimport)
 # define OPENSSL_GLOBAL
 # define OPENSSL_GLOBAL
 #else
 #else
 # define OPENSSL_EXPORT extern
 # define OPENSSL_EXPORT extern