Disable linker warning 4197 on Win64, that is caused by the fact that we export

mhagander · mhagander · commit 04de9be91069 · 2010-01-05T11:12:50.000Z
symbols both using __declspec(dllexport) (via the PGDLLIMPORT macro) and using
full-dll-export. This works without warning on Win32, but not on Win64.

In passing, fix the fact that the framework could never deal with more than
one disbled linker warning - because MSVC wants commas between linker warnings,
and semicolons between compiler warnings...
diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
@@ -3,7 +3,7 @@ package Project;
 #
 # Package that encapsulates a Visual C++ project file generation
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.24 2010/01/02 15:18:42 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.25 2010/01/05 11:12:50 mha Exp $
 #
 use Carp;
 use strict;
@@ -333,7 +333,7 @@ sub DisableLinkerWarnings
 {
     my ($self, $warnings) = @_;
 
-    $self->{disablelinkerwarnings} .= ';' unless ($self->{disablelinkerwarnings} eq '');
+    $self->{disablelinkerwarnings} .= ',' unless ($self->{disablelinkerwarnings} eq '');
     $self->{disablelinkerwarnings} .= $warnings;
 }
 
@@ -348,6 +348,10 @@ sub Save
         $self->FullExportDLL($self->{name} . ".lib");
     }
 
+	# Warning 4197 is about double exporting, disable this per
+	# http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=99193
+	$self->DisableLinkerWarnings('4197') if ($self->{platform} eq 'x64');
+
     # Dump the project
     open(F, ">$self->{name}.vcproj") || croak("Could not write to $self->{name}.vcproj\n");
     $self->WriteHeader(*F);
@@ -494,7 +498,9 @@ sub WriteConfiguration
     }
     $libs =~ s/ $//;
     $libs =~ s/__CFGNAME__/$cfgname/g;
+
     my $targetmachine = $self->{platform} eq 'Win32' ? 1 : 17;
+
     print $f <<EOF;
   <Configuration Name="$cfgname|$self->{platform}" OutputDirectory=".\\$cfgname\\$self->{name}" IntermediateDirectory=".\\$cfgname\\$self->{name}"
 	ConfigurationType="$cfgtype" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2" WholeProgramOptimization="$p->{wholeopt}">

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Project;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ project file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.24 2010/01/02 15:18:42 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.25 2010/01/05 11:12:50 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -333,7 +333,7 @@ sub DisableLinkerWarnings`
`333`	`333`	`{`
`334`	`334`	`my ($self, $warnings) = @_;`
`335`	`335`
`336`		`- $self->{disablelinkerwarnings} .= ';' unless ($self->{disablelinkerwarnings} eq '');`
	`336`	`+ $self->{disablelinkerwarnings} .= ',' unless ($self->{disablelinkerwarnings} eq '');`
`337`	`337`	`$self->{disablelinkerwarnings} .= $warnings;`
`338`	`338`	`}`
`339`	`339`
`@@ -348,6 +348,10 @@ sub Save`
`348`	`348`	`$self->FullExportDLL($self->{name} . ".lib");`
`349`	`349`	`}`
`350`	`350`
	`351`	`+ # Warning 4197 is about double exporting, disable this per`
	`352`	`+ # http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=99193`
	`353`	`+ $self->DisableLinkerWarnings('4197') if ($self->{platform} eq 'x64');`
	`354`	`+`
`351`	`355`	`# Dump the project`
`352`	`356`	`open(F, ">$self->{name}.vcproj") \|\| croak("Could not write to $self->{name}.vcproj\n");`
`353`	`357`	`$self->WriteHeader(*F);`
`@@ -494,7 +498,9 @@ sub WriteConfiguration`
`494`	`498`	`}`
`495`	`499`	`$libs =~ s/ $//;`
`496`	`500`	`$libs =~ s/__CFGNAME__/$cfgname/g;`
	`501`	`+`
`497`	`502`	`my $targetmachine = $self->{platform} eq 'Win32' ? 1 : 17;`
	`503`	`+`
`498`	`504`	`print $f <<EOF;`
`499`	`505`	`<Configuration Name="$cfgname\|$self->{platform}" OutputDirectory=".\\$cfgname\\$self->{name}" IntermediateDirectory=".\\$cfgname\\$self->{name}"`
`500`	`506`	`ConfigurationType="$cfgtype" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2" WholeProgramOptimization="$p->{wholeopt}">`