From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 12 Nov 2011 12:11:54 +0000 (+0200)
Subject: Allow building temacs with a larger heap on MS-Windows.
X-Git-Tag: emacs-pretest-24.0.92~202
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ef3cbd547a64ed25d355258382ca96e5316efb8;p=emacs.git

Allow building temacs with a larger heap on MS-Windows.

 src/makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
 with user-defined heap size.  Bump the default size of the temacs
 heap to 27MB, to avoid memory warning when running temacs.
 ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 286896be6e3..f4250ec83b0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2011-11-12  Eli Zaretskii  <eliz@gnu.org>
 
+	* makefile.w32-in (HEAPSIZE): New variable, allows to build temacs
+	with user-defined heap size.  Bump the default size of the temacs
+	heap to 27MB, to avoid memory warning when running temacs.
+	($(TEMACS)): Use HEAPSIZE instead of a hardcoded value.
+
 	* dispnew.c (scrolling_window): Fix incorrect indices in accessing
 	current_matrix and desired_matrix.  (Bug#9990)
 	(verify_row_hash) [XASSERTS]: New function.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index e97f7f3aca4..36e4511d845 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -24,6 +24,9 @@ ALL = emacs
 # Set EMACSLOADPATH correctly (in case already defined in environment).
 EMACSLOADPATH=$(CURDIR)/../lisp
 
+# Size in MBs of the static heap in temacs.exe.
+HEAPSIZE = 27
+
 #
 # HAVE_CONFIG_H is required by some generic gnu sources stuck into
 # the emacs source tree.
@@ -177,7 +180,7 @@ temacs:         stamp_BLD $(TEMACS)
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \
 		  ../nt/$(BLD)/addsection.exe $(GNULIB)
 	$(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
-	"$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21
+	"$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP $(HEAPSIZE)
 
 # These omit firstfile.${O}, but there's no documentation in there
 # anyways.