Added fix for building Thor on Windows with non-standard installation
paths.
New unified paths for both windows and linux.