simplify compilation
Merge branch 'master' of https://github.com/tux3/qTox
Merge pull request #277 from dubslow/master

simplify compilation