Skip to content

Commit

Permalink
Use system implementation of tinyxml instead of internal implementation.
Browse files Browse the repository at this point in the history
  • Loading branch information
amejia1 committed May 4, 2012
1 parent 51af60f commit bbbabb3
Show file tree
Hide file tree
Showing 97 changed files with 406 additions and 6,268 deletions.
1 change: 0 additions & 1 deletion Makefile.in
Expand Up @@ -26,7 +26,6 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
lib/libXDAAP/libxdaap.a \
lib/libhts/libhts.a \
lib/libsquish/libsquish.a \
lib/tinyXML/tinyxml.a \
lib/xbmc-dll-symbols/dll-symbols.a \
xbmc/addons/addons.a \
xbmc/cdrip/cdrip.a \
Expand Down
3 changes: 3 additions & 0 deletions configure.in
Expand Up @@ -748,6 +748,9 @@ PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
PKG_CHECK_MODULES([FREETYPE2], [freetype2],
[INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([TINYXML], [tinyxml],
[INCLUDES="$INCLUDES $TINYXML_CFLAGS"; LIBS="$LIBS $TINYXML_LIBS"],
AC_MSG_ERROR($missing_library))

This comment has been minimized.

Copy link
@huceke

huceke May 4, 2012

Contributor

This check is wrong. Tinyxml doesn't contain a pkg-config file. Debian added one to their package ( debian/tinyxml.pc ). Other distributions might not include one ( for example Archlinux ).

This comment has been minimized.

Copy link
@Fneufneu

Fneufneu May 4, 2012

Member

i confirm, no pkg-config for FreeBSD too
you can check tinyxm.h header or libtinyxml.so lib

This comment has been minimized.

Copy link
@huceke

huceke May 4, 2012

Contributor

Made a PR for it : #927

This comment has been minimized.

Copy link
@otzy007

otzy007 May 4, 2012

Contributor

Also in Slackware I get an error that TINYXML was not found, but I have tinyxml 2.6.2 installed

# check for libbluray
AS_CASE([x$use_libbluray],
Expand Down
9 changes: 0 additions & 9 deletions lib/tinyXML/Makefile

This file was deleted.

116 changes: 0 additions & 116 deletions lib/tinyXML/tinystr.cpp

This file was deleted.

0 comments on commit bbbabb3

Please sign in to comment.