some fixes for OSXglutil
Merge branch 'master' of https://github.com/wangyanxing/Demi3D

Conflicts:
	src/demi/drvGL/GLDriver.cpp