diff c/Makefile @ 70:a52653dca25d

got track features to compile, updated paths to headers and libraries for OpenCV 2
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Sat, 13 Nov 2010 11:20:10 -0500
parents ef35d5f111e4
children 731df2fa0010
line wrap: on
line diff
--- a/c/Makefile	Wed Nov 10 23:41:49 2010 -0500
+++ b/c/Makefile	Sat Nov 13 11:20:10 2010 -0500
@@ -4,9 +4,11 @@
 
 INCLUDE = -I../include
 
+LIBS = -L../../klt
+
 LDFLAGS = -lm
-LDFLAGS += -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_unit_test_framework-mt
-LDFLAGS += -lfltk
+#LDFLAGS += -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_unit_test_framework-mt
+#LDFLAGS += -lfltk
 
 CFLAGS = -Wall -W -Wextra
 # -DUSE_OPENCV
@@ -14,10 +16,13 @@
 
 ifneq ($(OPENCV), 0)
 	CFLAGS += -DUSE_OPENCV
-	LDFLAGS += -lhighgui -lcxcore -lcv -lml
+	LDFLAGS += -lopencv_highgui -lopencv_core -lopencv_ml
 endif
 
 ifeq ($(UNAME), Linux)
+	OPENCV_HOME=/usr/local
+	INCLUDE+= -I$(OPENCV_HOME)/include/
+	LIBS += -L$(OPENCV_HOME)/lib
 	LINUX_BOOST_PREFIX = /usr/local
 	CFLAGS += -DLINUX
 	EXE_EXTENSION=''
@@ -42,7 +47,7 @@
 
 #GUI_OBJS = 
 CV_OBJS = cvutils.o
-#COMMON_OBJS = 
+COMMON_OBJS = utils.o
 OBJS = $(COMMON_OBJS) $(CV_OBJS)
 #TESTS_OBJS =