Fixed compiling errors that occured after architecture change for winterGL
Merge branch 'NHTV'