Merge remote-tracking branch 'upstream/master'

diff --git a/src/lib/doslib b/src/lib/doslib
index b0b3b3b92ce607d19406df72c5c38cf83b4e03a6..2d22f799c750ae31c83729a00ef9e5b83ba95a61 160000 (submodule)
--- 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 636e822814ec6f2575111282e2cb07ed8996275c..903dd6af1ce2510108752a1da27e54600d699b43 100755 (executable)
--- 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 19ed62f34e0b33c64bbd500753b415c2ce304c9e..40b4278d88b338aef52413adb96a24c8d9210bce 100755 (executable)
--- 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