updated Makefile, main/fart.cc, util/Vector.h

git-svn-id: svn://anubis/fart/trunk@5 7f9b0f55-74a9-4bce-be96-3c2cd072584d

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

main/fart.cc

@@ -0,0 +1,8 @@
+
+#include <iostream>
+using namespace std;
+
+int main(int argc, char * argv[])
+{
+    cout << "hi" << endl;
+}

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();