some lite changes and updates

6 files changed, 11 insertions, 4 deletions

diff --git a/appl/mkfile b/appl/mkfile
index dcf7f56..9a30387 100644
--- a/appl/mkfile
+++ b/appl/mkfile
@@ -2,7 +2,7 @@
 
 DIRS=\
 	acme\
-#	alphabet\
+	alphabet\
 	charon\
 	cmd\
 	collab\
diff --git a/bld-lin.sh b/bld-lin.sh
index 3bc0605..d904cf3 100755
--- a/bld-lin.sh
+++ b/bld-lin.sh
@@ -4,6 +4,8 @@ export ROOT=$PWD
 
 export PATH=$PWD/Linux/386/bin:$PATH
 
+unzip -n dis_folders.zip
+
 #mk mkdirs
 
 mk install
diff --git a/bld.sh b/bld.sh
index 8dab3a1..5b6c83e 100755
--- a/bld.sh
+++ b/bld.sh
@@ -13,5 +13,8 @@ export ROOT=$PWD
 
 ln -s $ANDR_TOOLCHAIN ./ndk_toolchain
 
+unzip -n dis_folders.zip
+
 mk install
 
+ln -s $PWD/Android/arm/lib/emu.a Android/arm/lib/libemu.a
diff --git a/emu/Android/amain.c b/emu/Android/amain.c
index e3cc930..46f5ebf 100644
--- a/emu/Android/amain.c
+++ b/emu/Android/amain.c
@@ -28,8 +28,8 @@ extern	int	mflag;
 	int vflag = 0;
 	Procs	procs;
 	char	*eve;
-	extern int	Xsize; // = 640; //	= 640;
-	extern int	Ysize; // = 480; //	= 480;
+extern	int	Xsize; // = 640; //	= 640;
+extern	int	Ysize; // = 480; //	= 480;
 	int	bflag = 1;
 	int	sflag = 0;
 	int	qflag = 0;
diff --git a/emu/Android/emu b/emu/Android/emu
index c2e01f2..036b98b 100644
--- a/emu/Android/emu
+++ b/emu/Android/emu
@@ -14,7 +14,7 @@ dev
 	cmd	cmd
 	indir
 
-	draw	win-andr
+	draw	win-$WINDOW_BACKEND
 	pointer
 
 	ip	ipif6-posix ipaux
diff --git a/mkconfig b/mkconfig
index 623033c..4538394 100644
--- a/mkconfig
+++ b/mkconfig
@@ -11,6 +11,8 @@ ROOT=$ROOT
 #
 TKSTYLE=std
 
+WINDOW_BACKEND=andr		# andr, clutter
+
 #
 #	Except for building kernels, SYSTARG must always be the same as SYSHOST
 #