aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAntoine Villeret <avilleret@users.sourceforge.net>2012-09-22 15:11:33 +0000
committerAntoine Villeret <avilleret@users.sourceforge.net>2012-09-22 15:11:33 +0000
commit1e9ae4b922bc09ba5954a7817dfb963a4ba90a3d (patch)
tree0fb4d79be7ac4af1ad96b63d6d715e1003fcc485 /Makefile
parent841e92c1821ee54a92597ede38182565f24f2a87 (diff)
fix Makefile.in
svn path=/trunk/externals/pix_opencv/; revision=16267
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a48b92b..fd46c16 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,7 @@ ifeq ($(UNAME),Linux)
LIBS = `pkg-config --libs opencv`
EXTENSION = pd_linux
SOURCES_OPT =
- #~ OPENCV_VERSION = `pkg-config --modversion opencv`
- OPENCV_VERSION = 2.3.0
+ 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/
@@ -57,7 +56,6 @@ distro: clean all
rm *.o
blobtrack:
-ifeq ( $(OPENCV_VERSION), 2.*.*)
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)
rm pix_opencv_blobtrack.o