intergrate master changes; change makefile to build under new tdm-gcc 64bit toolchain.