aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrayhogenson <rayhogenson@gmail.com>2014-03-15 01:44:31 -0700
committerrayhogenson <rayhogenson@gmail.com>2014-03-15 01:44:31 -0700
commit125acda13504f149b5a42f78c293a9d9efc83518 (patch)
tree8ce3abecb676a3e87ff85b91fe4ce5a14f0f2ced
parentc12b348ac2b99544e6338bbed113ce07a34b4671 (diff)
parent0e437fcaaeb26eff8bcd02ddad716deb3ef7052f (diff)
downloadyetihack-125acda13504f149b5a42f78c293a9d9efc83518.tar.zst
Merge pull request #5 from rayhogenson/deleteGrid
deleted the grids. They should never have existed.
-rw-r--r--build/Makefile54
-rw-r--r--include/grid.h17
-rw-r--r--src/grid.cpp4
3 files changed, 27 insertions, 48 deletions
diff --git a/build/Makefile b/build/Makefile
index 631a6ff..42437d0 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -155,30 +155,6 @@ yetihack/fast:
$(MAKE) -f CMakeFiles/yetihack.dir/build.make CMakeFiles/yetihack.dir/build
.PHONY : yetihack/fast
-src/YetiHack.o: src/YetiHack.cpp.o
-.PHONY : src/YetiHack.o
-
-# target to build an object file
-src/YetiHack.cpp.o:
- $(MAKE) -f CMakeFiles/yetihack.dir/build.make CMakeFiles/yetihack.dir/src/YetiHack.cpp.o
-.PHONY : src/YetiHack.cpp.o
-
-src/YetiHack.i: src/YetiHack.cpp.i
-.PHONY : src/YetiHack.i
-
-# target to preprocess a source file
-src/YetiHack.cpp.i:
- $(MAKE) -f CMakeFiles/yetihack.dir/build.make CMakeFiles/yetihack.dir/src/YetiHack.cpp.i
-.PHONY : src/YetiHack.cpp.i
-
-src/YetiHack.s: src/YetiHack.cpp.s
-.PHONY : src/YetiHack.s
-
-# target to generate assembly for a file
-src/YetiHack.cpp.s:
- $(MAKE) -f CMakeFiles/yetihack.dir/build.make CMakeFiles/yetihack.dir/src/YetiHack.cpp.s
-.PHONY : src/YetiHack.cpp.s
-
src/yeti.o: src/yeti.cpp.o
.PHONY : src/yeti.o
@@ -203,6 +179,30 @@ src/yeti.cpp.s:
$(MAKE) -f CMakeFiles/yetihack.dir/build.make CMakeFiles/yetihack.dir/src/yeti.cpp.s
.PHONY : src/yeti.cpp.s
+src/yetihack.o: src/yetihack.cpp.o
+.PHONY : src/yetihack.o
+
+# target to build an object file
+src/yetihack.cpp.o:
+ $(MAKE) -f CMakeFiles/yetihack.dir/build.make CMakeFiles/yetihack.dir/src/yetihack.cpp.o
+.PHONY : src/yetihack.cpp.o
+
+src/yetihack.i: src/yetihack.cpp.i
+.PHONY : src/yetihack.i
+
+# target to preprocess a source file
+src/yetihack.cpp.i:
+ $(MAKE) -f CMakeFiles/yetihack.dir/build.make CMakeFiles/yetihack.dir/src/yetihack.cpp.i
+.PHONY : src/yetihack.cpp.i
+
+src/yetihack.s: src/yetihack.cpp.s
+.PHONY : src/yetihack.s
+
+# target to generate assembly for a file
+src/yetihack.cpp.s:
+ $(MAKE) -f CMakeFiles/yetihack.dir/build.make CMakeFiles/yetihack.dir/src/yetihack.cpp.s
+.PHONY : src/yetihack.cpp.s
+
# Help Target
help:
@echo "The following are some of the valid targets for this Makefile:"
@@ -216,12 +216,12 @@ help:
@echo "... list_install_components"
@echo "... rebuild_cache"
@echo "... yetihack"
- @echo "... src/YetiHack.o"
- @echo "... src/YetiHack.i"
- @echo "... src/YetiHack.s"
@echo "... src/yeti.o"
@echo "... src/yeti.i"
@echo "... src/yeti.s"
+ @echo "... src/yetihack.o"
+ @echo "... src/yetihack.i"
+ @echo "... src/yetihack.s"
.PHONY : help
diff --git a/include/grid.h b/include/grid.h
deleted file mode 100644
index 68f9928..0000000
--- a/include/grid.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef GRID_H
-#define GRID_H
-#include <vector>
-#include <yeti>
-using namespace std;
-
-class grid
-{
- public:
- add(yeti);
- grid();
- move();
- refresh();
- private:
- vector<yeti> objects;
-}
-#endif
diff --git a/src/grid.cpp b/src/grid.cpp
deleted file mode 100644
index 66441c0..0000000
--- a/src/grid.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-grid::grid()
-{
-
-}