Merge pull request #6 from rayhogenson/fix

Fix

6 files changed, 30 insertions, 50 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/config.h b/include/config.h
deleted file mode 100644
index e187647..0000000
--- a/include/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define HAVE_UNISTD_H
-/* #undef HAVE_WINDOWS_H */
diff --git a/include/config.h.in b/include/config.h.in
new file mode 100644
index 0000000..03d9bcf
--- /dev/null
+++ b/include/config.h.in
@@ -0,0 +1,2 @@
+#cmakedefine HAVE_UNISTD_H
+#cmakedefine HAVE_WINDOWS_H
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()
-{
-	
-}
diff --git a/src/yetihack.cpp b/src/yetihack.cpp
index 129d759..694efa5 100644
--- a/src/yetihack.cpp
+++ b/src/yetihack.cpp
@@ -16,6 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with YetiHack.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include <config.h>
 #include <iostream>
 #include <curses.h>
 #include <cstdlib>