diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2012-12-13 15:47:51 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2012-12-13 15:47:51 +0000 |
| commit | ce666e22cdf895f0abeb56ed34b87cb2991d744d (patch) | |
| tree | 1edf15b82999955e6705a3c0f4dc8959398261e2 | |
| parent | 06f27cd6559f929424431ecb2ee707b3d7aff68a (diff) | |
search the new /usr/include/Gem header location by default
svn path=/trunk/externals/pix_opencv/; revision=16680
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 @@ -53,7 +53,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) |