josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated main Makefile

Browse Source 
git-svn-id: svn://anubis/fart/trunk@17 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2009-01-20 04:31:42 +00:00
parent 2adb782b24
commit 6283577b42
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -14,11 +14,8 @@ $(TARGET):
make -C shapes make -C shapes
make -C main make -C main
$(CXX) -o $@ main/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS) $(CXX) -o $@ main/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS)
.PHONY: tests
tests:
make -C test 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: clean:
make -C test clean make -C test clean

13
test/tests.cc
View File

@ -6,15 +6,10 @@ using namespace std;
int main() int main()
{ {
Matrix m; Matrix m = Matrix::identity();
int v = 1; m[0][3] = 2.0;
for (int i = 0; i < 4; i++) m[1][3] = -1.0;
{ m[2][3] = 10.0;
for (int j = 0; j < 4; j++)
{
m[i][j] = v++;
}
}
cout << "m:" << endl << m; cout << "m:" << endl << m;