Merge trunk -> wbw

13 years ago · f0f7930bfd
16 changed files with 10 additions and 9 deletions
--- a/branches/wbw/Apps/apps-bins/comfiles.lbr
+++ b/branches/wbw/Apps/apps-bins/comfiles.lbr
--- a/branches/wbw/Apps/apps-srcs/sources.lbr
+++ b/branches/wbw/Apps/apps-srcs/sources.lbr
--- a/branches/wbw/Apps/core/access.com
+++ b/branches/wbw/Apps/core/access.com
--- a/branches/wbw/Apps/core/cpmname.com
+++ b/branches/wbw/Apps/core/cpmname.com
--- a/branches/wbw/Apps/core/findfile.com
+++ b/branches/wbw/Apps/core/findfile.com
--- a/branches/wbw/Apps/core/map.com
+++ b/branches/wbw/Apps/core/map.com
--- a/branches/wbw/Apps/core/meta.com
+++ b/branches/wbw/Apps/core/meta.com
--- a/branches/wbw/Apps/core/multifmt.com
+++ b/branches/wbw/Apps/core/multifmt.com
--- a/branches/wbw/Apps/core/setlabel.com
+++ b/branches/wbw/Apps/core/setlabel.com
--- a/branches/wbw/Apps/core/sysgen.com
+++ b/branches/wbw/Apps/core/sysgen.com
--- a/branches/wbw/Apps/core/termtype.com
+++ b/branches/wbw/Apps/core/termtype.com
--- a/branches/wbw/Apps/core/view.com
+++ b/branches/wbw/Apps/core/view.com
--- a/branches/wbw/Apps/dougs-devo/allfiles.lbr
+++ b/branches/wbw/Apps/dougs-devo/allfiles.lbr
--- a/branches/wbw/LSource/Makefile
+++ b/branches/wbw/LSource/Makefile
@ -1,3 +1,4 @@
+# RomWBW/branches/dwg/LSource/Makefile  1/16/2013 dwg - Makefile for scientific Linux (red hat enterprise)
 # RomWBW/branches/dwg/LSource/Makefile 11/09/2012 dwg - added rule to copy n8chars.minc
 # RomWBW/branches/dwg/LSource/Makefile 10/27/2012 dwg - 
 #
--- a/branches/wbw/Source/ver.inc
+++ b/branches/wbw/Source/ver.inc
@ -1,6 +1,6 @@
 #DEFINE	RMJ	2
-#DEFINE	RMN	2
+#DEFINE	RMN	3
 #DEFINE	RUP	0
-#DEFINE	RTP	3
-#DEFINE BIOSVER	"2.2 B3"
-#DEFINE REVISION 1741
+#DEFINE	RTP	0
+#DEFINE BIOSVER	"2.3(int)"
+#DEFINE REVISION 223
--- a/branches/wbw/XSource/Makefile
+++ b/branches/wbw/XSource/Makefile
@ -1,3 +1,4 @@
+# RomWBW/branches/dwg/XSource/Makefile  1/16/2013 dwg - validate build on Linux
 # RomWBW/branches/dwg/XSource/Makefile 11/09/2012 dwg - add copy rule for n8chars.inc
 # RomWBW/branches/dwg/XSource/Makefile 10/24/2012 dwg - 
 #
@ -202,11 +203,10 @@ os.bin: $(CPBIN) $(DOSBIN) cbios.bin
 	
 rom0.bin: pgzero.bin bootrom.bin syscfg.bin loader.bin romfill.bin dbgmon.bin os.bin hbfill.bin
 	cat pgzero.bin bootrom.bin syscfg.bin loader.bin romfill.bin dbgmon.bin os.bin hbfill.bin >>$@
-	
-rom1.bin:	pgzero.bin bootrom.bin syscfg.bin loader.bin
-#rom1.bin: pgzero.bin bootrom.bin syscfg.bin loader.bin hbios.bin
-	cat pgzero.bin bootrom.bin syscfg.bin loader.bin >>$@
-#	cat pgzero.bin bootrom.bin syscfg.bin loader.bin hbios.bin >>$@
+
+# fixed 1/16/20113 dwg - added hbios.bin to end of cat list	
+rom1.bin:	pgzero.bin bootrom.bin syscfg.bin loader.bin hbios.bin
+	cat     pgzero.bin bootrom.bin syscfg.bin loader.bin hbios.bin >>$@

 $(OUTDIR)/$(ROMNAME).rom: rom0.bin rom1.bin $(ROMDISKFILES) $(OUTDIR)/$(ROMNAME).sys diskdefs
 	cp $(SRC)blank$(ROMSIZE)KB.dat RomDisk.tmp