diff --git a/Makefile b/Makefile index 7336f91..b89f0d9 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ CCWARN=-Wall -Wextra -Werror # -flto (nécessite GCC 4.5) -m32 ou -m64 CFLAGS=-O3 -g3 -I. $(CCWARN) -OBJECTS = main.o hash.o segment.o vertex.o triangle.o io.o rules/chose.o rules/rectangleroutes.o rules/route.o rules/carrefour.o rules/batiment.o +OBJECTS = main.o hash.o segment.o vertex.o triangle.o rules/chose.o rules/rectangleroutes.o rules/route.o rules/carrefour.o rules/batiment.o EXECUTABLE = city .PHONY: test diff --git a/all_includes.hh b/all_includes.hh index cb99d33..f17c171 100644 --- a/all_includes.hh +++ b/all_includes.hh @@ -1,6 +1,8 @@ #ifndef _ALL_INCLUDES_HH_ #define _ALL_INCLUDES_HH_ +class Chose; + #include #include #include @@ -10,15 +12,8 @@ #include "segment.hh" #include "triangle.hh" #include "directions.hh" -#include "io.hh" #include "hash.hh" -class Chose; -// class Batiment; -// class Carrefour; -// class Route; -// class RectangleRoutes; - #include "rules/chose.hh" #include "rules/batiment.hh" #include "rules/carrefour.hh" diff --git a/io.cpp b/io.cpp deleted file mode 100644 index e545086..0000000 --- a/io.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "io.hh" - -IO::IO(): in(0), out(0) {} diff --git a/io.hh b/io.hh deleted file mode 100644 index 0c541b3..0000000 --- a/io.hh +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _IO_HH_ -#define _IO_HH_ - -class IO { -public: - int in; - int out; -public: - IO(); - //IO(int in, int out); -}; - -#endif