projects
/
vuplus_xbmc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[lang] update of skin.confluence language files
[vuplus_xbmc]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
8eda3c4
..
6c55e67
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-192,7
+192,6
@@
DIRECTORY_ARCHIVES += lib/xbmc-libav-hacks/dll-libavhacks.a
endif
PAPCODECS_DIRS= \
endif
PAPCODECS_DIRS= \
- lib/xbadpcm \
lib/nosefart \
lib/timidity \
lib/libsidplay2 \
lib/nosefart \
lib/timidity \
lib/libsidplay2 \
@@
-303,6
+302,7
@@
CHECK_LIBS = xbmc/filesystem/test/filesystemTest.a \
xbmc/utils/test/utilsTest.a \
xbmc/threads/test/threadTest.a \
xbmc/interfaces/python/test/pythonSwigTest.a \
xbmc/utils/test/utilsTest.a \
xbmc/threads/test/threadTest.a \
xbmc/interfaces/python/test/pythonSwigTest.a \
+ xbmc/cores/AudioEngine/Sinks/test/AESinkTest.a \
xbmc/test/xbmc-test.a
ifeq (@USE_WAYLAND@,1)
xbmc/test/xbmc-test.a
ifeq (@USE_WAYLAND@,1)
@@
-420,7
+420,6
@@
libhdhomerun: dllloader
$(MAKE) -C lib/libhdhomerun
papcodecs: dllloader dvdpcodecs
test -d system/players/paplayer || mkdir system/players/paplayer
$(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
$(MAKE) -C lib/vgmstream
$(MAKE) -C lib/timidity
$(MAKE) -C lib/nosefart
@@
-483,7
+482,7
@@
FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \
lib/ffmpeg/libpostproc/libpostproc.a \
lib/ffmpeg/libswscale/libswscale.a
DYNOBJSXBMC+= $(FFMPEGOBJS)
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
$(FFMPEGOBJS): dvdpcodecs
endif
@@
-648,11
+647,11
@@
endif
endif
@# Icons and links
@install -d $(DESTDIR)$(datarootdir)/applications
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 -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/icon
48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
@install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
@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/icon
256x256
.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"
@test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || :
@echo "Copying bindings to $(DESTDIR)$(includedir)/xbmc"