[mms-lib] Tweaking ImageMagick/Qt switch

sailfishos · Mar 5, 2014 · 11ad6d3 · 11ad6d3
1 parent 07ef80a
commit 11ad6d3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/mms-lib/Config.mak b/mms-lib/Config.mak
@@ -8,17 +8,19 @@ MMS_RESIZE = Qt
 #
 
 ifeq ($(MMS_RESIZE),ImageMagick)
-RESIZE_DEFINES = -DMMS_RESIZE_IMAGEMAGICK
 RESIZE_PKG = ImageMagick
+RESIZE_DEFINES = -DMMS_RESIZE_IMAGEMAGICK
+RESIZE_CFLAGS = $(shell pkg-config --cflags $(RESIZE_PKG))
 else
   ifeq ($(MMS_RESIZE),Qt)
-    RESIZE_LIBS = -lstdc++
-    RESIZE_DEFINES = -DMMS_RESIZE_QT
     ifeq ($(shell qmake --version | grep "Using Qt version 5"),)
         RESIZE_PKG = QtGui
     else
         RESIZE_PKG = Qt5Gui
     endif
+    RESIZE_LIBS = -lstdc++
+    RESIZE_DEFINES = -DMMS_RESIZE_QT
+    RESIZE_CPPFLAGS = $(shell pkg-config --cflags $(RESIZE_PKG))
   endif
 endif
 
diff --git a/mms-lib/Makefile b/mms-lib/Makefile
@@ -8,8 +8,11 @@
 
 include Config.mak
 
+#
 # Required packages
-PKGS = glib-2.0 libsoup-2.4 libwspcodec $(RESIZE_PKG)
+#
+
+PKGS = glib-2.0 libsoup-2.4 libwspcodec
 
 #
 # Default target
@@ -69,7 +72,7 @@ RELEASE_DEFS =
 WARNINGS = -Wall
 DEFINES = $(RESIZE_DEFINES)
 INCLUDES = -I$(SRC_DIR) -I$(INCLUDE_DIR)
-CFLAGS += -fPIC $(WARNINGS) $(DEFINES) $(INCLUDES) \
+CFLAGS += -fPIC $(WARNINGS) $(DEFINES) $(INCLUDES) $(RESIZE_CFLAGS) \
   $(shell pkg-config --cflags $(PKGS)) -MMD
 
 ifndef KEEP_SYMBOLS
@@ -82,8 +85,8 @@ endif
 
 DEBUG_CFLAGS = $(DEBUG_FLAGS) $(DEBUG_DEFS) $(CFLAGS)
 RELEASE_CFLAGS = $(RELEASE_FLAGS) $(RELEASE_DEFS) $(CFLAGS)
-DEBUG_CPPFLAGS = -Wno-psabi $(DEBUG_CFLAGS)
-RELEASE_CPPFLAGS = -Wno-psabi $(RELEASE_CFLAGS)
+DEBUG_CPPFLAGS = -Wno-psabi $(RESIZE_CPPFLAGS) $(DEBUG_CFLAGS)
+RELEASE_CPPFLAGS = -Wno-psabi $(RESIZE_CPPFLAGS) $(RELEASE_CFLAGS)
 
 #
 # Files