aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2012-12-31 14:49:10 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2012-12-31 14:49:10 +0000
commit029e5d6964e16ec6c136b3fd3a68fd624232bcba (patch)
tree9f33127e3150d1a517870c7d44c26d118bf84735
parenteea6ab47d522c39bf6775d8987187c6a909eb928 (diff)
on Mac OS X, use opencv from pkg-config, which Fink and probably others provide
svn path=/trunk/externals/pix_opencv/; revision=16795
-rw-r--r--Makefile11
1 files changed, 4 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 4a4b0f2..77944d0 100644
--- a/Makefile
+++ b/Makefile
@@ -35,15 +35,12 @@ UNITTESTS =
#
#------------------------------------------------------------------------------#
-ALL_CFLAGS = -I"$(PD_INCLUDE)"
-CFLAGS_linux = `pkg-config --cflags Gem` `pkg-config --cflags opencv`
-CFLAGS_macosx = -I/Library/Frameworks/OpenCV.framework/Headers/ \
- -I$(PD_PATH)/include/Gem -I$(PD_PATH)/include
+ALL_CFLAGS = -I"$(PD_INCLUDE)" `pkg-config --cflags opencv`
+CFLAGS_linux = `pkg-config --cflags Gem`
+CFLAGS_macosx = -I$(PD_PATH)/include/Gem -I$(PD_PATH)/include
ALL_LDFLAGS =
SHARED_LDFLAGS =
-ALL_LIBS =
-LIBS_linux = `pkg-config --libs opencv`
-LIBS_macosx = -lm -framework OpenCV
+ALL_LIBS = `pkg-config --libs opencv`
#------------------------------------------------------------------------------#
#