Changed some build settings
Merge branch 'dev'
Error checking for opengl