Commitc85077c

committed

Support for zstd configuration option in Windows build

1 parente39141c commitc85077cCopy full SHA for c85077c

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
`@@ -263,6 +263,10 @@ sub GenerateFiles`
`263`	`263`	`print O"#define HAVE_RL_FILENAME_COMPLETION_FUNCTION\n";`
`264`	`264`	`print O"#define HAVE_RL_COMPLETION_MATCHES\n";`
`265`	`265`	`}`
	`266`	`+if ($self->{options}->{zstd})`
	`267`	`+{`
	`268`	`+print O"#define CFS_COMPRESSION 6\n";`
	`269`	`+}`
`266`	`270`	`print O"#define VAL_CONFIGURE\""`
`267`	`271`	`.$self->GetFakeConfigure() ."\"\n";`
`268`	`272`	`print O"#endif /* IGNORE_CONFIGURED_SETTINGS */\n";`
`@@ -604,6 +608,13 @@ sub AddProject`
`604`	`608`	`$proj->AddLibrary($self->{options}->{libedit} ."\\" .`
`605`	`609`	`($self->{platform}eq'x64'?'lib64':'lib32').'\edit.lib');`
`606`	`610`	`}`
	`611`	`+if ($self->{options}->{zstd})`
	`612`	`+{`
	`613`	`+$proj->AddIncludeDir($self->{options}->{zstd});`
	`614`	`+$proj->AddLibrary($self->{options}->{zstd}."\\".`
	`615`	`+($self->{platform}eq'x64'?"zstdlib_x64.lib" :"zstdlib_x86.lib")`
	`616`	`+ );`
	`617`	`+}`
`607`	`618`	`return$proj;`
`608`	`619`	`}`
`609`	`620`
`@@ -715,7 +726,8 @@ sub GetFakeConfigure`
`715`	`726`	`$cfg .=' --with-tcl'if ($self->{options}->{tcl});`
`716`	`727`	`$cfg .=' --with-perl'if ($self->{options}->{perl});`
`717`	`728`	`$cfg .=' --with-python'if ($self->{options}->{python});`
`718`		`-$cfg .=' --with-icu'if ($self->{options}->{icu});`
	`729`	`+$cfg .=' --with-icu'if ($self->{options}->{icu});`
	`730`	`+$cfg .=' --with-zstd'if ($self->{options}->{zstd});`
`719`	`731`	`return$cfg;`
`720`	`732`	`}`
`721`	`733`

Lines changed: 2 additions & 1 deletion

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

Comments

(0)