Mercurial > hg > xemacs-beta
changeset 3741:8aa52dcfc11a
[xemacs-hg @ 2006-12-12 14:54:49 by vins]
Don't require MSVCRTD.dll when building setup kits.
| author | vins |
|---|---|
| date | Tue, 12 Dec 2006 14:54:49 +0000 |
| parents | a9ddcf85ec1f |
| children | 0f31de855a15 |
| files | nt/ChangeLog nt/config.inc.samp nt/xemacs.mak |
| diffstat | 3 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/nt/ChangeLog Mon Dec 11 22:51:11 2006 +0000 +++ b/nt/ChangeLog Tue Dec 12 14:54:49 2006 +0000 @@ -1,3 +1,9 @@ +2006-12-11 Vin Shelton <acs@xemacs.org> + + * config.inc.samp: Added BUILD_FOR_SETUP_KIT. + * xemacs.mak: Use BUILD_FOR_SETUP_KIT to define + OK_TO_USE_MSVCRTD. + 2006-05-16 Stephen J. Turnbull <stephen@xemacs.org> * XEmacs 21.5.27 "fiddleheads" is released.
--- a/nt/config.inc.samp Mon Dec 11 22:51:11 2006 +0000 +++ b/nt/config.inc.samp Tue Dec 12 14:54:49 2006 +0000 @@ -176,6 +176,10 @@ # #### Change to 1 when I check in the ws with support for fastcall USE_FASTCALL=0 +# Set this in order to avoid building against MSVCRTD.dll, since we can't +# ship that DLL and since it requires VC installed on the target computer +BUILD_FOR_SETUP_KIT=0 + ############################################################################ # Development options # ############################################################################
--- a/nt/xemacs.mak Mon Dec 11 22:51:11 2006 +0000 +++ b/nt/xemacs.mak Tue Dec 12 14:54:49 2006 +0000 @@ -196,6 +196,12 @@ SUPPORT_EDIT_AND_CONTINUE=0 !endif +!if !defined(BUILD_FOR_SETUP_KIT) || "$(BUILD_FOR_SETUP_KIT)" == "0" +OK_TO_USE_MSVCRTD=1 +!else +OK_TO_USE_MSVCRTD=0 +!endif + !if !defined(ERROR_CHECK_ALL) !if "$(emacs_is_beta)" != "" ERROR_CHECK_ALL=1 @@ -711,13 +717,13 @@ !endif !if $(USE_CRTDLL) -! if $(DEBUG_XEMACS) +! if $(DEBUG_XEMACS) && "$(OK_TO_USE_MSVCRTD)" == "1" C_LIBFLAG=-MDd LIBC_LIB=msvcrtd.lib -! else +! else C_LIBFLAG=-MD LIBC_LIB=msvcrt.lib -! endif +! endif !else C_LIBFLAG=-ML LIBC_LIB=libc.lib