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

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

d71e4ebbd3770b48eee2b2cc18288b97aad4e1e4
diff --combined makefile
index d77bf7c0,3de9313e..af0fa557
--- a/makefile
+++ b/makefile
@@@ -71,7 -71,6 +71,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)
@@@ -96,8 -95,8 +96,8 @@@ all: $(EXEC)  joytest.ex
  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
  
- bakapi.exe: bakapi.$(OBJ) gfx.lib# modex.lib
- 	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib -fm=bakapi.map
+ bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS)
+ 	wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) -fm=bakapi.map
  #modex.lib
  #
  #Test Executables!