Commit481ce16

committed

Added icu-related stuff to MSVC build perl scripts

1 parentc56d19d commit481ce16Copy full SHA for 481ce16

File tree

+15

-2

lines changed

+15

-2

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,10 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`234`	`234`	`print O"#define DEF_PGPORT$port\n";`
`235`	`235`	`print O"#define DEF_PGPORT_STR\"$port\"\n";`
`236`	`236`	`}`
	`237`	`+if ($self->{options}->{icu})`
	`238`	`+{`
	`239`	`+print O"#define USE_ICU\n";`
	`240`	`+}`
`237`	`241`	`print O"#define VAL_CONFIGURE\""`
`238`	`242`	`.$self->GetFakeConfigure() ."\"\n";`
`239`	`243`	`print O"#endif /* IGNORE_CONFIGURED_SETTINGS */\n";`
`@@ -528,6 +532,14 @@ sub AddProject`
`528`	`532`	`$proj->AddIncludeDir($self->{options}->{xslt} .'\include');`
`529`	`533`	`$proj->AddLibrary($self->{options}->{xslt} .'\lib\libxslt.lib');`
`530`	`534`	`}`
	`535`	`+if ($self->{options}->{icu})`
	`536`	`+{`
	`537`	`+my$libdir =$self->{options}->{icu}.'\lib';`
	`538`	`+$libdir .='\lib64'if$self->{platform}eq'x64';`
	`539`	`+$proj->AddIncludeDir($self->{options}->{icu} .'\include');`
	`540`	`+$proj->AddLibrary($libdir.'\icuin.lib');`
	`541`	`+$proj->AddLibrary($libdir.'\icuuc.lib');`
	`542`	`+}`
`531`	`543`	`return$proj;`
`532`	`544`	`}`
`533`	`545`
`@@ -639,7 +651,7 @@ sub GetFakeConfigure`
`639`	`651`	`$cfg .=' --with-tcl'if ($self->{options}->{tcl});`
`640`	`652`	`$cfg .=' --with-perl'if ($self->{options}->{perl});`
`641`	`653`	`$cfg .=' --with-python'if ($self->{options}->{python});`
`642`		`-`
	`654`	`+$cfg .=' --with-icu'if ($self->{options}->{icu});`
`643`	`655`	`return$cfg;`
`644`	`656`	`}`
`645`	`657`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@`
`25`	`25`	`xml=>undef,# --with-libxml=<path>`
`26`	`26`	`xslt=>undef,# --with-libxslt=<path>`
`27`	`27`	`iconv=>undef,# (not in configure, path to iconv)`
`28`		`-zlib=>undef# --with-zlib=<path>`
	`28`	`+zlib=>undef,# --with-zlib=<path>`
	`29`	`+icu=>undef# --with-icu=<path>`
`29`	`30`	`};`
`30`	`31`
`31`	`32`	`1;`

Comments

(0)