diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-06-04 22:08:50 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-06-04 22:08:50 +0000 |
| commit | b60940539e01ec2a953c06976a3b9181aca43f6d (patch) | |
| tree | 20342405650cc6a92cf30619eaa5e3d7903278af | |
| parent | d42fa02bc3242701e7d5a9dca44e128c24a30d6d (diff) | |
| download | gtk+-b60940539e01ec2a953c06976a3b9181aca43f6d.tar.gz | |
modules/engines/Makefile.am Decide whether to build the ms-windows theme
2005-06-05 Tor Lillqvist <tml@novell.com>
* modules/engines/Makefile.am
* modules/input/Makefile.am: Decide whether to build the
ms-windows theme engine based on the GDK backend, not based on
platform. (I.e., if building for Cygwin with the X11 backend, we
shouldn't build the ms-windows engine, but if building for Cygwin
but with the Win32 backend, we should.) Ditto for the IME
(Windows) input module. (#305832)
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 10 | ||||
| -rw-r--r-- | modules/engines/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/input/Makefile.am | 2 |
5 files changed, 32 insertions, 2 deletions
@@ -1,3 +1,13 @@ +2005-06-05 Tor Lillqvist <tml@novell.com> + + * modules/engines/Makefile.am + * modules/input/Makefile.am: Decide whether to build the + ms-windows theme engine based on the GDK backend, not based on + platform. (I.e., if building for Cygwin with the X11 backend, we + shouldn't build the ms-windows engine, but if building for Cygwin + but with the Win32 backend, we should.) Ditto for the IME + (Windows) input module. (#305832) + 2005-06-04 Tor Lillqvist <tml@novell.com> * gdk/win32/gdkcursor-win32.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1b4887eb59..1bc131cabe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2005-06-05 Tor Lillqvist <tml@novell.com> + + * modules/engines/Makefile.am + * modules/input/Makefile.am: Decide whether to build the + ms-windows theme engine based on the GDK backend, not based on + platform. (I.e., if building for Cygwin with the X11 backend, we + shouldn't build the ms-windows engine, but if building for Cygwin + but with the Win32 backend, we should.) Ditto for the IME + (Windows) input module. (#305832) + 2005-06-04 Tor Lillqvist <tml@novell.com> * gdk/win32/gdkcursor-win32.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1b4887eb59..1bc131cabe 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +2005-06-05 Tor Lillqvist <tml@novell.com> + + * modules/engines/Makefile.am + * modules/input/Makefile.am: Decide whether to build the + ms-windows theme engine based on the GDK backend, not based on + platform. (I.e., if building for Cygwin with the X11 backend, we + shouldn't build the ms-windows engine, but if building for Cygwin + but with the Win32 backend, we should.) Ditto for the IME + (Windows) input module. (#305832) + 2005-06-04 Tor Lillqvist <tml@novell.com> * gdk/win32/gdkcursor-win32.c diff --git a/modules/engines/Makefile.am b/modules/engines/Makefile.am index b82537db6e..8eff8c9308 100644 --- a/modules/engines/Makefile.am +++ b/modules/engines/Makefile.am @@ -1,4 +1,4 @@ -if PLATFORM_WIN32 +if USE_WIN32 wimp = ms-windows endif diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am index 42c6e89978..3beb81b696 100644 --- a/modules/input/Makefile.am +++ b/modules/input/Makefile.am @@ -83,7 +83,7 @@ im_ime_la_SOURCES = \ imime.c \ imm-extra.h im_ime_la_LIBADD = -limm32 $(LDADDS) -if PLATFORM_WIN32 +if USE_WIN32 IM_IME_MODULE=im-ime.la endif |