--- util/pl/VC-32.pl.orig	Mon Sep 19 09:43:32 2005
+++ util/pl/VC-32.pl	Sat Apr 29 15:58:47 2006
@@ -25,11 +25,13 @@
 # per 0.9.8 release remaining warnings were explicitly examined and
 # considered safe to ignore.
 # 
- $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
- $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
- $opt_cflags=' /MD /Ox';
+ $base_cflags=' /W3 /Gs0 /GF /Gy /Zi /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
+ $base_cflags.=' /wd4996 -D_CRT_SECURE_NO_DEPRECATE -D_USE_32BIT_TIME_T'; # mostly shut up VC8
+ $opt_cflags=' /MD /Ox /Oy-';
 $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
- $lflags="/nologo /subsystem:console /opt:ref";
+ $base_lflags=' /nologo /subsystem:console /debug';
+ $opt_lflags=' /opt:ref /incremental:no';
+ $dbg_lflags='';
 }
 elsif ($FLAVOR =~ /CE/)
 {
@@ -83,15 +85,19 @@
 $base_cflags.=" $wcecdefs";
 $opt_cflags=' /MC /O1i';	# optimize for space, but with intrinsics...
 $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
- $lflags="/nologo /opt:ref $wcelflag";
+ $base_lflags=' /nologo'.$wcelflag;
+ $opt_lflags=' /opt:ref';
+ $dbg_lflags=' /debug';
 }
 else	# Win32
 {
- $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
- $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';	# shut up VC8
- $opt_cflags=' /MD /Ox /O2 /Ob2';
+ $base_cflags=' /W3 /WX /Gs0 /GF /Gy /Zi /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
+ $base_cflags.=' /wd4996 -D_CRT_SECURE_NO_DEPRECATE -D_USE_32BIT_TIME_T'; # -really- shut up VC8
+ $opt_cflags=' /MD /Ox /O2 /Ob2 /Oy-';
 $dbg_cflags=' /MDd /Od -DDEBUG -D_DEBUG';
- $lflags="/nologo /subsystem:console /machine:I386 /opt:ref";
+ $base_lflags=' /nologo /subsystem:console /machine:I386';
+ $opt_lflags=' /debug /opt:ref /incremental:no';
+ $dbg_lflags='';
 }
 $mlflags='';
 
@@ -102,12 +108,12 @@
 if ($debug)
 	{
 	$cflags=$dbg_cflags.$base_cflags;
-	$lflags.=" /debug";
-	$mlflags.=' /debug';
+	$lflags=$dbg_lflags.$base_lflags;
 	}
 else
 	{
 	$cflags=$opt_cflags.$base_cflags;
+	$lflags=$opt_lflags.$base_lflags;
 	}
 
 $obj='.obj';
@@ -261,7 +267,10 @@
 			$ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
 			$ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
 			}
-		$ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; + $ret.="\t\$(LINK) \$(MLFLAGS) $efile\$@ /def:ms/${Name}.def @<<\n"; + $ret.="\t \$(SHLIB_EX_OBJ) $objs $ex\n<<\n"; + $ret.="\tIF EXIST $@.manifest \\\n"; + $ret.="\t mt.exe -nologo -manifest \$@.manifest -outputresource:\$@;2\n"; } $ret.="\n"; return($ret); @@ -275,8 +284,11 @@ $file =~ s/\//$o/g if $o ne '/'; $n=&bname($targer); $ret.="$target: $files $dep_libs\n"; - $ret.=" \$(LINK) \$(LFLAGS) $efile$target @<<\n"; - $ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n\n"; + $ret.="\t\$(LINK) \$(LFLAGS) $efile\$@ @<<\n"; + $ret.="\t \$(APP_EX_OBJ) $files $libs\n<<\n"; + $ret.="\tIF EXIST $@.manifest \\\n"; + $ret.="\t mt.exe -nologo -manifest \$@.manifest -outputresource:\$@;1\n"; + $ret.="\n"; return($ret); } --- ms/do_masm.bat.orig Mon May 16 19:07:13 2005 +++ ms/do_masm.bat Sat Apr 29 15:56:14 2006 @@ -56,8 +56,8 @@ echo on perl util\mkfiles.pl>MINFO
-perl util\mk1mf.pl VC-WIN32>ms\nt.mak
-perl util\mk1mf.pl dll VC-WIN32>ms\ntdll.mak
+perl util\mk1mf.pl %* VC-WIN32>ms\nt.mak
+perl util\mk1mf.pl %* dll VC-WIN32>ms\ntdll.mak
 
-perl util\mkdef.pl 32 libeay> ms\libeay32.def
-perl util\mkdef.pl 32 ssleay> ms\ssleay32.def
+perl util\mkdef.pl 32 libeay %*> ms\libeay32.def
+perl util\mkdef.pl 32 ssleay %*> ms\ssleay32.def
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="http://archive.apache.org/dist/httpd/binaries/win32/patches_applied/openssl-0.9.8a-vc32-2005.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="http://archive.apache.org/dist/httpd/binaries/win32/patches_applied/openssl-0.9.8a-vc32-2005.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>