irrLicht 1.6 has RTTI off on Linux, causing crashes when using dynamic_cast. RTTI (with irrlicht classes) is now only used when explicitely requested (which the Xcode project does since RTTI is on on OS X)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4104 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
c49d14a229
commit
7e2461ab80
@ -207,21 +207,21 @@ namespace GUIEngine
|
||||
*/
|
||||
template<typename T> T* getIrrlichtElement()
|
||||
{
|
||||
#if defined(WIN32) || defined(NDEBUG)
|
||||
return static_cast<T*>(m_element);
|
||||
#else
|
||||
#if HAVE_RTT
|
||||
T* out = dynamic_cast<T*>(m_element);
|
||||
return out;
|
||||
#else
|
||||
return static_cast<T*>(m_element);
|
||||
#endif
|
||||
}
|
||||
|
||||
template<typename T> const T* getIrrlichtElement() const
|
||||
{
|
||||
#if defined(WIN32) || defined(NDEBUG)
|
||||
return static_cast<T*>(m_element);
|
||||
#else
|
||||
#if HAVE_RTT
|
||||
T* out = dynamic_cast<T*>(m_element);
|
||||
return out;
|
||||
#else
|
||||
return static_cast<T*>(m_element);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
HEADER_SEARCH_PATHS = /usr/local/include /usr/include /usr/local/include/irrlicht/ $(PROJECT_DIR)/../../ $(PROJECT_DIR)/../../bullet/src $(PROJECT_DIR)/../../enet/include
|
||||
|
||||
OTHER_CFLAGS = -Wall -DHAVE_OGGVORBIS=1 -DHAS_SOCKLEN_T -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAS_POLL=1 -DHAS_FCNTL=1 -DHAS_INET_PTON=1 -DHAS_INET_NTOP=1 -DHAS_MSGHDR_FLAGS=1 -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_GLUT=1 -DHAVE_IRRLICHT=1 -DPACKAGE="\"supertuxkart\"" -D__MACOSX__=1
|
||||
OTHER_CFLAGS = -Wall -DHAVE_OGGVORBIS=1 -DHAS_SOCKLEN_T -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAS_POLL=1 -DHAS_FCNTL=1 -DHAS_INET_PTON=1 -DHAS_INET_NTOP=1 -DHAS_MSGHDR_FLAGS=1 -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_GLUT=1 -DHAVE_IRRLICHT=1 -DPACKAGE="\"supertuxkart\"" -D__MACOSX__=1 -DHAVE_RTT=1
|
||||
|
||||
OTHER_LDFLAGS = -lirrlicht
|
||||
LIBRARY_SEARCH_PATHS = /usr/local/lib /usr/lib
|
||||
|
Loading…
Reference in New Issue
Block a user