diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-06-13 09:13:32 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-06-13 09:13:32 -0400 |
| commit | ae1aa28eb6a0adb1ae0b36eb25a7d0ee2ee3db0b (patch) | |
| tree | e92c3cbbae5bc68be7762c979ddc623534b07f64 | |
| parent | ec7129b7812ce276520f749d0946875663c34093 (diff) | |
| download | postgresql-ae1aa28eb6a0adb1ae0b36eb25a7d0ee2ee3db0b.tar.gz postgresql-ae1aa28eb6a0adb1ae0b36eb25a7d0ee2ee3db0b.zip | |
Use correct ICU path for Windows 32 vs. 64 bit
Author: Ashutosh Sharma <ashu.coek88@gmail.com>
| -rw-r--r-- | src/tools/msvc/Solution.pm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 8bc6a18eeeb..fc71ebe7ada 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}) { |