[win32] integrate XBMC_PC.rc into CompileInfo.bat for automatic versioning

[vuplus_xbmc] / .gitignore

diff --git a/.gitignore b/.gitignore
index c19ba5e..375054d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@ testMain
 *.cproject
 .classpath
 *.sublime-*
+# KDevelop 4
+*.kdev4
 
 # generated files etc
 config.cache
@@ -111,12 +113,16 @@ config.log
 /addons/visualization.milkdrop/MilkDrop_win32dx.vis
 /addons/visualization.projectm/projectM.vis
 /addons/visualization.projectm/resources/presets.zip
+/addons/visualization.vortex/Vortex_win32dx.vis
 /addons/visualization.waveform/Waveform.vis
 /addons/visualization.waveform/Waveform_win32.vis
 /addons/visualization.itunes/iTunes.mvis
 /addons/visualization.fishbmc/fishbmc.vis
 /addons/script.module.pil/
+/addons/audioencoder.*
 /addons/pvr.*
+/addons/xbmc.addon/addon.xml
+/addons/xbmc.json/addon.xml
 
 # /lib/
 /lib/Makefile
@@ -336,13 +342,21 @@ lib/cpluff/stamp-h1
 
 # /project/cmake
 /project/cmake/xbmc-config.cmake
+/project/cmake/*.error
+/project/cmake/addons/build
+/project/cmake/addons/depends/win32/build
+/project/cmake/addons/output
 
 # /project/Win32BuildSetup/
 /project/Win32BuildSetup/XBMC.log
 /project/Win32BuildSetup/XBMCSetup*.exe
 /project/Win32BuildSetup/languages.nsi
 /project/Win32BuildSetup/skins.nsi
+/project/Win32BuildSetup/xbmc-audioencoder-addons.nsi
 /project/Win32BuildSetup/xbmc-pvr-addons.nsi
+/project/Win32BuildSetup/bgprocess
+/project/Win32BuildSetup/makeclean
+/project/Win32BuildSetup/noprompt
 /project/Win32BuildSetup/BUILD_WIN32/
 /project/Win32BuildSetup/dependencies
 
@@ -403,7 +417,6 @@ lib/cpluff/stamp-h1
 /system/hdhomerun.dll
 /system/ssh.dll
 /system/sqlite3.dll
-/system/libsamplerate-0.dll
 /system/libnfs.dll
 /system/dnssd.dll
 /system/libcec.dll
@@ -510,6 +523,12 @@ lib/cpluff/stamp-h1
 /tools/EventClients/Clients/OSXRemote/build/
 /tools/EventClients/Clients/WiiRemote/WiiRemote
 
+# /tools/darwin/
+/tools/darwin/Configurations/App.xcconfig
+/tools/darwin/Configurations/Common.xcconfig
+/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
+/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
+
 # /tools/Linux/
 /tools/Linux/xbmc.sh
 /tools/Linux/xbmc-standalone.sh
@@ -544,6 +563,7 @@ lib/cpluff/stamp-h1
 /xbmc/config.h
 /xbmc/config.h.in
 /xbmc/config.h.in~
+/xbmc/CompileInfo.cpp
 /xbmc/DllPaths_generated.h
 /xbmc/DllPaths_generated_android.h
 /xbmc/Makefile
@@ -717,6 +737,7 @@ lib/cpluff/stamp-h1
 /xbmc/visualizations/Milkdrop/Debug
 /xbmc/visualizations/Milkdrop/Release
 /xbmc/visualizations/OpenGLSpectrum/Makefile
+/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj.metaproj
 /xbmc/visualizations/WaveForm/Makefile
 /xbmc/visualizations/WaveForm/Debug (DirectX)
 /xbmc/visualizations/WaveForm/Release (DirectX)
@@ -730,6 +751,7 @@ lib/cpluff/stamp-h1
 /xbmc/visualizations/fishBMC/Makefile
 
 #/xbmc/win32/
+/xbmc/win32/XBMC_PC.rc
 # no longer used
 /xbmc/win32/git_rev.h
 
@@ -1086,7 +1108,8 @@ lib/cpluff/stamp-h1
 /lib/vgmstream/win32/win32.lib
 
 #/lib/win32
-/lib/win32/2.2-Helix-alpha1.tar*
+/lib/win32/*.tar*
+/lib/win32/pax_global_header
 
 #/lib/win32/ffmpeg
 /lib/win32/ffmpeg/
@@ -1095,10 +1118,6 @@ lib/cpluff/stamp-h1
 /lib/win32/libmms_win32/msvc++/Debug
 /lib/win32/libmms_win32/msvc++/Release
 
-# /lib/win32/libsamplerate
-/lib/win32/libsamplerate/libsamplerate_win32/Debug
-/lib/win32/libsamplerate/libsamplerate_win32/Release
-
 # /lib/win32/sqlite
 /lib/win32/sqlite/libsqlite_win32/Debug
 /lib/win32/sqlite/libsqlite_win32/Release