diff --git a/Makefile b/Makefile index 2946ad0..472f9a8 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,25 @@ +TARGET := fart ifdef WIN32 export CPPFLAGS += -I"$(shell cd)" else export CPPFLAGS += -I"$(shell pwd)" endif -all: +all: $(TARGET) + +$(TARGET): make -C util make -C shapes + make -C main + $(CXX) -o $@ main/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS) + +testsuite: make -C test + $(CXX) -o $@ main/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS) clean: make -C test clean + make -C main clean make -C shapes clean make -C util clean diff --git a/main/fart.cc b/main/fart.cc new file mode 100644 index 0000000..bc98d61 --- /dev/null +++ b/main/fart.cc @@ -0,0 +1,8 @@ + +#include +using namespace std; + +int main(int argc, char * argv[]) +{ + cout << "hi" << endl; +} diff --git a/util/Vector.h b/util/Vector.h index 885df4f..084a1a7 100644 --- a/util/Vector.h +++ b/util/Vector.h @@ -8,7 +8,6 @@ class Vector { public: Vector(); - ~Vector(); double & operator[](int idx) { return m_array[idx]; } double operator[](int idx) const { return m_array[idx]; } void normalize();