Mercurial > hg > xemacs-beta
comparison modules/common/Makefile.common @ 4879:c356806cc933
fix compile errors when --with-msw=no
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-16 Ben Wing <ben@xemacs.org>
* common/Makefile.common:
* common/Makefile.common (.PHONY):
Use WIN32_ANY not HAVE_MS_WINDOWS so we still link with the
import library even when --with-msw=no.
src/ChangeLog addition:
2010-01-16 Ben Wing <ben@xemacs.org>
* win32.c (mswindows_read_link_1):
Conditionalize COM support on HAVE_MS_WINDOWS because otherwise we
haven't linked with the appropriate libraries.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 16 Jan 2010 06:50:01 -0600 |
parents | 193188e494b2 |
children | 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
4878:3a4e815c821d | 4879:c356806cc933 |
---|---|
57 MODCFLAGS=@MODCFLAGS@ | 57 MODCFLAGS=@MODCFLAGS@ |
58 INSTALLPATH=@INSTALLPATH@ | 58 INSTALLPATH=@INSTALLPATH@ |
59 INSTALL_PROGRAM=@MOD_INSTALL_PROGRAM@ | 59 INSTALL_PROGRAM=@MOD_INSTALL_PROGRAM@ |
60 OBJECT_TO_BUILD=@OBJECT_TO_BUILD@ | 60 OBJECT_TO_BUILD=@OBJECT_TO_BUILD@ |
61 LIBSTDCPP=@LIBSTDCPP@ | 61 LIBSTDCPP=@LIBSTDCPP@ |
62 #ifdef HAVE_MS_WINDOWS | 62 #ifdef WIN32_ANY |
63 IMPORT_LIB=../../src/xemacs-import.a | 63 IMPORT_LIB=../../src/xemacs-import.a |
64 #endif | 64 #endif |
65 | 65 |
66 .PHONY: install | 66 .PHONY: install |
67 all: $(OBJECT_TO_BUILD) | 67 all: $(OBJECT_TO_BUILD) |