tfix relative paths - slidergrid - grid of elastic sliders on a frictional surf… | |
git clone git://src.adamsgaard.dk/slidergrid | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 142e50e1fd1c67f329d92bbbf7bf9ae0e73b32eb | |
parent 8452df073c531a06d60ba75acbc4adde82c63322 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Wed, 23 Mar 2016 13:07:43 -0700 | |
fix relative paths | |
Diffstat: | |
M Makefile | 5 ++++- | |
M tests/elasticity/Makefile | 2 +- | |
M tests/elasticity/normal.c | 6 +++--- | |
3 files changed, 8 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/Makefile b/Makefile | |
t@@ -2,7 +2,7 @@ CC=gcc | |
#CFLAGS=-Wall -O3 -march=native | |
CFLAGS=-Wall -g -pg | |
LDLIBS=-lm | |
-SRCFOLDER=../slidergrid | |
+SRCFOLDER=slidergrid | |
ESSENTIALOBJS=$(SRCFOLDER)/main.o \ | |
$(SRCFOLDER)/slider.o \ | |
$(SRCFOLDER)/grid.o \ | |
t@@ -15,6 +15,9 @@ default: example | |
example: example.o $(ESSENTIALOBJS) | |
$(CC) $(LDLIBS) $^ -o $@ | |
+tests: | |
+ make -C tests/ | |
+ | |
debug: $(BIN) | |
@gdb $< | |
diff --git a/tests/elasticity/Makefile b/tests/elasticity/Makefile | |
t@@ -17,7 +17,7 @@ run-test: normal | |
@#python postprocessing.py --plot-sliders $<-output | |
@#rsync -rav test-output /var/www/html/ | |
-twograins: twograins.o $(ESSENTIALOBJS) | |
+normal: normal.o $(ESSENTIALOBJS) | |
$(CC) $(LDLIBS) $^ -o $@ | |
profile: $(BIN) | |
diff --git a/tests/elasticity/normal.c b/tests/elasticity/normal.c | |
t@@ -1,6 +1,6 @@ | |
-#include "../slidergrid/simulation.h" | |
-#include "../slidergrid/grid.h" | |
-#include "../slidergrid/slider.h" | |
+#include "../../slidergrid/simulation.h" | |
+#include "../../slidergrid/grid.h" | |
+#include "../../slidergrid/slider.h" | |
#include <stdio.h> | |