aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorcnlohr <lohr85@gmail.com>2016-12-16 00:41:28 -0500
committercnlohr <lohr85@gmail.com>2016-12-16 00:41:28 -0500
commit898a9a5f242a1691e1c34062208b48cb0682b5d9 (patch)
tree1be7599d33a0e5f6bbacd892fbc9573ed943af34 /Makefile
parent41b2091f9be605b39ce33f3ce8bb47ab1aeabcc7 (diff)
downloadlibsurvive-898a9a5f242a1691e1c34062208b48cb0682b5d9.tar.gz
libsurvive-898a9a5f242a1691e1c34062208b48cb0682b5d9.tar.bz2
Remove dependency on Xinerama
Improve camfinder a little Add data_recorder.c Closes #1 making libsurvive much more pluggable.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 29c05a1..d688287 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,12 @@
-all : test
+all : data_recorder test
CFLAGS:=-Iinclude -fPIC -g -Os -Iredist
-LDFLAGS:=-lpthread -lusb-1.0 -lz -lX11 -lXinerama
-DEBUGSTUFF:=redist/os_generic.o redist/DrawFunctions.o redist/XDriver.o
+LDFLAGS:=-lpthread -lusb-1.0 -lz -lX11
-test : test.c lib/libsurvive.so
+test : test.c lib/libsurvive.so redist/os_generic.o
+ gcc -o $@ $^ $(LDFLAGS) $(CFLAGS)
+
+data_recorder : data_recorder.c lib/libsurvive.so redist/os_generic.o redist/DrawFunctions.o redist/XDriver.o
gcc -o $@ $^ $(LDFLAGS) $(CFLAGS)
lib/libsurvive.so : src/survive.o src/survive_usb.o src/survive_data.o src/survive_process.o redist/jsmn.o $(DEBUGSTUFF)