Updating cmake file
Updating win32 build files
Merge branch 'orignal' into orignal-merge