diff options
| author | alcoheca <alcoheca@svn> | 2010-03-26 22:39:18 +0000 |
|---|---|---|
| committer | alcoheca <alcoheca@svn> | 2010-03-26 22:39:18 +0000 |
| commit | f8e1c7c6a1c63240e7a295c5511e3830355da927 (patch) | |
| tree | 453564208f174d8f58a00eb92d19e69a0ed5145a | |
| parent | cc2686f06fed03356a2f834105be5c63097ddbad (diff) | |
build libcpluff, will be dlloaded from system
more cpluff decrufting
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28874 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rw-r--r-- | .gitignore | 21 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rwxr-xr-x | bootstrap | 1 | ||||
| -rw-r--r-- | configure.in | 2 |
4 files changed, 29 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 713d685ce1..4f404cc24b 100644 --- a/.gitignore +++ b/.gitignore @@ -676,9 +676,30 @@ config.log /xbmc/lib/cximage-6.0/zlib/zconf.h /xbmc/lib/cximage-6.0/zlib/Makefile +# /skin/ /skin/Confluence/media/Textures.xbt /skin/PM3.HD/media/Textures.xbt +# /lib/cpluff/ +/lib/cpluff/ABOUT-NLS +/lib/cpluff/aclocal.m4 +/lib/cpluff/autom4te.cache +/lib/cpluff/auxliary +/lib/cpluff/config* +/lib/cpluff/console +/lib/cpluff/doc* +/lib/cpluff/examples +/lib/cpluff/libcpluff/docsrc +/lib/cpluff/libcpluff/Makefile.in +/lib/cpluff/libtool +/lib/cpluff/loader +/lib/cpluff/m4 +/lib/cpluff/Makefile.in +/lib/cpluff/po +/lib/cpluff/stamp-h1 +/lib/cpluff/test + +# /lib/libmodplug/ /lib/libmodplug/libtool /lib/libmodplug/src/stamp-h1 /lib/libmodplug/Makefile diff --git a/Makefile.in b/Makefile.in index 5faad428ba..82359911be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -95,6 +95,7 @@ LIB_DIRS=\ xbmc/lib/libid3tag \ xbmc/lib/libapetag \ xbmc/lib/libPython/linux \ + lib/libcpluff \ lib/libmodplug \ lib/xbmc-dll-symbols \ lib/jsoncpp/jsoncpp/src/lib_json @@ -270,6 +271,9 @@ xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs/libbdnav.a: force $(MAKE) -C xbmc/cores/dvdplayer/Codecs/libbdnav xbmc/lib/libapetag/.libs/libapetag.a: force $(MAKE) -C xbmc/lib/libapetag +lib/cpluff/libcpluff/.libs/libcpluff.a: force + $(MAKE) -C lib/cpluff/libcpluff +system/libcpluff-$(ARCH).so: lib/cpluff/libcpluff/.libs/libcpluff.a lib/libmodplug/src/.libs/libmodplug.a: force $(MAKE) -C lib/libmodplug system/players/paplayer/libmodplug-$(ARCH).so: lib/libmodplug/src/.libs/libmodplug.a @@ -359,6 +363,7 @@ xcode_depends: \ skins \ xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/.libs/libbdnav.a \ xbmc/lib/libapetag/.libs/libapetag.a \ + system/libcpluff-$(ARCH).so \ system/players/paplayer/libmodplug-$(ARCH).so \ xbmc/lib/cmyth/libcmyth/libcmyth.a \ xbmc/lib/cmyth/librefmem/librefmem.a \ @@ -3,6 +3,7 @@ set -e autoreconf -vif +autoreconf -vif lib/cpluff autoreconf -vif xbmc/lib/libass autoreconf -vif xbmc/cores/dvdplayer/Codecs/libbdnav diff --git a/configure.in b/configure.in index abe6d81ea3..4800e59fad 100644 --- a/configure.in +++ b/configure.in @@ -1495,6 +1495,8 @@ XB_CONFIG_MODULE([lib/libmicrohttpd], [ fi ], [0]) +XB_CONFIG_MODULE([lib/cpluff], [./configure], [0]) + AC_OUTPUT final_message="$final_message\n prefix:\t$prefix\n$dashes" |