Compiles on windows, sort of
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram