]> granicus.if.org Git - postgresql/commitdiff
Use correct ICU path for Windows 32 vs. 64 bit
authorPeter Eisentraut <peter_e@gmx.net>
Tue, 13 Jun 2017 13:13:32 +0000 (09:13 -0400)
committerPeter Eisentraut <peter_e@gmx.net>
Tue, 13 Jun 2017 13:13:32 +0000 (09:13 -0400)
Author: Ashutosh Sharma <ashu.coek88@gmail.com>

src/tools/msvc/Solution.pm

index 8bc6a18eeeb11c313fa6339df27451402f8d38ef..fc71ebe7adaf183678eb25001f78e52c486c5198 100644 (file)
@@ -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})
        {