Merge pull request #2081 from hathach/more-build-system

More build system