From: Jonathan Campbell <jonathan@castus.tv>
Date: Fri, 25 Mar 2016 04:55:10 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=b2c7a4b0c99f595a79affd7151bf3c717d67ba1a;hp=663e52d5641538fc75ccdad3ba2529a27e8e0ff8;p=16.git

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

diff --git a/src/lib/doslib b/src/lib/doslib
index b0b3b3b9..2d22f799 160000
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit b0b3b3b92ce607d19406df72c5c38cf83b4e03a6
+Subproject commit 2d22f799c750ae31c83729a00ef9e5b83ba95a61
diff --git a/src/tesuto.c b/src/tesuto.c
index 636e8228..903dd6af 100755
--- a/src/tesuto.c
+++ b/src/tesuto.c
@@ -1,7 +1,7 @@
 #include <hw/cpu/cpu.h>
 #include <hw/dos/dos.h>
 #include <hw/vga/vga.h>
-//#include <hw/vga/vrl.h>
+#include <hw/vga/vrl.h>
 
 #include "src/tesuto.h"
 
diff --git a/y.sh b/y.sh
index 19ed62f3..40b4278d 100755
--- a/y.sh
+++ b/y.sh
@@ -1,7 +1,16 @@
+#!/bin/bash
+
+# run this from the top dir of the project
+topdir=`pwd`
+
+# force rebuild of the project
 wmake clean
-cd src/lib/doslib
+# force rebuild of doslib, make sure the latest is checked out from master
+cd "$topdir/src/lib/doslib" || exit 1
 git pull
 git checkout master
 git pull
-. ./buildall.sh clean
-. ./wbuild.sh
+./buildall.sh clean
+# back to top dir, build project again
+cd "$topdir" || exit 1
+./wbuild.sh