Commit 7ef3cbd5 authored by Eli Zaretskii's avatar Eli Zaretskii

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.
parent 7a7270dd
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.
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment