sdk/Build System: Solved the $(CPP) space issues