Skip to content

Commit

Permalink
Merge pull request xbmc#931 from amejia1/system-tinyxml-Eden
Browse files Browse the repository at this point in the history
System tinyxml eden
  • Loading branch information
amejia1 committed May 10, 2012
2 parents 701e543 + 565c88f commit 6f76eee
Show file tree
Hide file tree
Showing 100 changed files with 418 additions and 6,271 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
2 changes: 1 addition & 1 deletion README.linux
Expand Up @@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev,
libplist-dev, libusb-dev, libudev-dev, libltdl-dev
libplist-dev, libusb-dev, libudev-dev, libltdl-dev, libtinyxml-dev

*** For developers and anyone else who compiles frequently it is recommended to
use ccache
Expand Down
2 changes: 1 addition & 1 deletion README.ubuntu
Expand Up @@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:

For Ubuntu (all versions >= 7.04):

# sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev libusb-dev libudev-dev
# sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev libusb-dev libudev-dev libtinyxml-dev

For >= 10.10:
# sudo apt-get install autopoint libltdl-dev
Expand Down
1 change: 1 addition & 0 deletions configure.in
Expand Up @@ -719,6 +719,7 @@ AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
AC_CHECK_LIB([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth]))
AC_CHECK_LIB([yajl], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([tinyxml], [main],, AC_MSG_ERROR($missing_library))

PKG_CHECK_MODULES([FONTCONFIG], [fontconfig],
[INCLUDES="$INCLUDES $FONTCONFIG_CFLAGS"; LIBS="$LIBS $FONTCONFIG_LIBS"],
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 6f76eee

Please sign in to comment.