Commit b03e1d8f authored by Balint Reczey's avatar Balint Reczey

Imported Upstream version 14.0~beta1+dfsg1

parents

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

# Does nothing intentionally.
# This exists solely so we can use AM_INIT_AUTOMAKE in configure.in
[submodule "addons/skin.re-touched"]
path = addons/skin.re-touched
url = git://github.com/xbmc/skin.re-touched.git
## Questions about XBMC?
To get your questions answered, please ask in the XBMC [Forum] or on IRC: #xbmc on freenode.net
Do not open an issue.
## Issue Reports
XBMC uses github for development only, i.e. for pull requests and the discussion of code.
So we use a hook script to automatically close new issue created by you.
If you can, we encourage you to investigate the issue yourself and create a Pull Request for us to review.
For bug reports, feature requests and all other support, please go to http://forum.xbmc.org.
## Pull Requests
- Before creating a pull request please read our general code guidelines that can be found here
http://wiki.xbmc.org/index.php?title=XBMC_development
- **Create topic branches**. Don't ask us to pull from your master branch.
- **One pull request per feature**. If you want to do more than one thing, send
multiple pull requests.
- **Send coherent history**. Make sure each individual commit in your pull
request is meaningful. If you had to make multiple intermediate commits while
developing, please squash them before sending them to us. IN the end before merging you may be asked to squash your commit even some more.
Please follow this process; it's the best way to get your work included in the project:
- [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
and configure the remotes:
```bash
# clone your fork of the repo into the current directory in terminal
git clone git@github.com:<your username>/xbmc.git
# navigate to the newly cloned directory
cd xbmc
# assign the original repo to a remote called "upstream"
git remote add upstream https://github.com/xbmc/xbmc.git
```
- If you cloned a while ago, get the latest changes from upstream:
```bash
# fetch upstream changes
git fetch upstream
# make sure you are on your 'master' branch
git checkout master
# merge upstream changes
git merge upstream/master
```
- Create a new topic branch to contain your feature, change, or fix:
```bash
git checkout -b <topic-branch-name>
```
- Commit your changes in logical chunks. or your pull request is unlikely
be merged into the main project. Use git's
[interactive rebase](https://help.github.com/articles/interactive-rebase)
feature to tidy up your commits before making them public.
- Push your topic branch up to your fork:
```bash
git push origin <topic-branch-name>
```
- [Open a Pull Request](https://help.github.com/articles/using-pull-requests) with a
clear title and description.
[Forum]: http://forum.xbmc.org/
Joakim Plate:
filehtsp, filecurl, filevtp, filemyth,
overlayrenderer, filehdhomerun
dvdplayer, upnp, sapfile, ...
Andreas Öman:
libhts
Mattias Wadman
libhts
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
AR=@AR@
ARFLAGS=crus
RM=rm -rf
SHELL=@SHELL@
ARCH=@ARCH@
abs_top_srcdir=@abs_top_srcdir@
rel_top_srcdir=$(subst $(abspath $(abs_top_srcdir))/,,$(abspath $(CURDIR))/)
prefix=@prefix@
exec_prefix=@exec_prefix@
bindir=@bindir@
sbindir=@sbindir@
libexecdir=@libexecdir@
sysconfdir=@sysconfdir@
sharedstatedir=@sharedstatedir@
localstatedir=@localstatedir@
libdir=@libdir@
includedir=@includedir@
oldincludedir=@oldincludedir@
datarootdir=@datarootdir@
datadir=@datadir@
infodir=@infodir@
localedir=@localedir@
mandir=@mandir@
PACKAGE_TARNAME=@PACKAGE_TARNAME@
docdir=@docdir@
htmldir=@htmldir@
dvidir=@dvidir@
pdfdir=@pdfdir@
psdir=@psdir@
CXX=@CXX@
CXX_FOR_BUILD=@CXX_FOR_BUILD@
CC=@CC@
CC_FOR_BUILD=@CC_FOR_BUILD@
CXXFLAGS+=@CXXFLAGS@
CXXFLAGS_FOR_BUILD+=@CXXFLAGS_FOR_BUILD@
CFLAGS+=@CFLAGS@
CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@
LDFLAGS+=@LDFLAGS@
LDFLAGS_FOR_BUILD+=@LDFLAGS_FOR_BUILD@
INCLUDES+=-I@abs_top_srcdir@/lib
INCLUDES+=-I@abs_top_srcdir@/xbmc
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.gui
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.addon
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
INCLUDES+=$(sort @INCLUDES@)
INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
DEFINES+= \
@ARCH_DEFINES@ \
-D_FILE_DEFINED \
-D__STDC_CONSTANT_MACROS \
-DBIN_INSTALL_PATH="\"$(libdir)/@APP_NAME_LC@\"" \
-DINSTALL_PATH="\"$(datarootdir)/@APP_NAME_LC@\"" \
@SDL_DEFINES@ \
@UPNP_DEFINES@ \
@DEFS@ \
ifeq ($(findstring osx,$(ARCH)), osx)
INCLUDES+=-I@abs_top_srcdir@/xbmc/osx
endif
ifeq ($(ARCH), powerpc-osx)
BUNDLE1_O=-lbundle1.o
endif
ifneq ($(V), 1)
SILENT_CPP=@echo "CPP $(rel_top_srcdir)$@";
SILENT_CC =@echo "CC $(rel_top_srcdir)$@";
SILENT_S =@echo "S $(rel_top_srcdir)$@";
SILENT_GCH=@echo "GCH $(rel_top_srcdir)$@";
SILENT_MM =@echo "MM $(rel_top_srcdir)$@";
SILENT_AR =@echo "AR $(rel_top_srcdir)$@";
SILENT_LD =@echo "LD $(rel_top_srcdir)$@";
endif
OBJS+=$(filter %.o,$(SRCS:.cpp=.o))
OBJS+=$(filter %.o,$(SRCS:.c=.o))
OBJS+=$(filter %.o,$(SRCS:.S=.o))
OBJS+=$(filter %.o,$(SRCS:.mm=.o))
OBJS+=$(filter %.o,$(SRCS:.m=.o))
DEPS+=$(filter %.P,$(OBJS:.o=.P))
GEN_DEPS=\
cp $*.d $*.P \
&& sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P \
&& rm -f $*.d \
|| ( rm -f $*.P $@ && exit 1 )
%.o: %.cpp
@rm -f $@
$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
%.o: %.cc
@rm -f $@
$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
%.o: %.c
@rm -f $@
$(SILENT_CC) $(CC) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
%.o: %.C
@rm -f $@
$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
%.o: %.S
@rm -f $@
$(SILENT_CC) $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
%.h.gch : %.h
$(SILENT_GCH) $(CXX) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
%.o: %.m
@rm -f $@
$(SILENT_MM) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
%.o: %.mm
@rm -f $@
$(SILENT_MM) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
&& $(GEN_DEPS)
.PHONY : lib pch clean distclean distclean_evil check testsuite
$(LIB): $(OBJS)
$(SILENT_AR) $(AR) $(ARFLAGS) $(LIB) $(OBJS)
pch: $(PCH:.h=.h.gch)
for d in $(DIRS); do (cd "$$d"; $(MAKE) pch ); done
clean:
$(RM) $(OBJS) *.o $(LIB) $(SLIB) $(CLEAN_FILES) $(PCH:.h=.h.gch) $(DEPS)
for d in $(DIRS); do (if test -f "$$d/Makefile"; then ($(MAKE) -C "$$d" clean); fi ); done
for d in $(CHECK_DIRS) $(GTEST_DIR); do if test -f $$d/Makefile; then $(MAKE) -C $$d $@; fi; done
distclean:
$(RM) $(OBJS) *.o $(LIB) $(SLIB) $(STATICLIB) $(CLEAN_FILES) $(DISTCLEAN_FILES) $(PCH:.h=.h.gch) $(DEPS)