Support -L options in VC++ link.
authorDr. Stephen Henson <steve@openssl.org>
Wed, 20 Jan 2010 14:04:55 +0000 (14:04 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 20 Jan 2010 14:04:55 +0000 (14:04 +0000)
demos/pkcs12/pkread.c
util/pl/VC-32.pl

index 02e16cd..bc19360 100644 (file)
@@ -20,7 +20,8 @@ int main(int argc, char **argv)
                fprintf(stderr, "Usage: pkread p12file password opfile\n");
                exit (1);
        }
-       SSLeay_add_all_algorithms();
+       /*SSLeay_add_all_algorithms();*/
+       SSL_library_init();
        ERR_load_crypto_strings();
        if (!(fp = fopen(argv[1], "rb"))) {
                fprintf(stderr, "Error opening file %s\n", argv[1]);
index ac1959a..4501347 100644 (file)
@@ -13,6 +13,10 @@ $rm='del /Q';
 
 $zlib_lib="zlib1.lib";
 
+# Santize -L options for ms link
+$l_flags =~ s/-L("\[^"]+")/\/libpath:$1/g;
+$l_flags =~ s/-L(\S+)/\/libpath:$1/g;
+
 # C compiler stuff
 $cc='cl';
 if ($FLAVOR =~ /WIN64/)