[Bleeding] Ogre3D 1.6.0 RC1 compatibility

I tried to compile NxOgre 1.0-21 with Ogre3D 1.6.0 RC1.

Of course it didn't compile.

http://www.ogre3d.org/wiki/index.php/ShoggothNotes

Header changes
OgreMemoryMacros.h and OgreNoMemoryMacros.h no longer exist, you should delete any reference you have to them

I commented out references to those 2 files from NxOgre files:

NxOgre\include\NxOgreUserAllocator.h
lines 34 and 92.

NxOgre\include\NxOgreStable.h
lines 55 and 62.

Now NxOgre compiles. And my application which uses that copy of NxOgre runs (but uses only little of the NxOgre).

Does that change break something or is it safe to do?


Are there other things which should be changed before NxOgre 1.0-21 and Ogre3D 1.6.0 RC1 can be used together?

No, that should be it.

Thanks for the quick reply.

No problem. I added some of your changes to NxOgre, the allocator is different in '22 and it doesn't use the Ogre Memory Macros but Stable.h still does.

i'm using ogre 1.6rc1 and nxogre '21, working perfect
i just commented out the #include problem of the allocator