Fixes for OSX build. Add support for Magick++ to Windows build.