Added canvas-draw build to makefile and tweaked canvas-draw.setup to allow building on Windows