X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_xbmc;a=blobdiff_plain;f=Makefile.in;h=ccd6cda44c5f436b06bbfab36b178e3182fd88ba;hp=8eda3c4a7088c6c150a5025c82b76d7d1ee32f67;hb=HEAD;hpb=99461eb0b8dc9e72c1614091140d14b374a8fa8e

diff --git a/Makefile.in b/Makefile.in
index 8eda3c4..ccd6cda 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -191,14 +191,16 @@ ifeq (@USE_LIBAV_HACKS@,1)
 DIRECTORY_ARCHIVES += lib/xbmc-libav-hacks/dll-libavhacks.a
 endif
 
+# oskown
 PAPCODECS_DIRS= \
-	lib/xbadpcm \
 	lib/nosefart \
 	lib/timidity \
 	lib/libsidplay2 \
 	lib/stsound/StSoundLibrary \
-	lib/snesapu/SNES/SNESAPU \
 	lib/vgmstream
+ifeq ($(or $(findstring mips,@ARCH@)),)
+PAPCODECS_DIRS+=lib/snesapu/SNES/SNESAPU
+endif
 
 ifeq (@USE_ASAP_CODEC@,1)
 PAPCODECS_DIRS+= \
@@ -299,11 +301,15 @@ CHECK_DIRS = xbmc/filesystem/test \
              xbmc/threads/test \
              xbmc/interfaces/python/test \
              xbmc/test
+# oskwon
 CHECK_LIBS = xbmc/filesystem/test/filesystemTest.a \
              xbmc/utils/test/utilsTest.a \
              xbmc/threads/test/threadTest.a \
              xbmc/interfaces/python/test/pythonSwigTest.a \
              xbmc/test/xbmc-test.a
+ifeq ($(or $(findstring mips,@ARCH@)),)
+CHECK_LIBS+=xbmc/cores/AudioEngine/Sinks/test/AESinkTest.a
+endif
 
 ifeq (@USE_WAYLAND@,1)
 CHECK_LIBS += xbmc/windowing/tests/wayland/test_wayland.a
@@ -420,7 +426,6 @@ libhdhomerun: dllloader
 	$(MAKE) -C lib/libhdhomerun
 papcodecs: dllloader dvdpcodecs
 	test -d system/players/paplayer || mkdir system/players/paplayer
-	$(MAKE) -C lib/xbadpcm
 	$(MAKE) -C lib/vgmstream
 	$(MAKE) -C lib/timidity
 	$(MAKE) -C lib/nosefart
@@ -433,7 +438,8 @@ ifeq (@USE_ASAP_CODEC@,1)
   endif
 endif
 	$(MAKE) -C lib/stsound/StSoundLibrary
-ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@)),)
+# oskwon
+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
@@ -483,7 +489,7 @@ FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \
              lib/ffmpeg/libpostproc/libpostproc.a \
              lib/ffmpeg/libswscale/libswscale.a
 DYNOBJSXBMC+= $(FFMPEGOBJS)
-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
+LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @HOGWEED_ALL_LIBS@
 
 $(FFMPEGOBJS): dvdpcodecs
 endif
@@ -538,6 +544,8 @@ xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(MAINOBJS)
 
 ifeq ($(findstring osx,@ARCH@), osx)
 	$(SILENT_LD) $(CXX) $(LDFLAGS) -o xbmc.bin $(MAINOBJS) -Wl,-all_load,-ObjC $(MAINOBJS) $(DYNOBJSXBMC) $(NWAOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
+else ifeq ($(findstring mips,@ARCH@), mips) # oskwon
+	$(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xbmc.bin $(MAINOBJS) -Wl,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group $(NWAOBJSXBMC) $(LIBS) -rdynamic xbmc/windowing/egl/gles_init.a -ldvb_base -lnxpl -ldvb_client
 else
 	$(SILENT_LD) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o xbmc.bin $(MAINOBJS) -Wl,--start-group $(MAINOBJS) $(DYNOBJSXBMC) $(OBJSXBMC) -Wl,--end-group $(NWAOBJSXBMC) $(LIBS) -rdynamic
 endif
@@ -648,11 +656,11 @@ endif
 endif
 	@# Icons and links
 	@install -d $(DESTDIR)$(datarootdir)/applications
-	@install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
+	@install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
 	@install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
-	@install -m 0644 tools/Linux/xbmc-48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
+	@install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
 	@install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
-	@install -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
+	@install -m 0644 media/icon256x256.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
 	@test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || :
 
 	@echo "Copying bindings to $(DESTDIR)$(includedir)/xbmc"