comparison c/Makefile @ 806:c6f497291fd8 opencv3

updated catch and C++ code to opencv2.4.13
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Fri, 10 Jun 2016 12:29:58 -0400
parents 6022350f8173
children 5852a3cdd455
comparison
equal deleted inserted replaced
805:180b6b0231c0 806:c6f497291fd8
17 CFLAGS = -Wall -W -Wextra -std=c++11 17 CFLAGS = -Wall -W -Wextra -std=c++11
18 UNAME = $(shell uname) 18 UNAME = $(shell uname)
19 19
20 ifneq ($(OPENCV), 0) 20 ifneq ($(OPENCV), 0)
21 CFLAGS += -DUSE_OPENCV 21 CFLAGS += -DUSE_OPENCV
22 LDFLAGS += -lopencv_highgui -lopencv_core -lopencv_video -lopencv_features2d -lopencv_imgproc -lopencv_imgcodecs -lopencv_videoio 22 LDFLAGS += -lopencv_highgui -lopencv_core -lopencv_video -lopencv_features2d -lopencv_imgproc
23 endif 23 endif
24 24
25 #LDFLAGS += -Wl,--as-needed -Wl,-Bdynamic,-lgcc_s,-Bstatic 25 #LDFLAGS += -Wl,--as-needed -Wl,-Bdynamic,-lgcc_s,-Bstatic
26 26
27 ifeq ($(UNAME), Linux) 27 ifeq ($(UNAME), Linux)