summaryrefslogtreecommitdiff
blob: 2b87839a762b605110f99118d0be9c1fc0809c3e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
https://github.com/MediaArea/MediaInfoLib/pull/1434
https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1823029.html

From: Jan Palus <jpalus@fastmail.com>
Date: Wed, 22 Sep 2021 12:10:41 +0200
Subject: [PATCH] ADM: compile-in tfsxml unconditionally (unrelated to
 tinyxml2)

Fixes unresolved symbols when compiling with system tinyxml2.
--- a/Makefile.am
+++ b/Makefile.am
@@ -230,7 +230,8 @@ lib@MediaInfoLib_LibName@_la_SOURCES = \
                        ../../../Source/MediaInfo/Video/File_Vp8.cpp \
                        ../../../Source/MediaInfo/Video/File_Y4m.cpp \
                        ../../../Source/MediaInfo/XmlUtils.cpp \
-                       ../../../Source/MediaInfo/OutputHelpers.cpp
+                       ../../../Source/MediaInfo/OutputHelpers.cpp \
+                       ../../../Source/ThirdParty/tfsxml/tfsxml.c
 
 @MediaInfoLib_LibName@includedir = $(includedir)/MediaInfo
 @MediaInfoLib_LibName@include_HEADERS = \
@@ -280,7 +281,6 @@ endif
 
 if COMPILE_TINYXML2
 lib@MediaInfoLib_LibName@_la_SOURCES += \
-                       ../../../Source/ThirdParty/tfsxml/tfsxml.c \
                        ../../../Source/ThirdParty/tinyxml2/tinyxml2.cpp
 endif