Updated VS project and GNU makefiles with changes.