From af56fa101c1a94dd316271600be77e70d398fb1f Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 13 Dec 2012 16:02:59 +0000 Subject: search the new /usr/include/Gem header location by default svn path=/trunk/externals/pix_opencv/; revision=16681 --- Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index d569bab..991a306 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ CPPFLAGS = -fPIC -DPD -O2 -funroll-loops -fomit-frame-pointer -ffast-math \ UNAME := $(shell uname -s) ifeq ($(UNAME),Linux) CPPFLAGS += -DLINUX - INCLUDES += `pkg-config --cflags opencv` + INCLUDES += -I/usr/include/Gem `pkg-config --cflags opencv` LDFLAGS = -Wl,--export-dynamic -shared LIBS = `pkg-config --libs opencv` EXTENSION = pd_linux @@ -22,7 +22,7 @@ ifeq ($(UNAME),Linux) OPENCV_VERSION = `pkg-config --modversion opencv` endif ifeq ($(UNAME),Darwin) - INCLUDES += -I/Library/Frameworks/OpenCV.framework/Headers/ -I/Applications/Pd-extended.app/Contents/Resources/include/pdextended -I/Applications/Pd-extended.app/Contents/Resources/include/ + INCLUDES += -I/Library/Frameworks/OpenCV.framework/Headers/ -I/Applications/Pd-extended.app/Contents/Resources/include/Gem -I/Applications/Pd-extended.app/Contents/Resources/include/pd -I/Applications/Pd-extended.app/Contents/Resources/include/ LDFLAGS = -bundle -undefined dynamic_lookup LIBS = -lm -framework OpenCV EXTENSION = pd_darwin @@ -54,7 +54,7 @@ clean: distro: clean all rm *.o - + blobtrack: g++ $(CPPFLAGS) $(INCLUDES) -o pix_opencv_blobtrack.o -c pix_opencv_blobtrack.cpp g++ $(LDFLAGS) -o pix_opencv_blobtrack.$(EXTENSION) pix_opencv_blobtrack.o $(LIBS) -- cgit v1.2.1