Added icu-related stuff to MSVC build perl scripts

vbwagner · vbwagner · commit 481ce1613451 · 2016-03-11T17:41:30.000+03:00
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -234,6 +234,10 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
 			print O "#define DEF_PGPORT $port\n";
 			print O "#define DEF_PGPORT_STR \"$port\"\n";
 		}
+		if ($self->{options}->{icu}) 
+		{
+			print O "#define USE_ICU\n";
+		}
 		print O "#define VAL_CONFIGURE \""
 		  . $self->GetFakeConfigure() . "\"\n";
 		print O "#endif /* IGNORE_CONFIGURED_SETTINGS */\n";
@@ -528,6 +532,14 @@ sub AddProject
 		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
 		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
 	}
+	if ($self->{options}->{icu})
+	{
+		my $libdir = $self->{options}->{icu}.'\lib';
+		$libdir .= '\lib64' if $self->{platform} eq 'x64';
+		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
+		$proj->AddLibrary($libdir.'\icuin.lib');
+		$proj->AddLibrary($libdir.'\icuuc.lib');
+	}	
 	return $proj;
 }
 
@@ -639,7 +651,7 @@ sub GetFakeConfigure
 	$cfg .= ' --with-tcl'           if ($self->{options}->{tcl});
 	$cfg .= ' --with-perl'          if ($self->{options}->{perl});
 	$cfg .= ' --with-python'        if ($self->{options}->{python});
-
+	$cfg .=' --with-icu'			if ($self->{options}->{icu});
 	return $cfg;
 }
 
diff --git a/src/tools/msvc/config_default.pl b/src/tools/msvc/config_default.pl
@@ -25,7 +25,8 @@
 	xml       => undef,    # --with-libxml=<path>
 	xslt      => undef,    # --with-libxslt=<path>
 	iconv     => undef,    # (not in configure, path to iconv)
-	zlib      => undef     # --with-zlib=<path>
+	zlib      => undef,    # --with-zlib=<path>
+	icu       => undef     # --with-icu=<path>
 };
 
 1;
