diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-06-22 22:35:53 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-06-22 22:44:03 +0200 |
| commit | 9f819088a67a555d7bf18bf1da5db1ff66163055 (patch) | |
| tree | b637f7bbdd6967043ef5f340881318129e355149 | |
| parent | 8cb2e54de844accbd831a167233e8348b175d930 (diff) | |
| download | colobot-9f819088a67a555d7bf18bf1da5db1ff66163055.tar.gz colobot-9f819088a67a555d7bf18bf1da5db1ff66163055.tar.bz2 colobot-9f819088a67a555d7bf18bf1da5db1ff66163055.zip | |
gitignore update
* git should now ignore all generated files when building without
separate build directory
| -rw-r--r-- | .gitignore | 23 | ||||
| m--------- | data | 0 | ||||
| -rw-r--r-- | desktop/.gitignore | 7 | ||||
| -rw-r--r-- | lib/clipboard/.gitignore | 1 | ||||
| -rw-r--r-- | po/.gitignore | 1 | ||||
| -rw-r--r-- | src/CBot/.gitignore | 1 | ||||
| -rw-r--r-- | src/common/.gitignore | 2 |
7 files changed, 24 insertions, 11 deletions
@@ -1,5 +1,15 @@ -# Ignore the documentation folder +# Ignore the CMake build files +CMakeFiles +CMakeCache.txt +cmake_install.cmake +Makefile +/install_manifest.txt +/Testing +/CTestTestfile.cmake + +# Ignore the generated documentation /doc +/Doxyfile # Ignore targets /colobot @@ -8,16 +18,9 @@ /colobot.ini /savegame -# Ignore the CMake build files -CMakeFiles -CMakeCache.txt -cmake_install.cmake -Makefile -/install_manifest.txt -/Testing -/CTestTestfile.cmake +# Standard build directory +/build # Ignore KDevelop files .kdev4 *.kdev4 - diff --git a/data b/data -Subproject 6d1ff8c3c48f8492824d27a621ecd8fb5879b18 +Subproject b2845f58c34fc60e1f3900e5544f6392ca170fa diff --git a/desktop/.gitignore b/desktop/.gitignore index 0e770f7..e6649e0 100644 --- a/desktop/.gitignore +++ b/desktop/.gitignore @@ -1,2 +1,7 @@ lang/ - +fr/ +16/ +32/ +48/ +colobot.6 +colobot.desktop diff --git a/lib/clipboard/.gitignore b/lib/clipboard/.gitignore new file mode 100644 index 0000000..ffbe18e --- /dev/null +++ b/lib/clipboard/.gitignore @@ -0,0 +1 @@ +libclipboard.a diff --git a/po/.gitignore b/po/.gitignore new file mode 100644 index 0000000..becd153 --- /dev/null +++ b/po/.gitignore @@ -0,0 +1 @@ +*.gmo diff --git a/src/CBot/.gitignore b/src/CBot/.gitignore new file mode 100644 index 0000000..4c80252 --- /dev/null +++ b/src/CBot/.gitignore @@ -0,0 +1 @@ +libCBot.so diff --git a/src/common/.gitignore b/src/common/.gitignore new file mode 100644 index 0000000..a13f82d --- /dev/null +++ b/src/common/.gitignore @@ -0,0 +1,2 @@ +# CMake config header +config.h |