From: Jonathan Campbell <jonathan@castus.tv>
Date: Thu, 21 Apr 2016 14:27:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=afebb0aa9e93ca48e0955877d5cbd883e650d35f;hp=-c;p=16.git

Merge remote-tracking branch 'upstream/master'
---

afebb0aa9e93ca48e0955877d5cbd883e650d35f
diff --combined .gitignore
index aa3c9906,a713a397..61aa5c76
--- a/.gitignore
+++ b/.gitignore
@@@ -17,8 -17,8 +17,8 @@@ makefile
  README~
  TODO~
  LICENCE~
- *.map
- #*.MAP
+ *.mah
+ *.MAH
  !modex.lib
  img
  !.git/config
@@@ -27,8 -27,4 +27,8 @@@
  #!foo.html
  # Ignore objects and archives.
  *.[oa]
 -
 +cute.vrl
 +cute.pal
 +dl_vga.lib
 +dl_cpu.lib
 +dl_dos.lib
diff --combined makefile
index 57a260fb,2fe7425d..ee23f2f2
--- a/makefile
+++ b/makefile
@@@ -73,7 -73,6 +73,7 @@@ CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -w
  OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
  FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
  
 +PCX2VRL=$(DOSLIBDIR)/hw/vga/pcx2vrl
  
  #DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
  VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
@@@ -82,7 -81,8 +82,8 @@@ DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 82
  
  GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) $(DOSLIBLIBS)
  
- DOSLIBLIBS=$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vgatty.lib
+ DOSLIBLIBS=$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib
+ #$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vgatty.lib
  
  TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe
  # tsthimem.exe
@@@ -96,23 -96,23 +97,23 @@@ all: $(EXEC) joytest.exe vr
  #game and bakapi executables
  #
  16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
- 	wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=16.map
+ 	wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=16.mah
  
  bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS)
- 	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) -fm=bakapi.map
+ 	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) -fm=bakapi.mah
  #modex.lib
  #
  #Test Executables!
  #
  scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
- 	wcl $(FLAGS) scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=scroll.map
+ 	wcl $(FLAGS) scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=scroll.mah
  scroll.$(OBJ): $(SRC)scroll.c
  	wcl $(FLAGS) -c $(SRC)scroll.c
  
  
  # NOTE: dos86h = 16-bit huge memory model. memory model must match!
  tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
- #	%write tmp.cmd option quiet option map=tesuto.map $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe
+ #	%write tmp.cmd option quiet option map=tesuto.mah $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe
  #	%write tmp.cmd library $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib
  #	%write tmp.cmd library $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib
  #	@wlink @tmp.cmd
@@@ -121,22 -121,22 +122,22 @@@ tesuto.$(OBJ): $(SRC)tesuto.
  	wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
  
  test.exe: test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ)
- 	wcl $(FLAGS) test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) -fm=test.map
+ 	wcl $(FLAGS) test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) -fm=test.mah
  
  test2.exe: test2.$(OBJ) gfx.lib
- 	wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.map
+ 	wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.mah
  
  fonttest.exe: fonttest.$(OBJ) $(16LIBOBJS) gfx.lib
- 	wcl $(FLAGS) fonttest.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fonttest.map
+ 	wcl $(FLAGS) fonttest.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fonttest.mah
  
  #fonttes0.exe: fonttes0.$(OBJ) $(16LIBOBJS)
  #	wcl $(FLAGS) fonttes0.$(OBJ) $(16LIBOBJS)
  
  fontgfx.exe: fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib $(DOSLIBLIBS)
- 	wcl $(FLAGS) fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib $(DOSLIBLIBS) -fm=fontgfx.map
+ 	wcl $(FLAGS) fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib $(DOSLIBLIBS) -fm=fontgfx.mah
  
  inputest.exe: inputest.$(OBJ) $(16LIBOBJS)
- 	wcl $(FLAGS) inputest.$(OBJ) $(16LIBOBJS) -fm=inputest.map
+ 	wcl $(FLAGS) inputest.$(OBJ) $(16LIBOBJS) -fm=inputest.mah
  
  #sountest.exe: sountest.$(OBJ) $(16LIBOBJS)
  #	wcl $(FLAGS) sountest.$(OBJ) $(16LIBOBJS)
@@@ -145,7 -145,7 +146,7 @@@
  #	wcl $(FLAGS) miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ)
  
  tsthimem.exe: tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
- 	wcl $(FLAGS) tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) -fm=tsthimem.map
+ 	wcl $(FLAGS) tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) -fm=tsthimem.mah
  
  #testemm.exe: testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
  #	wcl $(FLAGS) testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
@@@ -154,22 -154,22 +155,22 @@@
  #	wcl $(FLAGS) testemm0.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ)
  
  pcxtest.exe: pcxtest.$(OBJ) gfx.lib
- 	wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.map
+ 	wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.mah
  
  palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIBOBJS)
- 	wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.map #$(16LIBOBJS)
+ 	wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.mah #$(16LIBOBJS)
  
  palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIBOBJS)
- 	wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.map #$(16LIBOBJS)
+ 	wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.mah #$(16LIBOBJS)
  
  pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
- 	wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map
+ 	wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.mah
  
  planrpcx.exe: planrpcx.$(OBJ) gfx.lib
- 	wcl $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.map
+ 	wcl $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.mah
  
  maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib
- 	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=maptest.map
+ 	wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=maptest.mah
  
  #maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)
  #	wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)
@@@ -181,14 -181,14 +182,14 @@@
  #	wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
  
  fmemtest.exe: fmemtest.$(OBJ) $(16LIBOBJS)
- 	wcl $(FLAGS) fmemtest.$(OBJ) $(16LIBOBJS) -fm=fmemtest.map
+ 	wcl $(FLAGS) fmemtest.$(OBJ) $(16LIBOBJS) -fm=fmemtest.mah
  
  exmmtest.exe: exmmtest.$(OBJ) $(16LIBOBJS)
- 	wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.map $(16LIBOBJS)
+ 	wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.mah $(16LIBOBJS)
  
  vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIBOBJS)
- 	wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map $(16LIBOBJS)
- 	#====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.map
+ 	wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.mah $(16LIBOBJS)
+ 	#====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.mah
  
  
  #
@@@ -435,8 -435,8 +436,8 @@@ clean: .symboli
  #	@$(REMOVECOMMAND) *.smp
  	@$(REMOVECOMMAND) *.SMP
  	@$(REMOVECOMMAND) *.hed
- 	@$(REMOVECOMMAND) *.MAP
- 	@$(REMOVECOMMAND) *.map
+ 	@$(REMOVECOMMAND) *.MAH
+ 	@$(REMOVECOMMAND) *.mah
  	@$(REMOVECOMMAND) *.err
  	#@cd $(DOSLIB)
  	#@./buildall.sh clean
@@@ -497,6 -497,7 +498,7 @@@ reinitlibs: .symboli
  	@wmake -h initlibs
  
  initlibs: .symbolic
+ 	@cp git_con.fig .git/config
  	@cp git_modu.les .gitmodules
  	@cd $(SRCLIB)
  	@git clone https://github.com/joncampbell123/doslib.git