mirror of
https://gitlab.com/shinovon/re3-symbian.git
synced 2026-05-23 01:57:21 +03:00
Changes were made to allow compilation in Carbide C++ 2.7 and the Nokia S60v5 SDK. Important code from the OpenGL ES 1.1 backend was commented out since it prevented compilation
This commit is contained in:
parent
558f1b9f32
commit
33a8324d08
48 changed files with 486 additions and 295 deletions
19
vendor/librw/src/rwbase.h
vendored
19
vendor/librw/src/rwbase.h
vendored
|
|
@ -11,6 +11,9 @@
|
|||
#ifdef __SYMBIAN32__
|
||||
#undef stderr
|
||||
#define stderr stdout
|
||||
#ifdef S60V5
|
||||
#define OFFSET_OF(type, member) ((size_t)&(((type*)0)->member))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// TODO: clean up the opengl defines
|
||||
|
|
@ -112,16 +115,14 @@ struct LLLink
|
|||
}
|
||||
};
|
||||
|
||||
#ifndef RW_GL3
|
||||
#ifdef __offsetof
|
||||
#undef __offsetof
|
||||
#endif
|
||||
#define __offsetof(type, field) (reinterpret_cast <size_t> \
|
||||
(&reinterpret_cast <const volatile char &> \
|
||||
(static_cast<type *> (0)->field)))
|
||||
#endif
|
||||
#define LLLinkGetData(linkvar,type,entry) \
|
||||
|
||||
#ifdef S60V5
|
||||
#define LLLinkGetData(linkvar,type,entry) \
|
||||
((type*)((char*)(linkvar) - (size_t)&(((type*)0)->entry)))
|
||||
#else
|
||||
#define LLLinkGetData(linkvar,type,entry) \
|
||||
((type*)(((rw::uint8*)(linkvar))-offsetof(type,entry)))
|
||||
#endif
|
||||
|
||||
// Have to be careful since the link might be deleted.
|
||||
#define FORLIST(_link, _list) \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue