Fixed for windows builds
Fixed for windows builds
Switched to CMake build system