From: Sam Moore <matches@ucc.asn.au>
Date: Thu, 12 Sep 2013 05:16:47 +0000 (+0800)
Subject: Get rid of OpenCV for now
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=41bb73186e41a5601407a4d39bfd8c6817c02d74;p=matches%2FMCTX3420.git

Get rid of OpenCV for now

(Won't fit on BBB SD card)
---

diff --git a/server/Makefile b/server/Makefile
index 72d37de..b674ab0 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -6,12 +6,12 @@ OBJ = log.o control.o sensor.o fastcgi.o thread.o main.o
 RM = rm -f
 
 BIN = server
-BIN2 = stream
+#BIN2 = stream
 
 all : $(BIN) $(BIN2)
 
-stream : stream.c
-	$(CXX) -o stream stream.c -I/usr/include/opencv -I/usr/include/opencv2/highgui -L/usr/lib -lopencv_highgui -lopencv_core -lopencv_ml -lopencv_imgproc -lm
+#stream : stream.c
+#	$(CXX) -o stream stream.c -I/usr/include/opencv -I/usr/include/opencv2/highgui -L/usr/lib -lopencv_highgui -lopencv_core -lopencv_ml -lopencv_imgproc -lm
 
 
 $(BIN) : $(OBJ)
diff --git a/server/run.sh b/server/run.sh
index a776cbd..aafc5d1 100755
--- a/server/run.sh
+++ b/server/run.sh
@@ -2,5 +2,5 @@
 # Use this to quickly test run the server in valgrind
 #spawn-fcgi -p9005 -n ./valgrind.sh
 # Use this to run the server normally
-./stream &
+#./stream &
 spawn-fcgi -p9005 -n ./server