osd: Only compile gpu libraries if GL or GLES is found
Merge branch 'assert_fix'
Merge branch 'gitignore'
Merge branch 'vs2012_warnings_static_object'
Merge branch 'vs2012_warnings_vc_headers'

Conflicts:
	CMakeLists.txt
Merge branch 'vs2012_warnings'