From 67e71d7931b3573663ff31ae0e4ffff225f2b163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 18 Jun 2013 12:46:07 +0100 Subject: [PATCH] opencv: fix CFLAGS order and add plugins base libs includes to CXXFLAGS https://bugzilla.gnome.org/show_bug.cgi?id=702297 --- ext/opencv/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/opencv/Makefile.am b/ext/opencv/Makefile.am index 05e0077ab5..c2dba8dc8f 100644 --- a/ext/opencv/Makefile.am +++ b/ext/opencv/Makefile.am @@ -25,15 +25,15 @@ libgstopencv_la_SOURCES = gstopencv.c \ motioncells_wrapper.cpp \ MotionCells.cpp -libgstopencv_la_CXXFLAGS = $(GST_CXXFLAGS) $(OPENCV_CFLAGS) +libgstopencv_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(OPENCV_CFLAGS) # flags used to compile this facedetect # add other _CFLAGS and _LIBS as needed # # override CV_INLINE: GLib will take care of defining 'inline' sufficiently and # OpenCV's define isn't good enough to avoid 'unused' gcc warnings (at v2.1.0) -libgstopencv_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(OPENCV_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ +libgstopencv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) $(OPENCV_CFLAGS) \ -DGST_HAAR_CASCADES_DIR=\"$(pkgdatadir)/@GST_API_VERSION@/opencv_haarcascades\" \ -DCV_INLINE="static inline" \ -DCV_NO_BACKWARD_COMPATIBILITY