[gs-cvs] gs/src

[Igor Melichev]

Update of /cvs/ghostscript/gs/src
In directory casper:/tmp/cvs-serv15468/gs/src

Modified Files:
	int.mak msvccmd.mak 
Log Message:
Fix: Include gs_resmp.ps into the prelude with ADDMOD rather than .runlibfile
(suggested by Raymond J. Johnston), and
increase MSVC compiler heap for building gs_init.c with COMPILE_INITS=1.
Source Forge bug "[ 526192 ] Broken COMPILE_INITS".


Index: int.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/int.mak,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- int.mak	25 Feb 2002 10:02:12 -0000	1.63
+++ int.mak	6 Mar 2002 08:55:16 -0000	1.64
@@ -1038,7 +1038,7 @@
 
 $(PSD)frsd.dev : $(INT_MAK) $(ECHOGS_XE) $(PSD)zfrsd.dev
 	$(SETMOD) $(PSD)frsd -include $(PSD)zfrsd
-	$(ADDMOD) $(PSD)frsd -ps gs_lev2 gs_res gs_frsd
+	$(ADDMOD) $(PSD)frsd -ps gs_lev2 gs_res gs_resmp gs_frsd
 
 zfrsd_=$(PSOBJ)zfrsd.$(OBJ)
 $(PSD)zfrsd.dev : $(INT_MAK) $(ECHOGS_XE) $(zfrsd_)
@@ -1078,7 +1078,7 @@
 	$(SETMOD) $(PSD)psl2int $(psl2int_)
 	$(ADDMOD) $(PSD)psl2int -include $(PSD)dps2int $(PSD)usparam
 	$(ADDMOD) $(PSD)psl2int -oper zmisc2
-	$(ADDMOD) $(PSD)psl2int -ps gs_lev2 gs_res
+	$(ADDMOD) $(PSD)psl2int -ps gs_lev2 gs_res gs_resmp
 
 ivmem2_h=$(PSSRC)ivmem2.h
 

Index: msvccmd.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/msvccmd.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- msvccmd.mak	21 Feb 2002 22:24:53 -0000	1.8
+++ msvccmd.mak	6 Mar 2002 08:55:16 -0000	1.9
@@ -170,9 +170,17 @@
 !else
 WX=$(COMPILE_FOR_EXE)
 !endif
+
+!if $(COMPILE_INITS)
+ZM=/Zm200
+!else
+ZM=
+!endif
+
+
 # /Za disables the MS-specific extensions & enables ANSI mode.
 CC_WX=$(CC) $(WX)
-CC_=$(CC_WX) $(COMPILE_FULL_OPTIMIZED) /Za
+CC_=$(CC_WX) $(COMPILE_FULL_OPTIMIZED) /Za $(ZM)
 CC_D=$(CC_WX) $(COMPILE_WITH_FRAMES)
 CC_INT=$(CC_)
 CC_LEAF=$(CC_) $(COMPILE_WITHOUT_FRAMES)