From: Peter Eisentraut <peter_e@gmx.net>
Date: Tue, 13 Jun 2017 13:13:32 +0000 (-0400)
Subject: Use correct ICU path for Windows 32 vs. 64 bit
X-Git-Tag: REL_10_BETA2~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae1aa28eb6a0adb1ae0b36eb25a7d0ee2ee3db0b;p=postgresql

Use correct ICU path for Windows 32 vs. 64 bit

Author: Ashutosh Sharma <ashu.coek88@gmail.com>
---

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 8bc6a18eee..fc71ebe7ad 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -562,9 +562,18 @@ sub AddProject
 	if ($self->{options}->{icu})
 	{
 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
-		$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
-		$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
-		$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
+		if ($self->{platform} eq 'Win32')
+		{
+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
+		}
+		else
+		{
+			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
+			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
+			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
+		}
 	}
 	if ($self->{options}->{xml})
 	{