Merge pull request #2725 from akallabeth/warning_fixes_more_more_more

[platform/upstream/freerdp.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100755 (executable)
new mode 100644 (file)
index 5e3941b..98ca450
--- a/.gitignore
+++ b/.gitignore
@@ -27,21 +27,14 @@ include/freerdp/version.h
 *_dummy.c
 *_dummy.c.base
 
-# Packages
-*.zip
-*.exe
-*.sh
-*.deb
-*.rpm
-*.dmg
-*.tar.Z
-*.tar.gz
-
 # Eclipse
 *.project
 *.cproject
 *.settings
 
+nbproject/
+compile_commands.json
+
 # .rdp files
 *.rdp
 *.RDP
@@ -68,6 +61,7 @@ Release-*
 *.vcxproj.*
 *.vcproj
 *.vcproj.*
+*.aps
 *.sdf
 *.sln
 *.suo
@@ -85,9 +79,11 @@ RelWithDebInfo
 *.resource.txt
 *.embed.manifest*
 *.intermediate.manifest*
+version.rc
 
 # Binaries
 *.a
+*.o
 *.so
 *.so.*
 *.dylib
@@ -98,9 +94,11 @@ client/X11/xfreerdp
 client/Mac/xcode
 client/Sample/sfreerdp
 client/DirectFB/dfreerdp
+client/Wayland/wlfreerdp
 server/Sample/sfreerdp-server
 server/X11/xfreerdp-server
 xcode
+libfreerdp/codec/test/TestOpenH264ASM
 
 # Other
 *~
@@ -109,6 +107,7 @@ Release
 Win32
 build*/
 *.orig
+*.msrcIncident
 
 default.log
 *Amplifier XE*
@@ -118,3 +117,25 @@ default.log
 *.txt.user
 
 *.autosave
+
+# etags
+TAGS
+
+# generated packages
+*.zip
+*.exe
+*.sh
+*.deb
+*.rpm
+*.dmg
+*.tar.Z
+*.tar.gz
+
+# packaging related files
+!packaging/scripts/prepare_deb_freerdp-nightly.sh
+packaging/deb/freerdp-nightly/freerdp-nightly
+packaging/deb/freerdp-nightly/freerdp-nightly-dev
+packaging/deb/freerdp-nightly/freerdp-nightly-dbg
+
+#
+.idea