diff options
| -rw-r--r-- | docs/README.android | 6 | ||||
| -rw-r--r-- | docs/README.ios | 6 | ||||
| -rw-r--r-- | docs/README.linux | 6 | ||||
| -rw-r--r-- | docs/README.osx | 6 | ||||
| -rw-r--r-- | tools/buildsteps/defaultenv | 2 | ||||
| -rw-r--r-- | tools/depends/target/binary-addons/Makefile (renamed from tools/depends/target/xbmc-pvr-addons/Makefile) | 2 | ||||
| -rw-r--r-- | tools/depends/target/xbmc-audioencoder-addons/Makefile | 5 |
7 files changed, 18 insertions, 15 deletions
diff --git a/docs/README.android b/docs/README.android index d40e0ca9b9..a9c4c679f1 100644 --- a/docs/README.android +++ b/docs/README.android @@ -200,8 +200,10 @@ on with the Android toolchain and creating an Android Application Package having to input these with each configure. # make -j <jobs> - # make -j <jobs> -C target/xbmc-pvr-addons - # make -j <jobs> -C target/xbmc-audioencoder-addons + # make -j <jobs> -C target/binary-addons + + NOTE: if you only want to build specific addons you can specify like this: + # make -C target/binary-addons ADDONS="pvr.hts pvr.dvblink" This build was designed to be massively parallel. Don't be afraid to give it a 'make -j20' or so. diff --git a/docs/README.ios b/docs/README.ios index e0b0a462c2..c0ea872169 100644 --- a/docs/README.ios +++ b/docs/README.ios @@ -80,9 +80,11 @@ constellations of Xcode and osx versions (to be updated once we know more): $ ./bootstrap $ ./configure --host=arm-apple-darwin $ make - $ make -C target/xbmc-pvr-addons - $ make -C target/xbmc-audioencoder-addons + $ make -C target/binary-addons + NOTE: if you only want to build specific addons you can specify like this: + $ make -C target/binary-addons ADDONS="pvr.hts pvr.dvblink" + NOTE: You can speedup compilation on multicore systems by doing "make -j<number of cores>" instead of "make". For a dualcore this would read: "make -j2" diff --git a/docs/README.linux b/docs/README.linux index caabad47c4..90729bd730 100644 --- a/docs/README.linux +++ b/docs/README.linux @@ -99,11 +99,13 @@ Tip: By adding -j<number> to the make command, you describe how many Note: From v14 with commit 4090a5f a new API for binary audio encoder and pvr addons is available, if you need to compile them do: - $ make -C tools/depends/target/xbmc-audioencoder-addons PREFIX=/<system prefix you added on step 4.1> - $ make -C tools/depends/target/xbmc-pvr-addons PREFIX=/<system prefix you added on step 4.1> + $ make -C tools/depends/target/binary-addons PREFIX=/<system prefix you added on step 4.1> .3 $ make install +Note: if you only want to build specific addons you can specify like this: + $ make -C tools/depends/target/binary-addons PREFIX=/<system prefix you added on step 4.1> ADDONS="pvr.hts pvr.dvblink" + This will install Kodi in the prefix provided in 4.1 as well as a launcher script. Note: You may need to run this with sudo (sudo make install) if your user doesn't have write permissions diff --git a/docs/README.osx b/docs/README.osx index 933d5a4f66..a42c435191 100644 --- a/docs/README.osx +++ b/docs/README.osx @@ -86,8 +86,10 @@ constellations of Xcode and osx versions (to be updated once we know more): $ make 3.2.3 Compile binary addons - $ make -C target/xbmc-pvr-addons - $ make -C target/xbmc-audioencoder-addons + $ make -C target/binary-addons + + NOTE: if you only want to build specific addons you can specify like this: + $ make -C target/binary-addons ADDONS="pvr.hts pvr.dvblink" NOTE: You can speedup compilation on multicore systems by doing "make -j<number of cores>" instead of "make". For a dualcore this would read: diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index b97624598b..11791f0f69 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -9,7 +9,7 @@ FAILED_BUILD_FILENAME=".last_failed_revision" TARBALLS=${TARBALLS:-"/opt/xbmc-tarballs"} BINARY_ADDONS_ROOT=tools/depends/target -BINARY_ADDONS="xbmc-audioencoder-addons xbmc-pvr-addons" +BINARY_ADDONS="binary-addons" DEPLOYED_BINARY_ADDONS="-e addons" #set platform defaults diff --git a/tools/depends/target/xbmc-pvr-addons/Makefile b/tools/depends/target/binary-addons/Makefile index 8deb666dab..3cd0d89087 100644 --- a/tools/depends/target/xbmc-pvr-addons/Makefile +++ b/tools/depends/target/binary-addons/Makefile @@ -1,5 +1,5 @@ BUILDDIR := $(shell pwd) -ADDONS = "pvr.argustv pvr.demo pvr.dvblink pvr.dvbviewer pvr.filmon pvr.hts pvr.iptvsimple pvr.mediaportal.tvserver pvr.mythtv pvr.nextpvr pvr.njoy pvr.vdr.vnsi pvr.vuplus pvr.wmc" +ADDONS = "pvr.argustv pvr.demo pvr.dvblink pvr.dvbviewer pvr.filmon pvr.hts pvr.iptvsimple pvr.mediaportal.tvserver pvr.mythtv pvr.nextpvr pvr.njoy pvr.vdr.vnsi pvr.vuplus pvr.wmc audioencoder.flac audioencoder.lame audioencoder.vorbis audioencoder.wav" -include ../../Makefile.include include ../../xbmc-addons.include diff --git a/tools/depends/target/xbmc-audioencoder-addons/Makefile b/tools/depends/target/xbmc-audioencoder-addons/Makefile deleted file mode 100644 index bd9307375e..0000000000 --- a/tools/depends/target/xbmc-audioencoder-addons/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -BUILDDIR := $(shell pwd) -ADDONS = "audioencoder.flac audioencoder.lame audioencoder.vorbis audioencoder.wav" - --include ../../Makefile.include -include ../../xbmc-addons.include |