Skip to content

Commit 4e9cb43

Browse files
committed
[pvr] added PVR support to XBMC (taken from opdenkamp@c576c08)
add-ons are not included, but can be found here: https://github.com/opdenkamp/xbmc-pvr-addons
1 parent c79dd45 commit 4e9cb43

File tree

334 files changed

+51687
-659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

334 files changed

+51687
-659
lines changed

.gitignore

+37
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ config.log
4141
*.vcxproj.*.user
4242
*.vcxproj.user
4343
*.obj
44+
*.idb
4445
*ReSharper*
4546
*.idb
4647

@@ -65,6 +66,11 @@ config.log
6566
.libs/
6667
.deps/
6768

69+
# Eclipse project files. Not needed as they are generated in two clicks if needed.
70+
.settings
71+
.project
72+
.cproject
73+
6874
# /
6975
/.dummy
7076
/.dummy.in
@@ -75,6 +81,7 @@ config.log
7581
/build-aux/config.guess
7682
/build-aux/config.sub
7783
/build-aux/install-sh
84+
/build-aux/ltmain.sh
7885
/build-aux/missing
7986
/build-aux/ltmain.sh
8087
/autotools
@@ -153,6 +160,17 @@ config.log
153160
/lib/asap/xbmc/xbmc_asap.res
154161

155162

163+
# /lib/addons/
164+
/lib/addons/library.xbmc.addon/Makefile
165+
/lib/addons/library.xbmc.gui/Makefile
166+
/lib/addons/library.xbmc.pvr/Makefile
167+
/lib/addons/library.xbmc.addon/project/VS2010Express/Release
168+
/lib/addons/library.xbmc.addon/project/VS2010Express/Debug
169+
/lib/addons/library.xbmc.gui/project/VS2010Express/Release
170+
/lib/addons/library.xbmc.gui/project/VS2010Express/Debug
171+
/lib/addons/library.xbmc.pvr/project/VS2010Express/Release
172+
/lib/addons/library.xbmc.pvr/project/VS2010Express/Debug
173+
156174
# /lib/cmyth/
157175
lib/cmyth/Makefile
158176

@@ -220,6 +238,11 @@ lib/cmyth/Makefile
220238
/lib/libass/libass/Makefile.in
221239
/lib/libass/libtool
222240
/lib/libass/ltmain.sh
241+
/lib/libass/m4/libtool.m4
242+
/lib/libass/m4/ltoptions.m4
243+
/lib/libass/m4/ltsugar.m4
244+
/lib/libass/m4/ltversion.m4
245+
/lib/libass/m4/lt~obsolete.m4
223246
/lib/libass/missing
224247
/lib/libass/shave/libtool.m4
225248
/lib/libass/shave/ltoptions.m4
@@ -303,6 +326,7 @@ lib/cmyth/Makefile
303326
/lib/libapetag/config.h
304327
/lib/libapetag/install-sh
305328
/lib/libapetag/libtool
329+
/lib/libapetag/m4/lt~obsolete.m4
306330
/lib/libapetag/stamp-h1
307331

308332
# /project
@@ -1138,6 +1162,12 @@ lib/cmyth/Makefile
11381162
/lib/libXDAAP/libXDAAP_win32/Debug
11391163
/lib/libXDAAP/libXDAAP_win32/Release
11401164

1165+
# /xbmc/osx/
1166+
/xbmc/osx/Makefile
1167+
1168+
# /portable_data
1169+
/portable_data
1170+
11411171
/xbmc/screensavers/Makefile
11421172

11431173
/xbmc/screensavers/rsxs-0.9/Makefile
@@ -1237,3 +1267,10 @@ xbmc/visualizations/EGLHelpers/Makefile
12371267
/xbmc/visualizations/XBMCProjectM/libprojectM/config.inp
12381268

12391269
/xbmc/win32/git_rev.h
1270+
1271+
/addons/library.xbmc.addon/libXBMC_addon.dll
1272+
/addons/library.xbmc.addon/libXBMC_addon.lib
1273+
/addons/library.xbmc.gui/libXBMC_gui.dll
1274+
/addons/library.xbmc.gui/libXBMC_gui.lib
1275+
/addons/library.xbmc.pvr/libXBMC_pvr.dll
1276+
/addons/library.xbmc.pvr/libXBMC_pvr.lib

Makefile.in

+28-5
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
4141
xbmc/cores/playercorefactory/playercorefactory.a \
4242
xbmc/dbwrappers/dbwrappers.a \
4343
xbmc/dialogs/dialogs.a \
44+
xbmc/epg/epg.a \
4445
xbmc/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a \
4546
xbmc/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a \
4647
xbmc/filesystem/filesystem.a \
@@ -70,6 +71,13 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
7071
xbmc/playlists/playlists.a \
7172
xbmc/powermanagement/powermanagement.a \
7273
xbmc/programs/programs.a \
74+
xbmc/pvr/addons/pvraddons.a \
75+
xbmc/pvr/channels/pvrchannels.a \
76+
xbmc/pvr/dialogs/pvrdialogs.a \
77+
xbmc/pvr/pvr.a \
78+
xbmc/pvr/recordings/pvrrecordings.a \
79+
xbmc/pvr/timers/pvrtimers.a \
80+
xbmc/pvr/windows/pvrwindows.a \
7381
xbmc/rendering/rendering.a \
7482
xbmc/settings/settings.a \
7583
xbmc/storage/storage.a \
@@ -191,6 +199,11 @@ ifneq (@DISABLE_GOOM@,1)
191199
VIS_DIRS+=xbmc/visualizations/Goom
192200
endif
193201

202+
LIBADDON_DIRS=\
203+
lib/addons/library.xbmc.addon \
204+
lib/addons/library.xbmc.pvr \
205+
lib/addons/library.xbmc.gui \
206+
194207
CONFLUENCE_MEDIA=addons/skin.confluence/media
195208
SKIN_DIRS=$(CONFLUENCE_MEDIA)
196209

@@ -200,7 +213,7 @@ SKIN_DIRS+=$(TOUCHED_MEDIA)
200213
endif
201214

202215
DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
203-
$(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(SKIN_DIRS)
216+
$(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS)
204217

205218
LIBS=@LIBS@
206219
CFLAGS=@CFLAGS@
@@ -235,7 +248,7 @@ all : $(FINAL_TARGETS)
235248
include Makefile.include
236249

237250
.PHONY : dllloader exports visualizations screensavers eventclients papcodecs \
238-
dvdpcodecs imagelib codecs externals force skins
251+
dvdpcodecs imagelib codecs externals force skins libaddon
239252

240253
# hack targets to keep build system up to date
241254
Makefile : config.status $(addsuffix .in, $(AUTOGENERATED_MAKEFILES))
@@ -308,6 +321,10 @@ visualizations: $(VIS_DIRS)
308321

309322
screensavers: $(SS_DIRS)
310323

324+
libaddon: exports
325+
$(MAKE) -C lib/addons/library.xbmc.addon
326+
$(MAKE) -C lib/addons/library.xbmc.gui
327+
$(MAKE) -C lib/addons/library.xbmc.pvr
311328
libpython: dllloader
312329
$(MAKE) -C xbmc/interfaces/python
313330
$(MAKE) -C xbmc/interfaces/python/xbmcmodule
@@ -355,10 +372,10 @@ codecs: papcodecs dvdpcodecs
355372

356373
libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@[email protected] $(CMYTH)
357374

358-
externals: codecs libs visualizations screensavers
375+
externals: codecs libs visualizations screensavers libaddon
359376

360377
xcode_depends: \
361-
codecs libs visualizations screensavers eventclients skins \
378+
codecs libs visualizations screensavers eventclients skins libaddon \
362379
lib/libsquish/libsquish.a \
363380
lib/libapetag/.libs/libapetag.a \
364381
lib/libRTV/librtv.a \
@@ -377,6 +394,8 @@ DYNOBJSXBMC= \
377394
xbmc/cores/DllLoader/exports/exports.a \
378395
xbmc/settings/settings.a \
379396
xbmc/video/video.a \
397+
xbmc/pvr/addons/pvraddons.a \
398+
xbmc/pvr/windows/pvrwindows.a \
380399
xbmc/guilib/guilib.a # must be dynamic to avoid linker errors
381400

382401
ifeq ($(findstring freebsd,@ARCH@),freebsd)
@@ -521,6 +540,8 @@ uninstall:
521540
@rm -rf $(DESTDIR)$(datarootdir)/xbmc $(DESTDIR)$(bindir)/xbmc
522541
@rm -rf $(DESTDIR)$(bindir)/xbmc-standalone
523542
@rm -rf $(DESTDIR)$(datarootdir)/xsessions/XBMC.desktop
543+
@rm -rf $(libdir)/libXBMC_*
544+
@rm -rf $(prefix)/include/xbmc
524545
@echo "Done!"
525546

526547
clean-xbmc.bin:
@@ -540,11 +561,13 @@ clean-screensavers:
540561
for d in $(SS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
541562
clean-visualisations:
542563
for d in $(VIS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
564+
clean-libaddons:
565+
for d in $(LIBADDON_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
543566

544567
clean-codecs: clean-dvdpcodecs clean-papcodecs
545568

546569
clean-externals: clean-codecs clean-eventclients clean-xbmctex clean-libs \
547-
clean-screensavers clean-visualisations
570+
clean-screensavers clean-visualisations clean-libaddons
548571

549572
check:
550573
for d in $(CHECK_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d $@; fi; done

0 commit comments

Comments
 (0)