From 6d0997ba1454dfa6be57a659fed96eb22dac7f86 Mon Sep 17 00:00:00 2001
From: Sven Neumann <sven@gimp.org>
Date: Mon, 13 Aug 2007 06:49:25 +0000
Subject: [PATCH] link with gdi32 on PLATFORM_WIN32.

2007-08-13  Sven Neumann  <sven@gimp.org>

	* modules/Makefile.am (libcdisplay_lcms_la_LIBADD): link with
	gdi32 on PLATFORM_WIN32.

	* modules/cdisplay_lcms.c: changed include order to fix the
build
	on MingW (see bug #78265).


svn path=/trunk/; revision=23229
---
 ChangeLog               | 8 ++++++++
 modules/Makefile.am     | 4 ++++
 modules/cdisplay_lcms.c | 9 +++++----
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e13a3655ca..30e0f87277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-13  Sven Neumann  <sven@gimp.org>
+
+	* modules/Makefile.am (libcdisplay_lcms_la_LIBADD): link with
+	gdi32 on PLATFORM_WIN32.
+
+	* modules/cdisplay_lcms.c: changed include order to fix the build
+	on MingW (see bug #78265).
+
 2007-08-13  Martin Nordholts  <martinn@svn.gnome.org>
 
 	* app/tools/gimprectangleoptions.c (gimp_rectangle_options_gui):
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 129700bfa6..751c835154 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -92,6 +92,10 @@ libcdisplay_lcms_la_SOURCES = cdisplay_lcms.c
 libcdisplay_lcms_la_LDFLAGS = -avoid-version -module $(no_undefined)
 libcdisplay_lcms_la_LIBADD = $(cdisplay_libadd) $(LIBLCMS)
 
+if PLATFORM_WIN32
+libcdisplay_lcms_la_LIBADD += -lgdi32
+endif
+
 libcdisplay_proof_la_SOURCES = cdisplay_proof.c
 libcdisplay_proof_la_LDFLAGS = -avoid-version -module $(no_undefined)
 libcdisplay_proof_la_LIBADD = $(cdisplay_libadd) $(LIBLCMS)
diff --git a/modules/cdisplay_lcms.c b/modules/cdisplay_lcms.c
index 42737c1643..c31e55ee09 100644
--- a/modules/cdisplay_lcms.c
+++ b/modules/cdisplay_lcms.c
@@ -18,18 +18,19 @@
 
 #include "config.h"
 
+#ifdef G_OS_WIN32
+#include <windows.h>
+#endif
+
 #include <glib.h>  /* lcms.h uses the "inline" keyword */
 
 #ifdef HAVE_LCMS_LCMS_H
+#define LCMS_WIN_TYPES_ALREADY_DEFINED
 #include <lcms/lcms.h>
 #else
 #include <lcms.h>
 #endif
 
-#ifdef G_OS_WIN32
-#include <windows.h>
-#endif
-
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"