Change the Windows building scripts to enable DSO_WIN32.

diff --git a/README.ENGINE b/README.ENGINE
index b30206c0edbb85c2cc1190194d365e3c7e73b57e..3d88ed152ff7621ed950045c9fc69d8068cef869 100644 (file)
--- a/README.ENGINE
+++ b/README.ENGINE
@@ -52,3 +52,12 @@
   device, or the built-in crypto routines will be used, just as in the
   default OpenSSL distribution.
 
+
+  PROBLEMS
+  ========
+
+  It seems like the ENGINE part doesn't work too well with Cryptoswift on
+  Win32.  A quick test done right before the release showed that trying
+  "openssl speed -engine cswift" generated errors.  If the DSO gets enabled,
+  an attempt is made to write at memory address 0x00000002.
+

diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl
index 7f57809a165fa6a394a5a44de9a200371fb15785..20cb3a9c506bc7f375d30c7c12aeb166cedc46fc 100644 (file)
--- a/util/pl/BC-32.pl
+++ b/util/pl/BC-32.pl
@@ -19,7 +19,7 @@ $out_def="out32";
 $tmp_def="tmp32";
 $inc_def="inc32";
 #enable max error messages, disable most common warnings
-$cflags="-DWIN32_LEAN_AND_MEAN -q -w-aus -w-par -w-inl  -c -tWC -tWM -DWINDOWS -DWIN32 -DL_ENDIAN ";
+$cflags="-DWIN32_LEAN_AND_MEAN -q -w-aus -w-par -w-inl  -c -tWC -tWM -DWINDOWS -DWIN32 -DL_ENDIAN -DDSO_WIN32 ";
 if ($debug)
 {
     $cflags.="-Od -y -v -vi- -D_DEBUG";

diff --git a/util/pl/Mingw32.pl b/util/pl/Mingw32.pl
index c687d9b118525a0c6427de0914fe202ee443949d..37f36126f371dace108f54c9314a81b49789e8d4 100644 (file)
--- a/util/pl/Mingw32.pl
+++ b/util/pl/Mingw32.pl
@@ -17,9 +17,9 @@ $mkdir='gmkdir';
 
 $cc='gcc';
 if ($debug)
-       { $cflags="-DL_ENDIAN -g2 -ggdb"; }
+       { $cflags="-DL_ENDIAN -DDSO_WIN32 -g2 -ggdb"; }
 else
-       { $cflags="-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall"; }
+       { $cflags="-DL_ENDIAN -DDSO_WIN32 -fomit-frame-pointer -O3 -m486 -Wall"; }
 
 if ($gaswin and !$no_asm)
        {

diff --git a/util/pl/Mingw32f.pl b/util/pl/Mingw32f.pl
index a53c537646cb2a9b8eade2bd6c4b9d7998cad9d6..44f5673d7aaf6cf76aa3cfe99b50fc573ac1cd13 100644 (file)
--- a/util/pl/Mingw32f.pl
+++ b/util/pl/Mingw32f.pl
@@ -11,9 +11,9 @@ $rm='del';
 
 $cc='gcc';
 if ($debug)
-       { $cflags="-g2 -ggdb"; }
+       { $cflags="-g2 -ggdb -DDSO_WIN32"; }
 else
-       { $cflags="-O3 -fomit-frame-pointer"; }
+       { $cflags="-O3 -fomit-frame-pointer -DDSO_WIN32"; }
 
 $obj='.o';
 $ofile='-o ';

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 6978104234a95f4c159e6bd59360bda504ccae40..7c6674b971d8b9ca68aae8ac29b85f0b2841f2dc 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -12,7 +12,7 @@ $rm='del';
 
 # C compiler stuff
 $cc='cl';
-$cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN';
+$cflags=' /MD /W3 /WX /G5 /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
 $lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
 $mlflags='';
 
@@ -22,7 +22,7 @@ $inc_def="inc32";
 
 if ($debug)
        {
-       $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG";
+       $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32";
        $lflags.=" /debug";
        $mlflags.=' /debug';
        }