fixed relative paths
fixed merge conflicts
use CMAKE_MAKE_PROGRAM instead of MAKE, which solves the nmake issue on windows