Combined Makefiles into single cross-platform version