Mercurial > hg > nsaunier > traffic-intelligence
diff c/Makefile @ 795:a34ec862371f
merged with dev branch
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Mon, 09 May 2016 15:33:11 -0400 |
| parents | 6022350f8173 |
| children | f7cf43b5ad3b c6f497291fd8 |
line wrap: on
line diff
--- a/c/Makefile Tue Nov 03 13:48:56 2015 -0500 +++ b/c/Makefile Mon May 09 15:33:11 2016 -0400 @@ -19,17 +19,15 @@ ifneq ($(OPENCV), 0) CFLAGS += -DUSE_OPENCV - LDFLAGS += -lopencv_highgui -lopencv_core -lopencv_video -lopencv_ml -lopencv_features2d -lopencv_imgproc -lopencv_objdetect + LDFLAGS += -lopencv_highgui -lopencv_core -lopencv_video -lopencv_features2d -lopencv_imgproc -lopencv_imgcodecs -lopencv_videoio endif #LDFLAGS += -Wl,--as-needed -Wl,-Bdynamic,-lgcc_s,-Bstatic ifeq ($(UNAME), Linux) - #OPENCV_HOME=$(HOME)/Research/Code/opencv-2.4.10/release OPENCV_HOME=/usr/local INCLUDE+= -I$(OPENCV_HOME)/include -I$(OPENCV_HOME)/include/opencv LIBS += -L$(OPENCV_HOME)/lib - #LIBS += -L/usr/lib/gcc/x86_64-linux-gnu/4.8/ LINUX_BOOST_PREFIX = /usr/local CFLAGS += -DLINUX EXE_EXTENSION=''