Merge remote-tracking branch 'upstream/master'

diff --git a/.gitignore b/.gitignore
index 7345f26390b9862ed40acb935c2c290b35350814..aa3c9906a6f90b711312ea0625ce7f37d24dbe18 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,8 @@ img
 #!foo.html\r
 # Ignore objects and archives.\r
 *.[oa]\r
-\r
+cute.vrl\r
+cute.pal\r
+dl_vga.lib\r
+dl_cpu.lib\r
+dl_dos.lib\r

diff --git a/16/doslib b/16/doslib
deleted file mode 160000 (submodule)
index 9756904..0000000
--- a/16/doslib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 975690444b74e8f28ad288412c0b0c754fab2342

diff --git a/cutetest.bat b/cutetest.bat
new file mode 100644 (file)
index 0000000..efaf91d
--- /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 9c560e3025b45c8ffb8733f1dd3c0dffd6cbf06b..265a082eb4b294a4f49a46400f393ed6b8c7031f 100755 (executable)
--- 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 11566929272b9972f22c0f9b3582c9b2a74f4e8b..4eebe67b5e3fe066db2d5c7316d0bb1d9e15c5ce 100755 (executable)
--- 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