From 0e437fcaaeb26eff8bcd02ddad716deb3ef7052f Mon Sep 17 00:00:00 2001 From: rayhogenson Date: Sat, 15 Mar 2014 00:33:23 -0800 Subject: deleted the grids. They should never have existed. --- build/Makefile | 54 +++++++++++++++++++++++++++--------------------------- include/grid.h | 17 ----------------- src/grid.cpp | 4 ---- 3 files changed, 27 insertions(+), 48 deletions(-) delete mode 100644 include/grid.h delete mode 100644 src/grid.cpp 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 -#include -using namespace std; - -class grid -{ - public: - add(yeti); - grid(); - move(); - refresh(); - private: - vector 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() -{ - -} -- cgit v1.3.1 From 010362dfe0920de73b183ff538accdf49119ad7c Mon Sep 17 00:00:00 2001 From: rayhogenson Date: Sat, 15 Mar 2014 00:36:49 -0800 Subject: added the required file --- include/config.h.in | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 include/config.h.in 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 -- cgit v1.3.1 From 82b4f7091cdf1af0785cae573f9dd7343ade93ff Mon Sep 17 00:00:00 2001 From: rayhogenson Date: Sat, 15 Mar 2014 00:37:22 -0800 Subject: this file should never have existed --- include/config.h | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 include/config.h 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 */ -- cgit v1.3.1 From 0442abc0e3c58fd6b14db772e6a9f4a70303bece Mon Sep 17 00:00:00 2001 From: rayhogenson Date: Sat, 15 Mar 2014 00:39:30 -0800 Subject: added the config file into the main program --- src/yetihack.cpp | 1 + 1 file changed, 1 insertion(+) 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 . */ +#include #include #include #include -- cgit v1.3.1