Updating cmake file
Updating win32 build files