From: Jonathan Campbell <jonathan@castus.tv>
Date: Mon, 28 Mar 2016 22:33:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=4df04665672df77e5f3101db8dda37725a219655

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

4df04665672df77e5f3101db8dda37725a219655
diff --cc makefile
index cf5e2cbe,778d1a10..c156f741
--- a/makefile
+++ b/makefile
@@@ -75,9 -71,8 +71,9 @@@ 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)
+ #DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
  VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
  DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
  16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)