fix xbmc building

TitanNit · May 23, 2015 · 73e8fc1 · 73e8fc1
1 parent ca4263b
commit 73e8fc1
Show file tree

Hide file tree

Showing 6 changed files with 118 additions and 155 deletions.
diff --git a/tdt/cvs/cdk/Makefile.am b/tdt/cvs/cdk/Makefile.am
@@ -67,6 +67,9 @@ include make/neutrino-plugins.mk
 # Include titan gui targets
 include make/titan.mk
 
+# Include xbmc gui targets
+include make/xbmc-nightly.mk
+
 # Include misc targets (SPECS derived)
 include make/misc-specs.mk
 

diff --git a/tdt/cvs/cdk/make/contrib-libs.mk b/tdt/cvs/cdk/make/contrib-libs.mk
@@ -807,7 +807,7 @@ $(DEPDIR)/ffmpeg: bootstrap libass rtmpdump @DEPENDS_ffmpeg@
 			--prefix=/usr && \
 		$(MAKE) && \
 		@INSTALL_ffmpeg@
-	@DISTCLEANUP_ffmpeg@
+#	@DISTCLEANUP_ffmpeg@
 	touch $@
 
 $(DEPDIR)/ffmpeg_old: bootstrap libass rtmpdump @DEPENDS_ffmpeg_old@
@@ -1966,7 +1966,7 @@ $(DEPDIR)/tuxtxt32bpp: tuxtxtlib @DEPENDS_tuxtxt32bpp@
 # libmpeg2
 #
 $(DEPDIR)/libmpeg2: bootstrap @DEPENDS_libmpeg2@
-	@PREPARE_libmpeg2)
+	@PREPARE_libmpeg2@
 	export PATH=$(hostprefix)/bin:$(PATH) && \
 	cd @DIR_libmpeg2@ && \
 		$(BUILDENV) \
@@ -2271,21 +2271,49 @@ $(DEPDIR)/sshfs: bootstrap fuse @DEPENDS_sshfs@
 #
 # gmediarender
 #
-$(DEPDIR)/gmediarender: bootstrap libstdc++-dev gst_plugins_dvbmediasink libupnp @DEPENDS_gmediarender@
-	@PREPARE_gmediarender@
+$(DEPDIR)/gmediarender: libupnp @DEPENDS_gmediarender@
+#	@PREPARE_gmediarender@
 	export PATH=$(hostprefix)/bin:$(PATH) && \
 	cd @DIR_gmediarender@ && \
+		aclocal -I $(hostprefix)/share/aclocal && \
+		autoheader && \
+		autoconf && \
+		automake --foreign && \
+		libtoolize --force && \
 		$(BUILDENV) \
 		./configure \
 			--build=$(build) \
 			--host=$(target) \
 			--prefix=/usr \
-			--with-libupnp=$(targetprefix)/usr && \
+			--with-libupnp=yes \
+		CFLAGS="$(TARGET_CFLAGS) -fno-inline -L/home/aaf-svn/flashimg/source.titan/titan" \
+		LDFLAGS="$(TARGET_LDFLAGS) -L/home/aaf-svn/flashimg/source.titan/titan" \
+		LD="$(target)-gcc -L/home/aaf-svn/flashimg/source.titan/titan" \
 		$(MAKE) all && \
 		@INSTALL_gmediarender@
-	@DISTCLEANUP_gmediarender@
+#	@DISTCLEANUP_gmediarender@
 	touch $@
 
+#			--with-libupnp=$(targetprefix)/usr
+
+#
+# gmediarender
+#
+#$(DEPDIR)/gmediarender: bootstrap libstdc++-dev gst_plugins_dvbmediasink libupnp @DEPENDS_gmediarender@
+#	@PREPARE_gmediarender@
+#	export PATH=$(hostprefix)/bin:$(PATH) && \
+#	cd @DIR_gmediarender@ && \
+#		$(BUILDENV) \
+#		./configure \
+#			--build=$(build) \
+#			--host=$(target) \
+#			--prefix=/usr \
+#			--with-libupnp=$(targetprefix)/usr && \
+#		$(MAKE) all && \
+#		@INSTALL_gmediarender@
+#	@DISTCLEANUP_gmediarender@
+#	touch $@
+
 #
 # tinyxml
 #