Commitf3525cb

committed

Merge branch 'PGPRO9_6_winedit' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_6_winedit

2 parents3620051 +95e753d commitf3525cbCopy full SHA for f3525cb

File tree

+14

-0

lines changed

+14

-0

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,14 @@ sub GenerateFiles`
`243`	`243`	`print O"#define DEF_PGPORT$port\n";`
`244`	`244`	`print O"#define DEF_PGPORT_STR\"$port\"\n";`
`245`	`245`	`}`
	`246`	`+if ($self->{options}->{libedit})`
	`247`	`+{`
	`248`	`+print O"#define HAVE_EDITLINE_READLINE_H\n";`
	`249`	`+print O"#define HAVE_LIBREADLINE\n";`
	`250`	`+print O"#define HAVE_WIN32_LIBEDIT\n";`
	`251`	`+print O"#define HAVE_RL_FILENAME_COMPLETION_FUNCTION\n";`
	`252`	`+print O"#define HAVE_RL_COMPLETION_MATCHES\n";`
	`253`	`+}`
`246`	`254`	`if ($self->{options}->{icu})`
`247`	`255`	`{`
`248`	`256`	`print O"#define USE_ICU\n";`
`@@ -576,6 +584,12 @@ sub AddProject`
`576`	`584`	`$proj->AddIncludeDir($self->{options}->{xslt} .'\include');`
`577`	`585`	`$proj->AddLibrary($self->{options}->{xslt} .'\lib\libxslt.lib');`
`578`	`586`	`}`
	`587`	`+if ($self->{options}->{libedit})`
	`588`	`+{`
	`589`	`+$proj->AddIncludeDir($self->{options}->{libedit} .'\include');`
	`590`	`+$proj->AddLibrary($self->{options}->{libedit} ."\\" .`
	`591`	`+($self->{platform}eq'x64'?'lib64':'lib32').'\edit.lib');`
	`592`	`+}`
`579`	`593`	`if ($self->{options}->{icu})`
`580`	`594`	`{`
`581`	`595`	`my$libdir =$self->{options}->{icu}.'\lib';`

Comments

(0)