From 303f9345bfaa12985ed006afdceb1f9eea32489a Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Wed, 4 Apr 2012 17:08:18 +0000
Subject: [PATCH] defs.mk: Started implementation of support for
 openSUSE-supplied mingw binaries

---
 make/defs.mk | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index aeeea8bf..9e567270 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -152,6 +152,8 @@ ifeq ($(TARGET),mingw)
   CROSS_TOOL_DIR      ?=
   CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/usr/bin/i686-w64-mingw32-
   PROJECT_LDFLAGS     += -L/usr/i686-w64-mingw32/sys-root/mingw/lib
+  PROJECT_CFLAGS      += -L/usr/i686-w64-mingw32/sys-root/mingw/include
+  PROJECT_CPPFLAGS    += -L/usr/i686-w64-mingw32/sys-root/mingw/include
  else
   CROSS_TOOL_DIR      ?= /opt/cross-tools
   CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32-
@@ -499,6 +501,11 @@ else
   endif
 endif
 
+ifeq ($(TARGET),mingw)
+BUILD_CFLAGS          += -DWIN32
+BUILD_CPPFLAGS        += -DWIN32
+endif
+
 ifeq ($(LIBTYPE),shared)
   ifneq ($(TARGET),mingw)
 	BUILD_LDFLAGS         += -rdynamic
@@ -1351,8 +1358,14 @@ ifeq ($(USE_GLIB),true)
     endif
     LIBFLAGS              += -ldl -lpthread
   else
-    INCLUDE               += -I$(CROSS_TOOL_DIR)/include/glib-2.0 -I$(CROSS_TOOL_DIR)/lib/glib-2.0/include
-    LIBFLAGS              += -lglib-2.0
+    ifneq ($(wildcard $(CROSS_TOOL_DIR)/include/glib-2.0),)
+      INCLUDE             += -I$(CROSS_TOOL_DIR)/include/glib-2.0 -I$(CROSS_TOOL_DIR)/lib/glib-2.0/include
+      LIBFLAGS            += -lglib-2.0
+    else
+      PROJECT_CFLAGS      += $(shell /usr/bin/i686-w64-mingw32-pkg-config --cflags glib-2.0)
+      PROJECT_CPPFLAGS    += $(shell /usr/bin/i686-w64-mingw32-pkg-config --cflags glib-2.0)
+      LIBFLAGS            += $(shell /usr/bin/i686-w64-mingw32-pkg-config --libs glib-2.0)
+    endif
   endif
 endif