[tuhopuu-devel] State of the merge

[Kester Maddock]

Hi Matt,

What happens if you add a #define APIENTRY in RAS_GLExtensionManager.h before 
the #include? Or change APIENTRY to GLAPIENTRY?  It's needed for Windows 
IIRC.

I found the first problem (and another in the player) and did a bit of surgery 
to the SConstruct (copied bf-blender's and added the unwrap stuff.)

Kester



On Sunday 06 June 2004 14:49, Matt Ebb wrote:
> On 6 Jun 2004, at 8:33 AM, Chris Want wrote:
> > This merge went relatively smoothly (the -kk option really helps).
> > Each developer should make sure that their work has successfully
> > survived this merge ... I apologize if anybody's work got clobbered!
> >
> > Here are the main issues that might cause problems:
> >
> > scons users: test!
>
> I've had a few wacky game engine problems using scons on OS X. First
> one was easy to solve, in gameengine/Rasterizer/RAS_IPolygonmaterial.h
>
> These lines (at line 65) were duplicated:
>
> 	unsigned int			m_polymatid;
>
> 	static unsigned int		m_newpolymatid;
>
> Deleting these helped it compile.
>
> Now, I'm getting a weird one:
>
> In file included from
> source/gameengine/Rasterizer/RAS_OpenGLRasterizer/
> RAS_GLExtensionManager.h:41,
>                   from
> source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp:57:
> source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ATI_pn_triangles.h:
> 17: error: parse
>     error before `*' token
> source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ATI_pn_triangles.h:
> 18: error: parse
>     error before `*' token
> In file included from
> source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp:57:
> source/gameengine/Rasterizer/RAS_OpenGLRasterizer/
> RAS_GLExtensionManager.h:461: error: syntax
>     error before `;' token
> source/gameengine/Rasterizer/RAS_OpenGLRasterizer/
> RAS_GLExtensionManager.h:462: error: syntax
>     error before `;' token
> scons: ***
> [/Developer/tuhopuu/build/darwin/source/gameengine/BlenderRoutines/
> BL_KetsjiEmbedStart.o] Error 1
>
> I had a peek in those files, and nothing seems particularly weird
> there, and looking back in the CVS history, nothing seemed to have
> changed must during the merge, before which, tuhopuu2 was compiling
> fine. So is this perhaps a problem on my end?
>
> Cheers
>
> Matt