Skip to content

Commit

Permalink
Merge pull request xbmc#383 from Pulse-Eight/peripherals-pr
Browse files Browse the repository at this point in the history
new peripherals manager
  • Loading branch information
bobo1on1 committed Sep 30, 2011
2 parents 714ad40 + 1ac45d8 commit f4bb961
Show file tree
Hide file tree
Showing 73 changed files with 5,803 additions and 450 deletions.
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ config.log
/xbmc/guilib/Profile
/xbmc/guilib/Profile_FastCap

# /xbmc/peripherals/
/xbmc/peripherals/bus/Makefile
/xbmc/peripherals/devices/Makefile

# /lib/
/lib/Makefile

Expand Down Expand Up @@ -226,6 +230,20 @@ lib/cmyth/Makefile
/lib/libass/m4/ltversion.m4
/lib/libass/m4/lt~obsolete.m4

# /lib/libcec
/lib/libcec/Makefile
/lib/libcec/Makefile.in
/lib/libcec/aclocal.m4
/lib/libcec/config.guess
/lib/libcec/config.sub
/lib/libcec/configure
/lib/libcec/depcomp
/lib/libcec/install-sh
/lib/libcec/ltmain.sh
/lib/libcec/missing
/lib/libcec/src/lib/Makefile.in
/lib/libcec/src/testclient/Makefile.in

# /lib/libiconv
/lib/libiconv/libiconv_win32/Debug
/lib/libiconv/libiconv_win32/Release
Expand Down
20 changes: 18 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ BIN_DIRS= \
xbmc/input/linux \
xbmc/osx \
xbmc/threads \
xbmc/windowing
xbmc/windowing \
xbmc/peripherals \
xbmc/peripherals/bus \
xbmc/peripherals/devices \
xbmc/peripherals/dialogs \

ifeq (@USE_OPENGL@,1)
BIN_DIRS += xbmc/rendering/gl
Expand Down Expand Up @@ -348,6 +352,14 @@ xbmc/utils/utils.a: force
$(MAKE) -C xbmc/utils
xbmc/osx/osx.a: force
$(MAKE) -C xbmc/osx
xbmc/peripherals/peripherals.a: force
$(MAKE) -C xbmc/peripherals
xbmc/peripherals/bus/peripheral-bus.a: force
$(MAKE) -C xbmc/peripherals/bus
xbmc/peripherals/devices/peripheral-devices.a: force
$(MAKE) -C xbmc/peripherals/devices
xbmc/peripherals/dialogs/peripheral-dialogs.a: force
$(MAKE) -C xbmc/peripherals/dialogs
lib/libapetag/.libs/libapetag.a: force
$(MAKE) -C lib/libapetag
lib/cpluff/libcpluff/.libs/libcpluff.a: force
Expand Down Expand Up @@ -482,7 +494,11 @@ OBJSXBMC= \
lib/libhts/libhts.a \
lib/xbmc-dll-symbols/dll-symbols.a \
xbmc/rendering/rendering.a \
xbmc/windowing/windowing.a
xbmc/windowing/windowing.a \
xbmc/peripherals/peripherals.a \
xbmc/peripherals/bus/peripheral-bus.a \
xbmc/peripherals/devices/peripheral-devices.a \
xbmc/peripherals/dialogs/peripheral-dialogs.a

ifeq (@USE_OPENGL@,1)
OBJSXBMC += xbmc/rendering/gl/rendering_gl.a
Expand Down
2 changes: 1 addition & 1 deletion README.linux
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev,
libplist-dev
libplist-dev, libusb-dev, libudev-dev

*** For developers and anyone else who compiles frequently it is recommended to
use ccache
Expand Down
2 changes: 1 addition & 1 deletion README.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:

For Ubuntu (all versions >= 7.04):

# sudo apt-get install git-core 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 libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev
# sudo apt-get install git-core 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 libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev libusb-dev libudev-dev

For Ubuntu Maverick (10.10):
# sudo apt-get install autopoint
Expand Down
154 changes: 146 additions & 8 deletions XBMC.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Loading

0 comments on commit f4bb961

Please sign in to comment.