JOHNE - Add my changes for building the gdk branch on Windows (note that most of my changes are already incorporated into the official code)