Link with -limm32.

2004-08-30  Tor Lillqvist  <tml@iki.fi>

	* modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32.

	* modules/input/gtkimcontextime.c: Use quotes in #includes, to
	find headers when building inside GTK+ sources.

diff --git a/ChangeLog b/ChangeLog
index 2fa429e958908a77e23294e7e8f90888116d1feb..565868d41df1b114298241f3d003da8c47f2b59f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-30  Tor Lillqvist  <tml@iki.fi>
+
+       * modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32.
+
+       * modules/input/gtkimcontextime.c: Use quotes in #includes, to
+       find headers when building inside GTK+ sources.
+
 2004-08-27  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2fa429e958908a77e23294e7e8f90888116d1feb..565868d41df1b114298241f3d003da8c47f2b59f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-08-30  Tor Lillqvist  <tml@iki.fi>
+
+       * modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32.
+
+       * modules/input/gtkimcontextime.c: Use quotes in #includes, to
+       find headers when building inside GTK+ sources.
+
 2004-08-27  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2fa429e958908a77e23294e7e8f90888116d1feb..565868d41df1b114298241f3d003da8c47f2b59f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-08-30  Tor Lillqvist  <tml@iki.fi>
+
+       * modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32.
+
+       * modules/input/gtkimcontextime.c: Use quotes in #includes, to
+       find headers when building inside GTK+ sources.
+
 2004-08-27  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2fa429e958908a77e23294e7e8f90888116d1feb..565868d41df1b114298241f3d003da8c47f2b59f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-08-30  Tor Lillqvist  <tml@iki.fi>
+
+       * modules/input/Makefile.am (im_ime_la_LIBADD): Link with -limm32.
+
+       * modules/input/gtkimcontextime.c: Use quotes in #includes, to
+       find headers when building inside GTK+ sources.
+
 2004-08-27  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkdnd-win32.c (GdkDragContextPrivateWin32): Add

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index b234f0b2e6403b73d437d78aa7da11ceed977a5d..42c6e8997834062d46d50d32235870b72c8d4737 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -82,7 +82,7 @@ im_ime_la_SOURCES = \
        gtkimcontextime.h \
        imime.c           \
        imm-extra.h
-im_ime_la_LIBADD = $(LDADDS)
+im_ime_la_LIBADD = -limm32 $(LDADDS)
 if PLATFORM_WIN32
 IM_IME_MODULE=im-ime.la 
 endif

diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index b441d53c577663177d6fad4f58c932719ddee35f..82397bbb90aa5c013a0058b3142a6e728bf6f638 100644 (file)
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -30,9 +30,9 @@
 
 #include "imm-extra.h"
 
-#include <gdk/gdkwin32.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
+#include "gdk/win32/gdkwin32.h"
+#include "gdk/gdkkeysyms.h"
+#include "gtk/gtkwidget.h"
 
 /* avoid warning */
 #ifdef STRICT