# HG changeset patch # User Ben Wing # Date 1263552575 21600 # Node ID 9873ea104ef6008fc86ddcaa53a955f6a771a572 # Parent d8d92ad084b8b3b8c8b23f370d47c369613bab76 Fix Cygwin module builds when --with-msw=no -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-01-15 Ben Wing * Makefile.in.in: Build xemacs-export.o whenever we're on any Windows OS (WIN32_ANY) instead of only when we build support for the GUI portion of MS-Windows (HAVE_MS_WINDOWS). Cosmetic: Use WIN32_ANY in place of equivalent (WIN32_NATIVE or CYGWIN). diff -r d8d92ad084b8 -r 9873ea104ef6 src/ChangeLog --- a/src/ChangeLog Fri Jan 15 04:47:00 2010 -0600 +++ b/src/ChangeLog Fri Jan 15 04:49:35 2010 -0600 @@ -1,3 +1,13 @@ +2010-01-15 Ben Wing + + * Makefile.in.in: + Build xemacs-export.o whenever we're on any Windows OS (WIN32_ANY) + instead of only when we build support for the GUI portion of + MS-Windows (HAVE_MS_WINDOWS). + + Cosmetic: Use WIN32_ANY in place of equivalent + (WIN32_NATIVE or CYGWIN). + 2010-01-15 Ben Wing * emacs.c: diff -r d8d92ad084b8 -r 9873ea104ef6 src/Makefile.in.in --- a/src/Makefile.in.in Fri Jan 15 04:47:00 2010 -0600 +++ b/src/Makefile.in.in Fri Jan 15 04:49:35 2010 -0600 @@ -230,7 +230,7 @@ #ifdef HAVE_SHLIB shlib_objs=sysdll.o -# ifdef HAVE_MS_WINDOWS +# ifdef WIN32_ANY export_lib=xemacs-export.o xemacs-export.o: xemacs.def dlltool -D xemacs-${version}.exe -d $< -l xemacs-import.a -e $@ @@ -245,7 +245,7 @@ tooltalk_objs=tooltalk.o #endif -#if defined (WIN32_NATIVE) || defined (CYGWIN) +#ifdef WIN32_ANY win32_objs=win32.o intl-win32.o intl-auto-encap-win32.o intl-encap-win32.o \ xemacs_res.o #endif