From 2968ba9938792753a876deb3e2584f3361c60b4d Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 18 Jan 2015 10:56:37 +0100 Subject: Ignore compiled binaries on templates (*.o, *.exe) --- .gitignore | 10 +++------- templates/advance_game/screens/screen_ending.o | Bin 1622 -> 0 bytes templates/advance_game/screens/screen_gameplay.o | Bin 1632 -> 0 bytes templates/advance_game/screens/screen_logo.o | Bin 1362 -> 0 bytes templates/advance_game/screens/screen_options.o | Bin 1047 -> 0 bytes templates/advance_game/screens/screen_title.o | Bin 1617 -> 0 bytes templates/simple_game/screens.o | Bin 3124 -> 0 bytes templates/standard_game/screens/screen_ending.o | Bin 1622 -> 0 bytes templates/standard_game/screens/screen_gameplay.o | Bin 1632 -> 0 bytes templates/standard_game/screens/screen_logo.o | Bin 1362 -> 0 bytes templates/standard_game/screens/screen_options.o | Bin 1047 -> 0 bytes templates/standard_game/screens/screen_title.o | Bin 1617 -> 0 bytes 12 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 templates/advance_game/screens/screen_ending.o delete mode 100644 templates/advance_game/screens/screen_gameplay.o delete mode 100644 templates/advance_game/screens/screen_logo.o delete mode 100644 templates/advance_game/screens/screen_options.o delete mode 100644 templates/advance_game/screens/screen_title.o delete mode 100644 templates/simple_game/screens.o delete mode 100644 templates/standard_game/screens/screen_ending.o delete mode 100644 templates/standard_game/screens/screen_gameplay.o delete mode 100644 templates/standard_game/screens/screen_logo.o delete mode 100644 templates/standard_game/screens/screen_options.o delete mode 100644 templates/standard_game/screens/screen_title.o diff --git a/.gitignore b/.gitignore index 73c7b709..d06636f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,6 @@ # Ignore generated files # ... -# Ignore compiled binaries -src/*.o -src/*.exe -examples/*.o -examples/*.exe -templates/*.exe - # Ignore Android generated files and folders src_android/obj/ templates/android_project/bin/ @@ -48,6 +41,9 @@ _ReSharper*/ [Tt]est[Rr]esult* ipch/ *.opensdf + +# Ignore compiled binaries +*.o *.exe !tools/rrem.exe diff --git a/templates/advance_game/screens/screen_ending.o b/templates/advance_game/screens/screen_ending.o deleted file mode 100644 index 5d819b16..00000000 Binary files a/templates/advance_game/screens/screen_ending.o and /dev/null differ diff --git a/templates/advance_game/screens/screen_gameplay.o b/templates/advance_game/screens/screen_gameplay.o deleted file mode 100644 index b31cccb3..00000000 Binary files a/templates/advance_game/screens/screen_gameplay.o and /dev/null differ diff --git a/templates/advance_game/screens/screen_logo.o b/templates/advance_game/screens/screen_logo.o deleted file mode 100644 index 10a99746..00000000 Binary files a/templates/advance_game/screens/screen_logo.o and /dev/null differ diff --git a/templates/advance_game/screens/screen_options.o b/templates/advance_game/screens/screen_options.o deleted file mode 100644 index 17153fd9..00000000 Binary files a/templates/advance_game/screens/screen_options.o and /dev/null differ diff --git a/templates/advance_game/screens/screen_title.o b/templates/advance_game/screens/screen_title.o deleted file mode 100644 index cbe17297..00000000 Binary files a/templates/advance_game/screens/screen_title.o and /dev/null differ diff --git a/templates/simple_game/screens.o b/templates/simple_game/screens.o deleted file mode 100644 index 7ed0860c..00000000 Binary files a/templates/simple_game/screens.o and /dev/null differ diff --git a/templates/standard_game/screens/screen_ending.o b/templates/standard_game/screens/screen_ending.o deleted file mode 100644 index 5d819b16..00000000 Binary files a/templates/standard_game/screens/screen_ending.o and /dev/null differ diff --git a/templates/standard_game/screens/screen_gameplay.o b/templates/standard_game/screens/screen_gameplay.o deleted file mode 100644 index b31cccb3..00000000 Binary files a/templates/standard_game/screens/screen_gameplay.o and /dev/null differ diff --git a/templates/standard_game/screens/screen_logo.o b/templates/standard_game/screens/screen_logo.o deleted file mode 100644 index 10a99746..00000000 Binary files a/templates/standard_game/screens/screen_logo.o and /dev/null differ diff --git a/templates/standard_game/screens/screen_options.o b/templates/standard_game/screens/screen_options.o deleted file mode 100644 index 17153fd9..00000000 Binary files a/templates/standard_game/screens/screen_options.o and /dev/null differ diff --git a/templates/standard_game/screens/screen_title.o b/templates/standard_game/screens/screen_title.o deleted file mode 100644 index cbe17297..00000000 Binary files a/templates/standard_game/screens/screen_title.o and /dev/null differ -- cgit v1.2.3