summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFlorian Jung <florian.a.jung@web.de>2012-12-04 00:03:40 +0100
committerFlorian Jung <florian.a.jung@web.de>2012-12-04 00:03:40 +0100
commitdee7d241f8b20262aebe6344b752bb0905ede628 (patch)
tree212f7ead75f05f1755b7292f09aca27f24901b28 /Makefile
parentb539476ec800eb1d7804fd8e9b73fa9bbb1f63bd (diff)
joystick und xorggrabber ausgelagert
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e7a632c..f8ad6c4 100644
--- a/Makefile
+++ b/Makefile
@@ -9,14 +9,16 @@ clean:
.cpp.o:
g++ `pkg-config --cflags opencv` -g -c $<
+joystick.o: joystick.cpp os.h
+ g++ `pkg-config --cflags opencv` -g -c $<
detect_road_borders: detect_road_borders.cpp
- g++ `pkg-config --libs --cflags opencv` -g $^ -o $@
+ g++ `pkg-config --libs --cflags opencv` -g $> -o $@
test_detect: detect_road_borders
./detect_road_borders test.mpg
-mariokart: mariokart.o road_thresholder.o horizon_steerer.o naive_steerer.o steer_accumulator.o util.o
+mariokart: mariokart.o os.h joystick.o xorg_grabber.o road_thresholder.o horizon_steerer.o naive_steerer.o steer_accumulator.o util.o
g++ `pkg-config --libs --cflags opencv` -lxcb -lpthread -g $> -o $@