From 6283577b42dcc0435d1afd160515e95e31864595 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 20 Jan 2009 04:31:42 +0000 Subject: [PATCH] updated main Makefile git-svn-id: svn://anubis/fart/trunk@17 7f9b0f55-74a9-4bce-be96-3c2cd072584d --- Makefile | 5 +---- test/tests.cc | 13 ++++--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 506dedb..7142c6e 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,8 @@ $(TARGET): make -C shapes make -C main $(CXX) -o $@ main/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS) - -.PHONY: tests -tests: make -C test - $(CXX) -o $@ test/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS) + $(CXX) -o tests test/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS) clean: make -C test clean diff --git a/test/tests.cc b/test/tests.cc index f7ec3bb..cebd885 100644 --- a/test/tests.cc +++ b/test/tests.cc @@ -6,15 +6,10 @@ using namespace std; int main() { - Matrix m; - int v = 1; - for (int i = 0; i < 4; i++) - { - for (int j = 0; j < 4; j++) - { - m[i][j] = v++; - } - } + Matrix m = Matrix::identity(); + m[0][3] = 2.0; + m[1][3] = -1.0; + m[2][3] = 10.0; cout << "m:" << endl << m;