CVS update by vins xemacs/nt ...

[xemacs-cvs at xemacs.org]

  User: vins    
  Date: 06/12/12 15:54:51

  Modified:    xemacs/nt ChangeLog config.inc.samp xemacs.mak
Log:
Don't require MSVCRTD.dll when building setup kits.

Revision  Changes    Path
1.205     +6 -0      XEmacs/xemacs/nt/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -p -r1.204 -r1.205
--- ChangeLog	2006/05/16 08:24:25	1.204
+++ ChangeLog	2006/12/12 14:54:49	1.205
@@ -1,3 +1,9 @@
+2006-12-11  Vin Shelton  <acs at 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 at xemacs.org>
 
 	* XEmacs 21.5.27 "fiddleheads" is released.



1.26      +4 -0      XEmacs/xemacs/nt/config.inc.samp

Index: config.inc.samp
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/config.inc.samp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- config.inc.samp	2006/03/14 00:09:09	1.25
+++ config.inc.samp	2006/12/12 14:54:49	1.26
@@ -176,6 +176,10 @@ OPTIMIZED_BUILD=1
 # #### 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                             #
 ############################################################################



1.122     +9 -3      XEmacs/xemacs/nt/xemacs.mak

Index: xemacs.mak
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- xemacs.mak	2006/03/14 00:09:09	1.121
+++ xemacs.mak	2006/12/12 14:54:49	1.122
@@ -196,6 +196,12 @@ DEBUG_XEMACS=0
 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 @@ BROWSERFLAGS=
 !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