dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sven Neumann 2007-08-13 06:49:25 +00:00 committed by Sven Neumann
parent 296c2de807
commit 6d0997ba14
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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):

4
modules/Makefile.am
View File

@ -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)

9
modules/cdisplay_lcms.c
View File

@ -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"