comparison 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
comparison
equal deleted inserted replaced
758:0a05883216cf 795:a34ec862371f
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_ml -lopencv_features2d -lopencv_imgproc -lopencv_objdetect 22 LDFLAGS += -lopencv_highgui -lopencv_core -lopencv_video -lopencv_features2d -lopencv_imgproc -lopencv_imgcodecs -lopencv_videoio
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)
28 #OPENCV_HOME=$(HOME)/Research/Code/opencv-2.4.10/release
29 OPENCV_HOME=/usr/local 28 OPENCV_HOME=/usr/local
30 INCLUDE+= -I$(OPENCV_HOME)/include -I$(OPENCV_HOME)/include/opencv 29 INCLUDE+= -I$(OPENCV_HOME)/include -I$(OPENCV_HOME)/include/opencv
31 LIBS += -L$(OPENCV_HOME)/lib 30 LIBS += -L$(OPENCV_HOME)/lib
32 #LIBS += -L/usr/lib/gcc/x86_64-linux-gnu/4.8/
33 LINUX_BOOST_PREFIX = /usr/local 31 LINUX_BOOST_PREFIX = /usr/local
34 CFLAGS += -DLINUX 32 CFLAGS += -DLINUX
35 EXE_EXTENSION='' 33 EXE_EXTENSION=''
36 else # windows 34 else # windows
37 MINGW_HOME = 'C:\MinGW' 35 MINGW_HOME = 'C:\MinGW'