Makefile, build.cmd: updated to upstream, supporting WinXP (again)