Permalink
Browse files

Merge branch 'master' into pvr-ppa

Conflicts:
	xbmc/pvr/PVRManager.cpp
  • Loading branch information...
2 parents 1f2654c + 087dede commit 28a25441553c68b9c3e301d869089b6bfc2d7650 @opdenkamp committed Mar 23, 2011
Showing 491 changed files with 23,118 additions and 19,980 deletions.
View
@@ -111,10 +111,6 @@ DVDPCODECS_DIRS= \
lib \
lib/libdvd \
-ifneq (@USE_EXTERNAL_LIBASS@,1)
-DVDPCODECS_DIRS+=lib/libass/xbmc
-endif
-
PAPCODECS_DIRS= \
lib/xbadpcm \
lib/nosefart \
@@ -142,12 +138,8 @@ LIB_DIRS=\
lib/libapetag \
xbmc/interfaces/python/linux \
lib/cpluff \
- lib/libmodplug \
lib/xbmc-dll-symbols \
lib/jsoncpp/src/lib_json
-ifeq ($(findstring osx,@ARCH@), osx)
-LIB_DIRS+=lib/libmicrohttpd
-endif
SS_DIRS=\
xbmc/screensavers/rsxs-0.9/xbmc
@@ -437,22 +429,8 @@ ifeq ($(findstring osx,@ARCH@), osx)
else
cp lib/cpluff/libcpluff/.libs/libcpluff.so $@
endif
-lib/libmodplug/src/.libs/libmodplug.a: force
- $(MAKE) -C lib/libmodplug
-system/players/paplayer/libmodplug-@ARCH@.so: lib/libmodplug/src/.libs/libmodplug.a
-ifeq (@ARCH@, powerpc-osx)
- $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lbundle1.o -o $@ $<
-endif
-ifeq (@ARCH@, x86-osx)
- $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -o $@ $<
-endif
-ifeq (@ARCH@, arm-osx)
- $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -arch armv7 -o $@ $<
-endif
lib/xbmc-dll-symbols/dll-symbols.a: force
$(MAKE) -C lib/xbmc-dll-symbols
-lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a: force
- $(MAKE) -C lib/libmicrohttpd
exports:
$(MAKE) xbmc/cores/DllLoader/exports/exports.a
@@ -496,9 +474,6 @@ python: dllloader
dvdpcodecs: dllloader
$(MAKE) -C lib
$(MAKE) -C lib/libdvd
-ifneq (@USE_EXTERNAL_LIBASS@,1)
- $(MAKE) -C lib/libass/xbmc
-endif
eventclients:
ifeq ($(findstring osx,@ARCH@), osx)
ifneq ($(findstring arm,@ARCH@), arm)
@@ -537,11 +512,7 @@ imagelib: dllloader
$(MAKE) -C lib/cximage-6.0
codecs: papcodecs dvdpcodecs
-ifeq ($(findstring osx,@ARCH@), osx)
-libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so system/players/paplayer/libmodplug-@ARCH@.so
-else
libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so
-endif
externals: libaddon codecs libs python pvrclients visualizations screensavers
xcode_depends: \
@@ -556,8 +527,7 @@ xcode_depends: \
xbmc/interfaces/interfaces.a \
xbmc/interfaces/http-api/http-api.a \
xbmc/interfaces/json-rpc/json-rpc.a \
- lib/jsoncpp/src/lib_json/libjsoncpp.a \
- lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a
+ lib/jsoncpp/src/lib_json/libjsoncpp.a
# platform independend objects
OBJSXBMC= \
@@ -640,18 +610,14 @@ OBJSXBMC+= \
lib/UnrarXLib/UnrarXLib.a
endif
-ifneq ($(findstring arm,@ARCH@), arm)
-# Can't include libhts for arm due to GPLv3
OBJSXBMC+= \
lib/libhts/libhts.a
-endif
# platform dependend objects
ifeq ($(findstring osx,@ARCH@), osx)
OBJSXBMC += \
xbmc/osx/osx.a \
xbmc/windowing/osx/windowing_osx.a \
- lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a \
xbmc/threads/darwin/threads_darwin.a \
xbmc/powermanagement/osx/powermanagement.a \
xbmc/network/osx/network.a \
View
@@ -0,0 +1,93 @@
+TOC
+1. Introduction
+2. Getting the source code
+3. Install required libs
+ 3.1. Install Xcode
+ 3.2. Install Cross libs and runtime environment
+4. How to compile and run
+ 4.1 Using XCode
+ 4.2 Using Command line
+5. Gesture Handling on iPad/iPhone/iPod touch
+
+-----------------------------------------------------------------------------
+1. Introduction
+-----------------------------------------------------------------------------
+
+This is a platform port of XBMC for the Apple iOS operating system.
+The current build system is Xcode 3.2.5 and iOS SDK 4.2
+There are two ways to build XBMC for Mac.
+
+1) command-line or
+2) Xcode.
+
+Generally, Xcode is the easiest as it presents the build system in a GUI environment.
+The command-line build is still under development.
+
+XBMC for Mac is composed of a main binary with numerous dynamic libraries and
+codecs that support a multitude of music and video formats.
+
+NOTE TO NEW OS X USERS: All lines that are prefixed with the '$' character are
+commands that need to be typed into a Terminal window. Note that the '$'
+character itself should NOT be typed as part of the command.
+
+
+-----------------------------------------------------------------------------
+2. Getting the source code
+-----------------------------------------------------------------------------
+
+ $ cd $HOME
+ $ git clone git://github.com/xbmc/xbmc.git xbmc
+
+-----------------------------------------------------------------------------
+3.0 Install Xcode
+-----------------------------------------------------------------------------
+Install latest Xcode. You can download it from Apple's site after registration at
+(http://developer.apple.com/tools/download).
+The preferred version is Xcode 3.2.5 and iOS SDK 4.2.
+
+-----------------------------------------------------------------------------
+3.1 Install Cross libs and runtime environment
+-----------------------------------------------------------------------------
+
+ $ cd $HOME/XBMC
+ $ sudo mkdir -p /usr/local/bin; sudo cp tools/osx/ios-depends/gas-preprocessor/gas-preprocessor.pl /usr/local/bin/
+ $ make -C tools/osx/ios-depends
+
+-----------------------------------------------------------------------------
+4. How to compile
+-----------------------------------------------------------------------------
+Both Xcode and Terminal compilation require that build environment be setup
+from the step 3.1.
+
+ $ cd $HOME/XBMC
+ $ make -C tools/osx/ios-depends/xbmc
+ $ make clean
+ $ make xcode_depends
+
+-----------------------------------------------------------------------------
+4.1 Using Xcode
+-----------------------------------------------------------------------------
+Start XCode and open the XBMC project (XBMC-IOS.xcodeproj or XBMC-ATV2.xcodeproj)
+located in $HOME/XBMC.
+
+There are two relevant build targets : Release and Debug. Compile always for device
+end not simulator.
+
+-----------------------------------------------------------------------------
+4.2 Using Terminal (command-line)
+-----------------------------------------------------------------------------
+
+ $ cd $HOME/XBMC
+ $ xcodebuild -project XBMC-IOS.xcodeproj -target XBMC -configuration Release build ONLY_ACTIVE_ARCH=YES ARCHS=armv7 VALID_ARCHS=armv7 IPHONEOS_DEPLOYMENT_TARGET=4.1 SDKROOT=iphoneos4.2
+
+or
+
+ $ xcodebuild -project XBMC-ATV2.xcodeproj -target XBMC -configuration Release build ONLY_ACTIVE_ARCH=YES ARCHS=armv7 VALID_ARCHS=armv7 IPHONEOS_DEPLOYMENT_TARGET=4.1 SDKROOT=iphoneos4.2
+
+
+5. Gesture Handling on iPad/iPhone/iPod touch
+
+ Double Tap : Right Mouse Click
+ Swipe Left : Backspace
+ Swipe Right : Tab
+
View
@@ -44,7 +44,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libfreetype6-dev, libfontconfig-dev, libbz2-dev, libfribidi-dev,
libsqlite3-dev, libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev,
libpcre3-dev, liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev,
- libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev, libxtst-dev,
+ libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev,
libxmu-dev, libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev,
libdbus-1-dev, libhal-storage-dev, libhal-dev, libpulse-dev,
libavahi-common-dev, libavahi-client-dev, libxrandr-dev, libavcodec-dev,
View
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
For Ubuntu (all versions >= 7.04):
- # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
+ # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
For Ubuntu Maverick (10.10):
# sudo apt-get install autopoint
Oops, something went wrong.

0 comments on commit 28a2544

Please sign in to comment.