Merge pull request #4401 from Jalle19/fix-recording-thumbnail

[vuplus_xbmc] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7fc8003..68497a3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ testMain
 *.project
 *.cproject
 .classpath
+*.sublime-*
 
 # generated files etc
 config.cache
@@ -56,14 +57,6 @@ config.log
 *.pbxuser
 *project.xcworkspace
 *xcuserdata
-/tools/darwin/depends/config.site
-/tools/darwin/depends/config.site.mk
-/tools/darwin/depends/Makefile
-/tools/darwin/depends/Makefile.include
-/tools/darwin/depends/configure
-/tools/darwin/depends/python26/Makefile
-/tools/darwin/depends/**/.gitignore
-/tools/darwin/depends/**/.installed
 
 .libs/
 .deps/
@@ -73,6 +66,8 @@ config.log
 .project
 .cproject
 
+/nbproject
+
 # /
 /.dummy
 /.dummy.in
@@ -80,6 +75,7 @@ config.log
 /Makefile.include
 /aclocal.m4
 /autom4te.cache/
+/build-aux/compile
 /build-aux/config.guess
 /build-aux/config.sub
 /build-aux/install-sh
@@ -124,6 +120,8 @@ config.log
 
 # /lib/
 /lib/Makefile
+/lib/*/1
+/lib/*/win32/1
 
 # /lib/asap/
 /lib/asap/Makefile
@@ -141,6 +139,8 @@ config.log
 /lib/addons/library.xbmc.codec/Makefile
 /lib/addons/library.xbmc.addon/project/VS2010Express/Release
 /lib/addons/library.xbmc.addon/project/VS2010Express/Debug
+/lib/addons/library.xbmc.codec/project/VS2010Express/Release
+/lib/addons/library.xbmc.codec/project/VS2010Express/Debug
 /lib/addons/library.xbmc.gui/project/VS2010Express/Release
 /lib/addons/library.xbmc.gui/project/VS2010Express/Debug
 /lib/addons/library.xbmc.pvr/project/VS2010Express/Release
@@ -154,27 +154,30 @@ lib/cmyth/Makefile
 /lib/cpluff/aclocal.m4
 /lib/cpluff/autom4te.cache
 /lib/cpluff/auxliary
+/lib/cpluff/m4
 /lib/cpluff/config.h
 /lib/cpluff/config.h.in
 /lib/cpluff/config.h.in~
 /lib/cpluff/configure
-/lib/cpluff/console
-/lib/cpluff/doc*
-/lib/cpluff/examples
-/lib/cpluff/libcpluff/docsrc
-/lib/cpluff/libcpluff/Makefile.in
-/lib/cpluff/libtool
-/lib/cpluff/loader
-/lib/cpluff/m4
 /lib/cpluff/Makefile.in
-/lib/cpluff/po
-/lib/cpluff/stamp-h1
-/lib/cpluff/test
+/lib/cpluff/*/Makefile.in
+/lib/cpluff/*/*/Makefile.in
+/lib/cpluff/*/*/*/Makefile.in
+/lib/cpluff/*/*/*/*/Makefile.in
 /lib/cpluff/Makefile
-/lib/cpluff/libcpluff/Makefile
-/lib/cpluff/libcpluff/cpluffdef.h
-/lib/cpluff/libcpluff/win32/Debug
-/lib/cpluff/libcpluff/win32/Release
+/lib/cpluff/*/Makefile
+/lib/cpluff/*/*/Makefile
+/lib/cpluff/*/*/*/Makefile
+/lib/cpluff/*/*/*/*/Makefile
+/lib/cpluff/po/*template
+/lib/cpluff/po/*header
+lib/cpluff/examples/cpfile/cpfile
+lib/cpluff/libcpluff/cpluffdef.h
+lib/cpluff/libcpluff/docsrc/Doxyfile-impl
+lib/cpluff/libcpluff/docsrc/Doxyfile-ref
+lib/cpluff/libtool
+lib/cpluff/po/POTFILES
+lib/cpluff/stamp-h1
 
 # /lib/libcec
 /lib/libcec/libcec
@@ -212,6 +215,7 @@ lib/cmyth/Makefile
 /lib/gtest/build-aux/config.h
 /lib/gtest/build-aux/config.h.in~
 /lib/gtest/build-aux/stamp-h1
+/lib/gtest/build-aux/test-driver
 /lib/gtest/fused-src/
 /lib/gtest/lib/
 /lib/gtest/libtool
@@ -327,10 +331,14 @@ lib/cmyth/Makefile
 /project/obj
 /project/output
 
+# /project/cmake
+/project/cmake/xbmc-config.cmake
+
 # /project/Win32BuildSetup/
 /project/Win32BuildSetup/XBMC.log
 /project/Win32BuildSetup/XBMCSetup*.exe
 /project/Win32BuildSetup/languages.nsi
+/project/Win32BuildSetup/skins.nsi
 /project/Win32BuildSetup/xbmc-pvr-addons.nsi
 /project/Win32BuildSetup/BUILD_WIN32/
 /project/Win32BuildSetup/dependencies
@@ -369,6 +377,8 @@ lib/cmyth/Makefile
 /project/VS2010Express/objs
 /project/VS2010Express/ipch
 /project/VS2010Express/*.vsp
+/project/VS2010Express/*.metaproj
+/project/VS2010Express/*.metaproj.tmp
 
 # /skin/
 /skin/Confluence/media/Textures.xbt
@@ -393,6 +403,8 @@ lib/cmyth/Makefile
 /system/libnfs.dll
 /system/dnssd.dll
 /system/libcec.dll
+/system/pthreadVC2.dll
+/system/libxslt.dll
 
 # /system/cdrip
 /system/cdrip/lame_enc.dll
@@ -411,6 +423,11 @@ lib/cmyth/Makefile
 /system/players/dvdplayer/libdvdnav.dll
 /system/players/dvdplayer/libexpat-1.dll
 /system/players/dvdplayer/libfontconfig-1.dll
+/system/players/dvdplayer/libgmp-10.dll
+/system/players/dvdplayer/libgnutls-28.dll
+/system/players/dvdplayer/libhogweed-2-5.dll
+/system/players/dvdplayer/libnettle-4-7.dll
+/system/players/dvdplayer/libp11-kit-0.dll
 /system/players/dvdplayer/librtmp.dll
 /system/players/dvdplayer/postproc-52.dll
 /system/players/dvdplayer/swresample-0.dll
@@ -583,6 +600,9 @@ lib/cmyth/Makefile
 /xbmc/guilib/Profile
 /xbmc/guilib/Profile_FastCap
 
+# /xbmc/input
+/xbmc/input/linux/Makefile
+
 # /xbmc/interfaces/
 /xbmc/interfaces/Makefile
 /xbmc/interfaces/python/Makefile
@@ -709,6 +729,14 @@ lib/cmyth/Makefile
 # no longer used
 /xbmc/win32/git_rev.h
 
+# /xbmc/windowing/
+/xbmc/windowing/Makefile
+/xbmc/windowing/egl/Makefile
+/xbmc/windowing/tests/wayland/xbmc_wayland_test_client_protocol.h
+/xbmc/windowing/tests/wayland/xbmc_wayland_test_protocol.c
+/xbmc/windowing/tests/wayland/xbmc_wayland_test_server_protocol.h
+/xbmc/windowing/tests/wayland/Makefile
+
 # /lib/ffmpeg/
 /lib/ffmpeg/config.h
 /lib/ffmpeg/config.err
@@ -1214,6 +1242,8 @@ lib/cmyth/Makefile
 
 /addons/library.xbmc.addon/libXBMC_addon.dll
 /addons/library.xbmc.addon/libXBMC_addon.lib
+/addons/library.xbmc.codec/libXBMC_codec.dll
+/addons/library.xbmc.codec/libXBMC_codec.lib
 /addons/library.xbmc.gui/libXBMC_gui.dll
 /addons/library.xbmc.gui/libXBMC_gui.lib
 /addons/library.xbmc.pvr/libXBMC_pvr.dll