Skip to content

Commit

Permalink
[pvr] added PVR support to XBMC (taken from opdenkamp@c576c08)
Browse files Browse the repository at this point in the history
add-ons are not included, but can be found here: https://github.com/opdenkamp/xbmc-pvr-addons
  • Loading branch information
opdenkamp committed Sep 4, 2012
1 parent c79dd45 commit 4e9cb43
Show file tree
Hide file tree
Showing 334 changed files with 51,687 additions and 659 deletions.
37 changes: 37 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ config.log
*.vcxproj.*.user
*.vcxproj.user
*.obj
*.idb
*ReSharper*
*.idb

Expand All @@ -65,6 +66,11 @@ config.log
.libs/
.deps/

# Eclipse project files. Not needed as they are generated in two clicks if needed.
.settings
.project
.cproject

# /
/.dummy
/.dummy.in
Expand All @@ -75,6 +81,7 @@ config.log
/build-aux/config.guess
/build-aux/config.sub
/build-aux/install-sh
/build-aux/ltmain.sh
/build-aux/missing
/build-aux/ltmain.sh
/autotools
Expand Down Expand Up @@ -153,6 +160,17 @@ config.log
/lib/asap/xbmc/xbmc_asap.res


# /lib/addons/
/lib/addons/library.xbmc.addon/Makefile
/lib/addons/library.xbmc.gui/Makefile
/lib/addons/library.xbmc.pvr/Makefile
/lib/addons/library.xbmc.addon/project/VS2010Express/Release
/lib/addons/library.xbmc.addon/project/VS2010Express/Debug
/lib/addons/library.xbmc.gui/project/VS2010Express/Release
/lib/addons/library.xbmc.gui/project/VS2010Express/Debug
/lib/addons/library.xbmc.pvr/project/VS2010Express/Release
/lib/addons/library.xbmc.pvr/project/VS2010Express/Debug

# /lib/cmyth/
lib/cmyth/Makefile

Expand Down Expand Up @@ -220,6 +238,11 @@ lib/cmyth/Makefile
/lib/libass/libass/Makefile.in
/lib/libass/libtool
/lib/libass/ltmain.sh
/lib/libass/m4/libtool.m4
/lib/libass/m4/ltoptions.m4
/lib/libass/m4/ltsugar.m4
/lib/libass/m4/ltversion.m4
/lib/libass/m4/lt~obsolete.m4
/lib/libass/missing
/lib/libass/shave/libtool.m4
/lib/libass/shave/ltoptions.m4
Expand Down Expand Up @@ -303,6 +326,7 @@ lib/cmyth/Makefile
/lib/libapetag/config.h
/lib/libapetag/install-sh
/lib/libapetag/libtool
/lib/libapetag/m4/lt~obsolete.m4
/lib/libapetag/stamp-h1

# /project
Expand Down Expand Up @@ -1138,6 +1162,12 @@ lib/cmyth/Makefile
/lib/libXDAAP/libXDAAP_win32/Debug
/lib/libXDAAP/libXDAAP_win32/Release

# /xbmc/osx/
/xbmc/osx/Makefile

# /portable_data
/portable_data

/xbmc/screensavers/Makefile

/xbmc/screensavers/rsxs-0.9/Makefile
Expand Down Expand Up @@ -1237,3 +1267,10 @@ xbmc/visualizations/EGLHelpers/Makefile
/xbmc/visualizations/XBMCProjectM/libprojectM/config.inp

/xbmc/win32/git_rev.h

/addons/library.xbmc.addon/libXBMC_addon.dll
/addons/library.xbmc.addon/libXBMC_addon.lib
/addons/library.xbmc.gui/libXBMC_gui.dll
/addons/library.xbmc.gui/libXBMC_gui.lib
/addons/library.xbmc.pvr/libXBMC_pvr.dll
/addons/library.xbmc.pvr/libXBMC_pvr.lib
33 changes: 28 additions & 5 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/cores/playercorefactory/playercorefactory.a \
xbmc/dbwrappers/dbwrappers.a \
xbmc/dialogs/dialogs.a \
xbmc/epg/epg.a \
xbmc/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a \
xbmc/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a \
xbmc/filesystem/filesystem.a \
Expand Down Expand Up @@ -70,6 +71,13 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/playlists/playlists.a \
xbmc/powermanagement/powermanagement.a \
xbmc/programs/programs.a \
xbmc/pvr/addons/pvraddons.a \
xbmc/pvr/channels/pvrchannels.a \
xbmc/pvr/dialogs/pvrdialogs.a \
xbmc/pvr/pvr.a \
xbmc/pvr/recordings/pvrrecordings.a \
xbmc/pvr/timers/pvrtimers.a \
xbmc/pvr/windows/pvrwindows.a \
xbmc/rendering/rendering.a \
xbmc/settings/settings.a \
xbmc/storage/storage.a \
Expand Down Expand Up @@ -191,6 +199,11 @@ ifneq (@DISABLE_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom
endif

LIBADDON_DIRS=\
lib/addons/library.xbmc.addon \
lib/addons/library.xbmc.pvr \
lib/addons/library.xbmc.gui \

CONFLUENCE_MEDIA=addons/skin.confluence/media
SKIN_DIRS=$(CONFLUENCE_MEDIA)

Expand All @@ -200,7 +213,7 @@ SKIN_DIRS+=$(TOUCHED_MEDIA)
endif

DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
$(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(SKIN_DIRS)
$(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS)

LIBS=@LIBS@
CFLAGS=@CFLAGS@
Expand Down Expand Up @@ -235,7 +248,7 @@ all : $(FINAL_TARGETS)
include Makefile.include

.PHONY : dllloader exports visualizations screensavers eventclients papcodecs \
dvdpcodecs imagelib codecs externals force skins
dvdpcodecs imagelib codecs externals force skins libaddon

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

screensavers: $(SS_DIRS)

libaddon: exports
$(MAKE) -C lib/addons/library.xbmc.addon
$(MAKE) -C lib/addons/library.xbmc.gui
$(MAKE) -C lib/addons/library.xbmc.pvr
libpython: dllloader
$(MAKE) -C xbmc/interfaces/python
$(MAKE) -C xbmc/interfaces/python/xbmcmodule
Expand Down Expand Up @@ -355,10 +372,10 @@ codecs: papcodecs dvdpcodecs

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

externals: codecs libs visualizations screensavers
externals: codecs libs visualizations screensavers libaddon

xcode_depends: \
codecs libs visualizations screensavers eventclients skins \
codecs libs visualizations screensavers eventclients skins libaddon \
lib/libsquish/libsquish.a \
lib/libapetag/.libs/libapetag.a \
lib/libRTV/librtv.a \
Expand All @@ -377,6 +394,8 @@ DYNOBJSXBMC= \
xbmc/cores/DllLoader/exports/exports.a \
xbmc/settings/settings.a \
xbmc/video/video.a \
xbmc/pvr/addons/pvraddons.a \
xbmc/pvr/windows/pvrwindows.a \
xbmc/guilib/guilib.a # must be dynamic to avoid linker errors

ifeq ($(findstring freebsd,@ARCH@),freebsd)
Expand Down Expand Up @@ -521,6 +540,8 @@ uninstall:
@rm -rf $(DESTDIR)$(datarootdir)/xbmc $(DESTDIR)$(bindir)/xbmc
@rm -rf $(DESTDIR)$(bindir)/xbmc-standalone
@rm -rf $(DESTDIR)$(datarootdir)/xsessions/XBMC.desktop
@rm -rf $(libdir)/libXBMC_*
@rm -rf $(prefix)/include/xbmc
@echo "Done!"

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

clean-codecs: clean-dvdpcodecs clean-papcodecs

clean-externals: clean-codecs clean-eventclients clean-xbmctex clean-libs \
clean-screensavers clean-visualisations
clean-screensavers clean-visualisations clean-libaddons

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

0 comments on commit 4e9cb43

Please sign in to comment.