Mercurial Hosting > traffic-intelligence
diff c/Makefile @ 883:5852a3cdd455
added MacOS (Darwin) to Cpp Makefile and moved non-functional CMakeLists.txt
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Thu, 16 Mar 2017 15:06:14 -0400 |
parents | c6f497291fd8 |
children | a71455bd8367 |
line wrap: on
line diff
--- a/c/Makefile Wed Mar 15 12:36:03 2017 -0400 +++ b/c/Makefile Thu Mar 16 15:06:14 2017 -0400 @@ -31,6 +31,13 @@ LINUX_BOOST_PREFIX = /usr/local CFLAGS += -DLINUX EXE_EXTENSION='' +else ifeq ($(UNAME), Darwin) + OPENCV_HOME=/usr/local + INCLUDE+= -I$(OPENCV_HOME)/include -I$(OPENCV_HOME)/include/opencv + LIBS += -L$(OPENCV_HOME)/lib + LINUX_BOOST_PREFIX = /usr/local + CFLAGS += -DLINUX + EXE_EXTENSION='' else # windows MINGW_HOME = 'C:\MinGW' LDFLAGS += -mconsole -mwindows -lole32 -lwsock32 -luuid @@ -40,7 +47,11 @@ ifeq ($(DEBUG), 1) CFLAGS += -g -gstabs+ -DDEBUG else + ifeq ($(UNAME), Darwin) + CFLAGS += -O3 + else CFLAGS += -O3 --fast-math + endif CFLAGS += -DNDEBUG endif @@ -57,9 +68,9 @@ TESTS_OBJS = test_feature.o test_graph.o -default: builddir all +default: builddir tests feature-based-tracking -all: test-pixels optical-flow track-features +optional: test-pixels optical-flow track-features builddir: @$(SCRIPTS_DIR)/createdirectory.sh $(EXE_DIR)