paplayer: drop remaining codecs, only use ffmpeg

1 files changed, 6 insertions, 37 deletions

diff --git a/Makefile.in b/Makefile.in
index 690c4629ac..652b90efca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -186,19 +186,6 @@ ifeq (@USE_OMXPLAYER@,1)
 DIRECTORY_ARCHIVES += xbmc/cores/omxplayer/omxplayer.a
 endif
 
-PAPCODECS_DIRS= \
-	lib/nosefart \
-	lib/timidity \
-	lib/libsidplay2 \
-	lib/stsound/StSoundLibrary \
-	lib/snesapu/SNES/SNESAPU \
-	lib/vgmstream
-
-ifeq (@USE_ASAP_CODEC@,1)
-PAPCODECS_DIRS+= \
-	lib/asap
-endif
-
 LIB_DIRS=\
 	lib/cximage-6.0 \
 	lib/libexif \
@@ -333,7 +320,7 @@ all : $(FINAL_TARGETS)
 
 include Makefile.include
 
-.PHONY : dllloader exports visualizations screensavers eventclients papcodecs \
+.PHONY : dllloader exports visualizations screensavers eventclients \
 	dvdpcodecs dvdpextcodecs imagelib codecs externals force skins libaddon check \
 	testframework testsuite
 
@@ -357,7 +344,7 @@ skins:
 endif
 
 # Setup some dependencies for subdir makes
-xbmc/cores/paplayer/paplayer.a: papcodecs
+xbmc/cores/paplayer/paplayer.a:
 $(DVDPLAYER_ARCHIVES)         : dvdpcodecs
 
 lib/cpluff/libcpluff/.libs/libcpluff.a: force
@@ -420,27 +407,11 @@ libexif: dllloader
 	$(MAKE) -C lib/libexif
 libhdhomerun: dllloader
 	$(MAKE) -C lib/libhdhomerun
-papcodecs: dllloader dvdpcodecs
-	test -d system/players/paplayer || mkdir system/players/paplayer
-	$(MAKE) -C lib/vgmstream
-	$(MAKE) -C lib/timidity
-	$(MAKE) -C lib/nosefart
-ifneq ($(findstring arm-osx,@ARCH@), arm-osx)
-	$(MAKE) -C lib/libsidplay2
-endif
-ifeq (@USE_ASAP_CODEC@,1)
-  ifneq ($(findstring osx,@ARCH@), osx)
-	$(MAKE) -C lib/asap asap-xbmc
-  endif
-endif
-	$(MAKE) -C lib/stsound/StSoundLibrary
-ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@),$(findstring mips,@ARCH@)),)
-	$(MAKE) -C lib/snesapu/SNES/SNESAPU
-endif
+
 imagelib: dllloader
 	$(MAKE) -C lib/cximage-6.0
 
-codecs: papcodecs dvdpcodecs dvdpextcodecs
+codecs: dvdpcodecs dvdpextcodecs
 
 libs: $(LIBSSE4) libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so
 
@@ -495,7 +466,7 @@ OBJSXBMC:=$(filter-out $(DYNOBJSXBMC), $(OBJSXBMC))
 
 BIN_DIRS = $(dir $(DIRECTORY_ARCHIVES)) $(dir $(NWAOBJSXBMC)) $(dir $(MAINOBJS))
 
-DIRS= $(BIN_DIRS) $(EC_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
+DIRS= $(BIN_DIRS) $(EC_DIRS) $(DVDPCODECS_DIRS) \
 	$(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS) xbmc/main
 
 $(NWAOBJSXBMC) $(DIRECTORY_ARCHIVES) $(MAINOBJS): force
@@ -675,8 +646,6 @@ clean-eventclients:
 	for d in $(EC_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
 clean-dvdpcodecs:
 	for d in $(DVDPCODECS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
-clean-papcodecs:
-	for d in $(PAPCODECS_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
 clean-libs:
 	for d in $(LIB_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
 clean-screensavers:
@@ -686,7 +655,7 @@ clean-visualisations:
 clean-libaddons:
 	for d in $(LIBADDON_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
 
-clean-codecs: clean-dvdpcodecs clean-papcodecs
+clean-codecs: clean-dvdpcodecs
 
 clean-externals: clean-codecs clean-eventclients clean-libs \
 	clean-screensavers clean-visualisations clean-libaddons