Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit28e5e56

Browse files
committed
Fix and simplify MSVC build's handling of xml/xslt/uuid dependencies.
Solution.pm mistakenly believed that the xml option requires the xsltoption, when actually the dependency is the other way around; and itbelieved that libxml requires libiconv, which is not necessarily so,so we shouldn't enforce it here. Fix the option cross-checking logic.Also, since AddProject already takes care of adding libxml and libxsltinclude and library dependencies to every project, there's no needfor the custom code that did that in mkvcbuild. While at it, let'shandle the similar dependencies for uuid in a similar fashion.Given the lack of field complaints about these overly strict builddependency requirements, there seems no need for a back-patch.Michael PaquierDiscussion: <CAB7nPqR0+gpu3mRQvFjf-V-bMxmiSJ6NpTg9_WzVDL+a31cV2g@mail.gmail.com>
1 parent2459833 commit28e5e56

File tree

2 files changed

+9
-25
lines changed

2 files changed

+9
-25
lines changed

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -381,18 +381,7 @@ sub mkvcbuild
381381
$zic->AddDirResourceFile('src/timezone');
382382
$zic->AddReference($libpgcommon,$libpgport);
383383

384-
if ($solution->{options}->{xml})
385-
{
386-
$contrib_extraincludes->{'pgxml'} = [
387-
$solution->{options}->{xml} .'/include',
388-
$solution->{options}->{xslt} .'/include',
389-
$solution->{options}->{iconv} .'/include' ];
390-
391-
$contrib_extralibs->{'pgxml'} = [
392-
$solution->{options}->{xml} .'/lib/libxml2.lib',
393-
$solution->{options}->{xslt} .'/lib/libxslt.lib' ];
394-
}
395-
else
384+
if (!$solution->{options}->{xml})
396385
{
397386
push@contrib_excludes,'xml2';
398387
}
@@ -402,14 +391,7 @@ sub mkvcbuild
402391
push@contrib_excludes,'sslinfo';
403392
}
404393

405-
if ($solution->{options}->{uuid})
406-
{
407-
$contrib_extraincludes->{'uuid-ossp'} =
408-
[$solution->{options}->{uuid} .'/include' ];
409-
$contrib_extralibs->{'uuid-ossp'} =
410-
[$solution->{options}->{uuid} .'/lib/uuid.lib' ];
411-
}
412-
else
394+
if (!$solution->{options}->{uuid})
413395
{
414396
push@contrib_excludes,'uuid-ossp';
415397
}

‎src/tools/msvc/Solution.pm

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,9 @@ sub _new
3737
unlessexists$options->{float8byval};
3838
die"float8byval not permitted on 32 bit platforms"
3939
if$options->{float8byval} &&$bits == 32;
40-
if ($options->{xml})
40+
if ($options->{xslt} && !$options->{xml})
4141
{
42-
if (!($options->{xslt} &&$options->{iconv}))
43-
{
44-
die"XML requires both XSLT and ICONV\n";
45-
}
42+
die"XSLT requires XML\n";
4643
}
4744
$options->{blocksize} = 8
4845
unless$options->{blocksize};# undef or 0 means default
@@ -555,6 +552,11 @@ sub AddProject
555552
$proj->AddIncludeDir($self->{options}->{xslt} .'\include');
556553
$proj->AddLibrary($self->{options}->{xslt} .'\lib\libxslt.lib');
557554
}
555+
if ($self->{options}->{uuid})
556+
{
557+
$proj->AddIncludeDir($self->{options}->{uuid} .'\include');
558+
$proj->AddLibrary($self->{options}->{uuid} .'\lib\uuid.lib');
559+
}
558560
return$proj;
559561
}
560562

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp