diff options
| author | lluís gómez i bigordà <lluisbigorda@users.sourceforge.net> | 2009-09-24 22:11:34 +0000 |
|---|---|---|
| committer | lluís gómez i bigordà <lluisbigorda@users.sourceforge.net> | 2009-09-24 22:11:34 +0000 |
| commit | cefd72ea63da87674df0d2cc9371c70ec80108a3 (patch) | |
| tree | dcd59d43622b9593df770b3f701ea20ab0ee60f0 | |
| parent | 05b77eed721931281759bf222e319b05d81458c9 (diff) | |
The colorspace in Gem-MACOSX is GRAB instead of RGBA in Linux
so added -DDARWIN -DLINUX definitions in the Makefile
svn path=/trunk/externals/pix_opencv/; revision=12447
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | Makefile.in | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,5 @@ -PD_DIR = /usr/local/pd -GEM_DIR = /usr/local/pd/gem +PD_DIR = /usr/src/pd-svn/trunk/pd +GEM_DIR = /usr/src/pd-svn/trunk/Gem GEM_OPENCV_VERSION = 0.2 @@ -13,14 +13,12 @@ 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` LDFLAGS = -export_dynamic -shared LIBS = `pkg-config --libs opencv` EXTENSION = pd_linux endif ifeq ($(UNAME),Darwin) - CPPFLAGS += -DDARWIN INCLUDES += -I/System/Library/Frameworks/OpenCV.framework/Headers/ LDFLAGS = -bundle -undefined dynamic_lookup LIBS = -lm -framework OpenCV @@ -30,7 +28,7 @@ endif .SUFFIXES = $(EXTENSION) SOURCES = pix_opencv_edge.cc pix_opencv_laplace.cc pix_opencv_morphology.cc pix_opencv_distrans.cc pix_opencv_motempl.cc pix_opencv_haarcascade.cc pix_opencv_contours_boundingrect.cc pix_opencv_bgsubstract.cc pix_opencv_contours_convexity.cc pix_opencv_dft.cc pix_opencv_lk.cc pix_opencv_hist_compare.cc pix_opencv_knear.cc pix_opencv_threshold.cc pix_opencv_floodfill.cc pix_opencv_athreshold.cc pix_opencv_bgstats.cc pix_opencv_camshift.cc pix_opencv_hu_compare.cc pix_opencv_pgh_compare.cc pix_opencv_hough_circles.cc pix_opencv_hough_lines.cc pix_opencv_hu_moments.cc pix_opencv_contours_convexhull.cc pix_opencv_colorfilt.cc -SOURCES_OPT = pix_opencv_surf.cc +SOURCES_OPT = all: $(SOURCES:.cc=.$(EXTENSION)) $(SOURCES_OPT:.cc=.$(EXTENSION)) diff --git a/Makefile.in b/Makefile.in index ec751f9..bfc81a4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,12 +13,14 @@ 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` LDFLAGS = -export_dynamic -shared LIBS = `pkg-config --libs opencv` EXTENSION = pd_linux endif ifeq ($(UNAME),Darwin) + CPPFLAGS += -DDARWIN INCLUDES += -I/System/Library/Frameworks/OpenCV.framework/Headers/ LDFLAGS = -bundle -undefined dynamic_lookup LIBS = -lm -framework OpenCV |