--- pgp/src/makefile.msc	2018/04/24 16:37:53	1.1.1.1
+++ pgp/src/makefile.msc	2018/04/24 16:39:26	1.1.1.3
@@ -1,145 +1,167 @@
-# makefile for PGP (Microsoft C)
-
-DEFINES	=  -DDYN_ALLOC -DSMALL_MEM
-
-PROJ	=PGP
-
-CC	=	cl			# Compile command
-OPT	=	-Oilt			# Optimization and Testing flags
-CFLAGS	=-c -AL -Gt $(OPT) $(DEFINES)	# Flags for compiler
-
-LD		=link			# Link command
-LFLAGS	=/M /STACK:12288			# Flags for linker
-LIBS_EXT=				# Libararies
-
-ASM		=masm			# Assembler command
-ASMFLAGS= /ml			# Flags for assembler
-
-#OBJS_EXT=8086.obj 	   		# ASM obj. files
-OBJS_EXT=8086.obj zmatch.obj   	# ASM obj. files
-
-EXT		=.EXE			# Whatever extension execuatables have
-
-.c.obj:	
-	$(CC) $(CFLAGS) $(DEBUG) $*.c
-
-all:	$(PROJ)$(EXT)
-
-clean:
-	del $(PROJ)$(EXT)
-	del *.OBJ
-
-scratch:	clean all
-
-new:		clean all
-
-
-8086.obj :	8086.asm
-	$(ASM) $(ASMFLAGS) 8086 ;
-
-zmatch.obj :	zmatch.asm
-	$(ASM) $(ASMFLAGS) zmatch ;
-
-ZIPOBJS= zbits.obj zdeflate.obj zfile_io.obj zglobals.obj \
-	zinflate.obj zip.obj zipup.obj ztrees.obj zunzip.obj 
-
-OBJ1 =	pgp.obj crypto.obj keymgmt.obj fileio.obj \
-	mdfile.obj more.obj armor.obj mpilib.obj mpiio.obj
-OBJ2 =	genprime.obj rsagen.obj random.obj idea.obj passwd.obj \
-	md5.obj system.obj language.obj getopt.obj
-OBJ3 =	keyadd.obj config.obj keymaint.obj charset.obj $(OBJS_EXT)
-
-$(PROJ)$(EXT): $(OBJ1) $(OBJ2) $(OBJ3) $(ZIPOBJS)
-	echo $(OBJ1)+ >pgp.rsp
-	echo $(OBJ2)+ >>pgp.rsp
-	echo $(OBJ3)+ >>pgp.rsp
-	echo $(ZIPOBJS); >>pgp.rsp
-	$(LD) $(LFLAGS) @pgp.rsp
-	del pgp.rsp
-
-#	$(LD) @<<
-#$(LFLAGS) $(OBJ1) +
-#$(OBJ2) +
-#$(ZIPOBJS)
-#$(PROJ)$(EXT) , NUL , $(LIBS_EXT) ; 
-#<<
-
-# The following is for the IDEA test program...
-
-ideatst:	IDEATST$(EXT)
-
-IDEATST$(EXT):	ideatst.obj
-	$(LD) $(LFLAGS) IDEATST.OBJ, IDEATST$(EXT), NUL, $(LIBS_EXT); 
-
-#	$(LD) @<<
-#$(LFLAGS) IDEATST.OBJ , IDEATST$(EXT), NUL , $(LIBS_EXT) ; 
-#<<
-
-
-# The following is for the DSS test program...
-
-dss.obj:	dss.c mpilib.h genprime.h random.h dss.h
-	$(CC) $(CFLAGS) $*.c
-
-DSSOBJS = dss.obj mpilib.obj genprime.obj mpiio.obj random.obj 8086.obj
-dss.exe : $(DSSOBJS)
-	link /M /STACK:8192 $(DSSOBJS) ;
-	- dss
-
-DSSSTUFF1 = dss.c mpilib.c genprime.c mpiio.c random.c 8086.asm makefile
-DSSSTUFF2 = dss.h mpilib.h genprime.h mpiio.h random.h 8086.obj usuals.h
-dss.zip : $(DSSSTUFF1) $(DSSSTUFF2)
-	- del dss.zip
-	pkzip dss.zip $(DSSSTUFF1)
-	pkzip dss.zip $(DSSSTUFF2)
-
-rsatst.obj:	rsatst.c mpilib.h mpiio.h genprime.h rsagen.h random.h
-
-RSATSTOBJS = rsatst.obj mpilib.obj genprime.obj rsagen.obj mpiio.obj 8086.obj random.obj
-rsatst.exe : $(RSATSTOBJS)
-	link /M /STACK:8192 $(RSATSTOBJS) ;
-	- rsatst -i
-
-
-## Dependencies ##
-
-charset.obj : usuals.h language.h fileio.h
-config.obj : config.c usuals.h pgp.h 
-crypto.obj : crypto.c mpilib.h usuals.h mpiio.h random.h idea.h crypto.h \
-  keymgmt.h mdfile.h md5.h fileio.h language.h pgp.h 
-fileio.obj : fileio.c random.h usuals.h mpilib.h mpiio.h fileio.h language.h \
-  pgp.h 
-genprime.obj : genprime.c mpilib.h usuals.h genprime.h random.h 
-getopt.obj : getopt.c 
-idea.obj : idea.c idea.h usuals.h 
-keyadd.obj : keyadd.c mpilib.h usuals.h idea.h random.h crypto.h fileio.h \
-  keymgmt.h genprime.h rsagen.h mpiio.h language.h pgp.h 
-keymaint.obj : keymaint.c mpilib.h usuals.h random.h crypto.h fileio.h \
-  keymgmt.h mpiio.h language.h pgp.h 
-keymgmt.obj : keymgmt.c mpilib.h usuals.h idea.h random.h crypto.h fileio.h \
-  keymgmt.h genprime.h rsagen.h mpiio.h language.h pgp.h 
-language.obj : language.c language.h 
-mdfile.obj : mdfile.c mpilib.h usuals.h mdfile.h md5.h language.h pgp.h 
-md5.obj : md5.c md5.h 
-more.obj : more.c mpilib.h usuals.h language.h fileio.h pgp.h 
-mpiio.obj : mpiio.c mpilib.h usuals.h mpiio.h pgp.h 
-mpilib.obj : mpilib.c mpilib.h usuals.h 
-passwd.obj : passwd.c random.h usuals.h md5.h language.h pgp.h 
-armor.obj : armor.c mpilib.h usuals.h fileio.h mpiio.h language.h pgp.h 
-pgp.obj : pgp.c mpilib.h usuals.h random.h crypto.h fileio.h keymgmt.h \
-  language.h pgp.h 
-random.obj : random.c random.h usuals.h language.h 
-rsagen.obj : rsagen.c mpilib.h usuals.h genprime.h rsagen.h random.h 
-system.obj : system.c 
-
-##
-
-zbits.obj : zbits.c zip.h ztailor.h ziperr.h 
-zdeflate.obj : zdeflate.c zip.h ztailor.h ziperr.h 
-zfile_io.obj : zfile_io.c zunzip.h 
-zglobals.obj : zglobals.c zip.h ztailor.h ziperr.h 
-zinflate.obj : zinflate.c zunzip.h 
-zip.obj : zip.c usuals.h fileio.h language.h pgp.h 
-zipup.obj : zipup.c zip.h ztailor.h ziperr.h zrevisio.h 
-ztrees.obj : ztrees.c zip.h ztailor.h ziperr.h 
-zunzip.obj : zunzip.c zunzip.h 
+# makefile for PGP (Microsoft C)
+
+DEFINES	=  -DDYN_ALLOC -DSMALL_MEM
+ADEFINES = -DDYN_ALLOC=1 -DSS_NEQ_DS=1
+
+PROJ	=PGP
+
+CC	=cl -nologo -AL			# Compile command
+OPT	=	-Oilt			# Optimization and Testing flags
+CFLAGS	=-c -Gt $(OPT) $(DEFINES) 	# Flags for compiler
+
+LD		=link			# Link command
+LFLAGS	=/M /STACK:24576			# Flags for linker
+LIBS_EXT=				# Libraries
+
+# for MASM 5.x and below
+ASM	=masm				# Assembler command
+ASMFLAGS= -ml				# Flags for assembler
+# for MASM 6.0 use the following instead
+#ASM	=ml -nologo 			# Assembler command
+#ASMFLAGS=-Zm -Cp -c			# Flags for assembler
+
+#OBJS_EXT=8086.obj 	   		# ASM obj. files
+OBJS_EXT=8086.obj zmatch.obj   	# ASM obj. files
+
+EXT		=.EXE			# Whatever extension execuatables have
+
+.c.obj:	
+	$(CC) $(CFLAGS) $(DEBUG) $*.c
+
+all:	$(PROJ)$(EXT)
+
+os2:	
+	$(MAKE) -f makefile.msc $(PROJ)2$(EXT) \
+	DEFINES="-DDYN_ALLOC -DSMALL_MEM -DOS2" ADEFINES="-DDYN_ALLOC=1" \
+	LFLAGS="-Lp -F 3000"
+
+clean:
+	del $(PROJ)$(EXT)
+	del *.OBJ
+
+scratch:	clean all
+
+new:		clean all
+
+
+8086.obj :	8086.asm
+	$(ASM) $(ASMFLAGS) 8086.asm ;
+
+zmatch.obj :	zmatch.asm
+	$(ASM) $(ASMFLAGS) $(ADEFINES) zmatch.asm ;
+
+ZIPOBJS= zbits.obj zdeflate.obj zfile_io.obj zglobals.obj \
+	zinflate.obj zip.obj zipup.obj ztrees.obj zunzip.obj 
+
+OBJ1 =	pgp.obj crypto.obj keymgmt.obj fileio.obj \
+	mdfile.obj more.obj armor.obj mpilib.obj mpiio.obj
+OBJ2 =	genprime.obj rsagen.obj random.obj idea.obj passwd.obj \
+	md5.obj system.obj language.obj getopt.obj
+OBJ3 =	keyadd.obj config.obj keymaint.obj charset.obj $(OBJS_EXT)
+
+$(PROJ)$(EXT): $(OBJ1) $(OBJ2) $(OBJ3) $(ZIPOBJS)
+	echo $(OBJ1)+ >pgp.rsp
+	echo $(OBJ2)+ >>pgp.rsp
+	echo $(OBJ3)+ >>pgp.rsp
+	echo $(ZIPOBJS); >>pgp.rsp
+	$(LD) $(LFLAGS) @pgp.rsp
+	del pgp.rsp
+
+$(PROJ)2$(EXT): $(OBJ1) $(OBJ2) $(OBJ3) $(ZIPOBJS) pgp.def
+	$(CC) $(OBJ1) $(OBJ2) $(OBJ3) $(ZIPOBJS) pgp.def -o $@ $(LFLAGS)
+	bind -nologo $@
+
+#	$(LD) @<<
+#$(LFLAGS) $(OBJ1) +
+#$(OBJ2) +
+#$(ZIPOBJS)
+#$(PROJ)$(EXT) , NUL , $(LIBS_EXT) ; 
+#<<
+
+# The following is for the IDEA test program...
+
+ideatst:	IDEATST$(EXT)
+
+IDEATST$(EXT):	ideatst.obj
+	$(LD) $(LFLAGS) IDEATST.OBJ, IDEATST$(EXT), NUL, $(LIBS_EXT); 
+
+#	$(LD) @<<
+#$(LFLAGS) IDEATST.OBJ , IDEATST$(EXT), NUL , $(LIBS_EXT) ; 
+#<<
+
+
+# The following is for the DSS test program...
+
+dss.obj:	dss.c mpilib.h genprime.h random.h dss.h
+	$(CC) $(CFLAGS) $*.c
+
+DSSOBJS = dss.obj mpilib.obj genprime.obj mpiio.obj random.obj 8086.obj
+dss.exe : $(DSSOBJS)
+	link /M /STACK:8192 $(DSSOBJS) ;
+	- dss
+
+DSSSTUFF1 = dss.c mpilib.c genprime.c mpiio.c random.c 8086.asm makefile
+DSSSTUFF2 = dss.h mpilib.h genprime.h mpiio.h random.h 8086.obj usuals.h
+dss.zip : $(DSSSTUFF1) $(DSSSTUFF2)
+	- del dss.zip
+	pkzip dss.zip $(DSSSTUFF1)
+	pkzip dss.zip $(DSSSTUFF2)
+
+rsatst.obj:	rsatst.c mpilib.h mpiio.h genprime.h rsagen.h random.h
+
+RSATSTOBJS = rsatst.obj mpilib.obj genprime.obj rsagen.obj mpiio.obj 8086.obj random.obj
+rsatst.exe : $(RSATSTOBJS)
+	link /M /STACK:8192 $(RSATSTOBJS) ;
+	- rsatst -i
+
+
+## Dependencies ##
+armor.obj : armor.c mpilib.h usuals.h platform.h fileio.h mpiio.h language.h \
+  pgp.h more.h armor.h crypto.h 
+charset.obj : charset.c usuals.h language.h charset.h system.h 
+config.obj : config.c usuals.h fileio.h pgp.h more.h armor.h config.h \
+  charset.h 
+crypto.obj : crypto.c mpilib.h usuals.h platform.h mpiio.h random.h idea.h \
+  crypto.h keymgmt.h keymaint.h mdfile.h md5.h fileio.h charset.h language.h \
+  pgp.h more.h armor.h exitpgp.h zipup.h 
+fileio.obj : fileio.c random.h usuals.h mpilib.h platform.h mpiio.h fileio.h \
+  language.h pgp.h more.h armor.h exitpgp.h charset.h system.h 
+genprime.obj : genprime.c mpilib.h usuals.h platform.h genprime.h random.h 
+getopt.obj : getopt.c getopt.h 
+idea.obj : idea.c idea.h usuals.h 
+keyadd.obj : keyadd.c mpilib.h usuals.h platform.h crypto.h fileio.h \
+  keymgmt.h charset.h language.h pgp.h more.h armor.h exitpgp.h keyadd.h \
+  keymaint.h 
+keymaint.obj : keymaint.c mpilib.h usuals.h platform.h random.h crypto.h \
+  fileio.h keymgmt.h keymaint.h mpiio.h charset.h language.h pgp.h more.h \
+  armor.h 
+keymgmt.obj : keymgmt.c system.h mpilib.h usuals.h platform.h idea.h random.h \
+  crypto.h fileio.h keymgmt.h rsagen.h mpiio.h language.h pgp.h more.h \
+  armor.h md5.h charset.h keymaint.h 
+language.obj : language.c usuals.h fileio.h language.h pgp.h more.h armor.h \
+  charset.h 
+md5.obj : md5.c md5.h 
+mdfile.obj : mdfile.c mpilib.h usuals.h platform.h mdfile.h md5.h fileio.h \
+  language.h pgp.h more.h armor.h 
+more.obj : more.c system.h mpilib.h usuals.h platform.h language.h fileio.h \
+  pgp.h more.h armor.h charset.h 
+mpiio.obj : mpiio.c mpilib.h usuals.h platform.h mpiio.h pgp.h more.h armor.h 
+mpilib.obj : mpilib.c mpilib.h usuals.h platform.h 
+passwd.obj : passwd.c random.h usuals.h md5.h language.h pgp.h more.h armor.h 
+pgp.obj : pgp.c system.h mpilib.h usuals.h platform.h random.h crypto.h \
+  fileio.h keymgmt.h language.h pgp.h more.h armor.h exitpgp.h charset.h \
+  getopt.h config.h keymaint.h keyadd.h 
+random.obj : random.c system.h random.h usuals.h language.h 
+rsagen.obj : rsagen.c mpilib.h usuals.h platform.h genprime.h rsagen.h \
+  random.h 
+system.obj : system.c exitpgp.h system.h charset.h 
+zbits.obj : zbits.c zip.h ztailor.h ziperr.h 
+zdeflate.obj : zdeflate.c zunzip.h usuals.h system.h zip.h ztailor.h ziperr.h 
+zfile_io.obj : zfile_io.c zunzip.h usuals.h system.h 
+zglobals.obj : zglobals.c zip.h ztailor.h ziperr.h 
+zinflate.obj : zinflate.c zunzip.h usuals.h system.h exitpgp.h 
+zip.obj : zip.c usuals.h fileio.h language.h pgp.h more.h armor.h exitpgp.h 
+zipup.obj : zipup.c zip.h ztailor.h ziperr.h zrevisio.h 
+ztrees.obj : ztrees.c zip.h ztailor.h ziperr.h 
+zunzip.obj : zunzip.c zunzip.h usuals.h system.h 
+r3000.obj : r3000.c mpilib.h usuals.h platform.h lmul.h