Check-in http://www.androwish.org/index.html/info/e80b18b2afd7b25e should now have all your upstream changes, except for TEA since there I didn't want to break undroidwish builds.

I've verified correct build and (partial) run on these platforms:

 - Android (AndroWish)
 - Linux 64 bit (plain Tcl/Tk and SDL rendering)
 - Windows 32 bit (plain Tcl/Tk and SDL rendering)