From: Jonathan Campbell <jonathan@castus.tv>
Date: Thu, 24 Mar 2016 12:02:59 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=535f618e80aa6546e61907026b2451e123655a5b;hp=32f3ca86ff5615bdf791bed56e1e3f61bde79392;p=16.git

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

diff --git a/.gitignore b/.gitignore
index 7345f263..aa3c9906 100755
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,8 @@ img
 #!foo.html
 # Ignore objects and archives.
 *.[oa]
-
+cute.vrl
+cute.pal
+dl_vga.lib
+dl_cpu.lib
+dl_dos.lib
diff --git a/16/doslib b/16/doslib
deleted file mode 160000
index 97569044..00000000
--- a/16/doslib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 975690444b74e8f28ad288412c0b0c754fab2342
diff --git a/cutetest.bat b/cutetest.bat
new file mode 100644
index 00000000..efaf91d1
--- /dev/null
+++ b/cutetest.bat
@@ -0,0 +1,3 @@
+@echo off
+tesuto cute.vrl cute.pal
+
diff --git a/git_con.fig b/git_con.fig
index 9c560e30..265a082e 100755
--- a/git_con.fig
+++ b/git_con.fig
@@ -3,21 +3,16 @@
 	filemode = true
 	bare = false
 	logallrefupdates = true
-[remote "x4"]
-	url = ssh://sparky4@4ch.mooo.com:26/var/www/16/16.git
-	fetch = +refs/heads/*:refs/remotes/x4/*
+[remote "origin"]
+	url = https://github.com/joncampbell123/16.git
+	fetch = +refs/heads/*:refs/remotes/origin/*
 [branch "master"]
 	remote = origin
 	merge = refs/heads/master
-[remote "origin"]
-	url = git@github.com:sparky4/16.git
-	fetch = +refs/heads/*:refs/remotes/origin/*
-[remote "sf"]
-	url = ssh://sparky4q@git.code.sf.net/p/project16/code
-	fetch = +refs/heads/*:refs/remotes/sf/*
-[remote "jp"]
-	url = ssh://sparky4@git.pf.osdn.jp:/gitroot/s/sp/sparky4/project16.git
-	fetch = +refs/heads/*:refs/remotes/jp/*
-[remote "bb"]
-	url = git@bitbucket.org:sparky4/16.git
-	fetch = +refs/heads/*:refs/remotes/bb/*
+[remote "upstream"]
+	url = https://github.com/sparky4/16.git
+	fetch = +refs/heads/*:refs/remotes/upstream/*
+[submodule "src/lib/doslib"]
+	url = https://github.com/joncampbell123/doslib.git
+[submodule "src/lib/jsmn"]
+	url = https://github.com/zserge/jsmn.git
diff --git a/makefile b/makefile
index 11566929..4eebe67b 100755
--- a/makefile
+++ b/makefile
@@ -75,6 +75,7 @@ CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo -i$(DOSLIB)##wwww
 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)
@@ -118,7 +119,7 @@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
 #	@wlink @tmp.cmd
 	wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
 tesuto.$(OBJ): $(SRC)tesuto.c
-	wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
+	wcl $(FLAGS) $(DOSLIB_CINCLUDE) $(WCLQ) -c $(SRC)tesuto.c
 #tesuto.exe: tesuto.$(OBJ)
 #	wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
 #tesuto.$(OBJ): $(SRC)tesuto.c