Commit 2d060267 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

VC-32.pl: unconditionally generate symbols.pdb.

parent f9a152bd

util/pl/VC-32.pl

+16 −21
Original line number Diff line number Diff line
@@ -122,21 +122,26 @@ else # Win32 
    }

$mlflags='';



$out_def="out32"; $out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);

$tmp_def="tmp32"; $tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);

$out_def ="out32";	$out_def.="dll"			if ($shlib);

			$out_def.='_$(TARGETCPU)'	if ($FLAVOR =~ /CE/);

$tmp_def ="tmp32";	$tmp_def.="dll"			if ($shlib);

			$tmp_def.='_$(TARGETCPU)'	if ($FLAVOR =~ /CE/);

$inc_def="inc32";



if ($debug)

	{

	$cflags=$dbg_cflags.$base_cflags;

	$lflags.=" /debug";

	$mlflags.=' /debug';

	}

else

	{

	$cflags=$opt_cflags.$base_cflags;

	}



# generate symbols.pdb unconditionally

$app_cflag.=" /Zi /Fd$tmp_def/app";

$lib_cflag.=" /Zi /Fd$tmp_def/lib";

$lflags.=" /debug";



$obj='.obj';

$asm_suffix='.asm';

$ofile="/Fo";
@@ -176,18 +181,15 @@ $lfile='/out:'; 
$shlib_ex_obj="";

$app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);

if ($FLAVOR =~ /WIN64A/) {

	if (`nasm -v` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {

		$asm='nasm -f win64 -DNEAR -Ox';

		$asm.=' -g' if $debug;

	if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {

		$asm='nasm -f win64 -DNEAR -Ox -g';

		$afile='-o ';

	} else {

		$asm='ml64 /c /Cp /Cx';

		$asm.=" /Zi" if $debug;

		$asm='ml64 /c /Cp /Cx /Zi';

		$afile='/Fo';

	}

} elsif ($FLAVOR =~ /WIN64I/) {

	$asm='ias';

	$asm.=" -d debug" if $debug;

	$asm='ias -d debug';

	$afile="-o ";

} elsif ($nasm) {

	my $ver=`nasm -v 2>NUL`;
@@ -197,8 +199,7 @@ if ($FLAVOR =~ /WIN64A/) { 
	$asmtype="win32n";

	$afile='-o ';

} else {

	$asm='ml /nologo /Cp /coff /c /Cx';

	$asm.=" /Zi" if $debug;

	$asm='ml /nologo /Cp /coff /c /Cx /Zi';

	$afile='/Fo';

	$asmtype="win32";

}
@@ -230,9 +231,7 @@ if (!$no_asm) 
if ($shlib && $FLAVOR !~ /CE/)

	{

	$mlflags.=" $lflags /dll";

	$lib_cflag=" -D_WINDLL";

	$out_def="out32dll";

	$tmp_def="tmp32dll";

	$lib_cflag.=" -D_WINDLL";

	#

	# Engage Applink...

	#
@@ -262,13 +261,9 @@ elsif ($shlib && $FLAVOR =~ /CE/) 
	{

	$mlflags.=" $lflags /dll";

	$lflags.=' /entry:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'}));

	$lib_cflag=" -D_WINDLL -D_DLL";

	$out_def='out32dll_$(TARGETCPU)';

	$tmp_def='tmp32dll_$(TARGETCPU)';

	$lib_cflag.=" -D_WINDLL -D_DLL";

	}



$cflags.=" /Fd$out_def";



sub do_lib_rule

	{

	local($objs,$target,$name,$shlib)=@_;