[arm] merge arm-camelot into trunk, thanks to mcgeagh for all his hard working getting arm platform rolling

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30281 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

1 files changed, 27 insertions, 12 deletions

diff --git a/Makefile.in b/Makefile.in
index 48144734a3..8df2b9367b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,7 +65,7 @@ DVDPCODECS_DIRS= \
 	xbmc/cores/dvdplayer/Codecs/libdvd \
 	xbmc/cores/dvdplayer/Codecs/libbdnav
 ifneq (@USE_EXTERNAL_LIBASS@,1)
-  DVDPCODECS_DIRS+=lib/libass/xbmc
+DVDPCODECS_DIRS+=lib/libass/xbmc
 endif
 
 PAPCODECS_DIRS= \
@@ -162,7 +162,9 @@ configure: configure.in
 
 # skin textures
 skins: tools/TexturePacker/TexturePacker force
+ifneq (arm, $(ARCH))
 	 $(MAKE) -C $(CONFLUENCE_MEDIA)
+endif
 	 $(MAKE) -C $(PM3HD_MEDIA)
 
 guilib/guilib.a: force
@@ -305,6 +307,7 @@ exports:
 dllloader: exports
 	$(MAKE) xbmc/cores/DllLoader/dllloader.a
 visualizations: exports
+ifneq (arm, $(ARCH))
 	$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
 	$(MAKE) -C xbmc/visualizations/WaveForm
 	$(MAKE) -C xbmc/visualizations/XBMCProjectM
@@ -316,8 +319,11 @@ ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(AR
 	$(MAKE) -C xbmc/visualizations/Goom
 endif
 endif
+endif
 screensavers: exports
+ifneq (arm, $(ARCH))
 	$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
+endif
 libpython: dllloader
 	$(MAKE) -C xbmc/lib/libPython
 	$(MAKE) -C xbmc/lib/libPython/xbmcmodule
@@ -354,11 +360,11 @@ endif
 	$(MAKE) -C xbmc/cores/paplayer/SIDCodec
 ifeq (@USE_ASAP_CODEC@,1)
   ifneq ($(findstring osx,$(ARCH)), osx)
-	  $(MAKE) -C xbmc/cores/paplayer/asap asap-xbmc
+	$(MAKE) -C xbmc/cores/paplayer/asap asap-xbmc
   endif
 endif
 	$(MAKE) -C xbmc/cores/paplayer/YMCodec/StSoundLibrary	
-ifeq ($(or $(findstring powerpc,$(ARCH)),$(findstring x86_64-linux,$(ARCH))),)
+ifeq ($(or $(findstring powerpc,$(ARCH)),$(findstring x86_64-linux,$(ARCH)),(arm, $(ARCH))),)
 	$(MAKE) -C xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU
 endif
 imagelib: dllloader
@@ -418,7 +424,6 @@ OBJSXBMC=	\
 	xbmc/FileSystem/MusicDatabaseDirectory/musicdatabasedirectory.a \
 	xbmc/FileSystem/VideoDatabaseDirectory/videodatabasedirectory.a \
 	xbmc/karaoke/karaoke.a \
-	xbmc/lib/libhts/libhts.a \
 	xbmc/lib/libPython/xbmcmodule/xbmcmodule.a \
 	xbmc/lib/libRTMP/librtmp.a \
 	xbmc/lib/libscrobbler/scrobbler.a \
@@ -432,6 +437,7 @@ OBJSXBMC=	\
 	xbmc/lib/sqLite/sqllite.a \
 	xbmc/lib/libsquish/libsquish-@ARCH@.a \
 	xbmc/lib/libapetag/.libs/libapetag.a \
+	lib/xbmc-dll-symbols/dll-symbols.a \
 	xbmc/settings/settings.a
 
 ifeq (@HAVE_XBMC_NONFREE@,1)
@@ -440,13 +446,11 @@ OBJSXBMC+= \
 	xbmc/lib/UnrarXLib/UnrarXLib.a
 endif
 
-DYNOBJSXBMC= \
-	xbmc/lib/cmyth/libcmyth/libcmyth.a \
-	xbmc/lib/cmyth/librefmem/librefmem.a \
-	xbmc/linux/linux.a \
-	xbmc/utils/utils.a \
-	xbmc/cores/DllLoader/exports/util/exports_utils.a \
-	xbmc/cores/DllLoader/exports/exports.a
+ifneq (arm, $(ARCH))
+# Can't include libhts for arm due to GPLv3
+OBJSXBMC+= \
+	xbmc/lib/libhts/libhts.a
+endif
 
 # platform dependend objects
 ifeq ($(findstring osx,$(ARCH)), osx)
@@ -460,7 +464,18 @@ OBJSXBMC += \
 	xbmc/posix/posix.a
 endif
 
-OBJSXBMC += lib/xbmc-dll-symbols/dll-symbols.a
+DYNOBJSXBMC= \
+	xbmc/lib/cmyth/libcmyth/libcmyth.a \
+	xbmc/lib/cmyth/librefmem/librefmem.a \
+	xbmc/linux/linux.a \
+	xbmc/utils/utils.a \
+	xbmc/cores/DllLoader/exports/util/exports_utils.a \
+	xbmc/cores/DllLoader/exports/exports.a
+
+ifeq (arm, $(ARCH))
+# Force external python2.5 for now!
+LIBS +=-lpython2.5
+#endif
 
 xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC)
 ifeq ($(findstring osx,$(ARCH)), osx)