summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--cuda-global/Makefile2
-rw-r--r--cuda-global/build/.gitignore2
-rw-r--r--cuda-global/output/.gitignore2
-rw-r--r--openmp/output/.gitignore2
-rw-r--r--serial/output/.gitignore2
6 files changed, 9 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 228a66e..16e9b70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
*.bin
*.mp4
*.swp
-*.o
-
diff --git a/cuda-global/Makefile b/cuda-global/Makefile
index fd802dc..7daf9c5 100644
--- a/cuda-global/Makefile
+++ b/cuda-global/Makefile
@@ -15,6 +15,6 @@ gol: game.o file.o create_grid.o
nvcc $(INCLUDES) -o gol build/game.o build/file.o build/create_grid.o src/main.cu
clean:
- $(RM) build/* gol output/*
+ $(RM) build/*.o gol output/*.bin
all: gol
diff --git a/cuda-global/build/.gitignore b/cuda-global/build/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/cuda-global/build/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/cuda-global/output/.gitignore b/cuda-global/output/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/cuda-global/output/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/openmp/output/.gitignore b/openmp/output/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/openmp/output/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/serial/output/.gitignore b/serial/output/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/serial/output/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore