Ticket #470: cegui-0.7.5.patch

Samples/common/src/CEGuiSample.cpp

@@ -35 +35 @@
 // includes for renderer selector classes
 #if defined( __WIN32__ ) || defined( _WIN32 )
 #   include "Win32CEGuiRendererSelector.h"
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)  || defined(__HAIKU__)
 #   ifdef CEGUI_SAMPLES_USE_GTK2
 #       include "GTK2CEGuiRendererSelector.h"
 #   else

cegui/include/CEGUIDynamicModule.h

@@ -43 +43 @@
     struct HINSTANCE__;
     typedef struct HINSTANCE__* hInstance;
 
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
 #    define DYNLIB_HANDLE void*
 #    define DYNLIB_LOAD( a ) dlopen( a, RTLD_LAZY )
 #    define DYNLIB_GETSYM( a, b ) dlsym( a, b )

cegui/src/CEGUIDynamicModule.cpp

@@ -46 +46 @@
 #   include "macPlugins.h"
 #endif
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__HAIKU__)
 #   include "dlfcn.h"
 #endif
 
@@ -64 +64 @@
                 return;
         } // if(name.empty())
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__)  || defined(__HAIKU__)
     #if defined(CEGUI_HAS_VERSION_SUFFIX) || defined(CEGUI_HAS_BUILD_SUFFIX)
         // check if we are being asked to open a CEGUI .so, if so postfix the
         // name with our package version

cegui/src/CEGUISystem.cpp

@@ -110 +110 @@
     return timeGetTime() / 1000.0;
 }
 
-#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)  || defined(__HAIKU__)
 #include <sys/time.h>
 double SimpleTimer::currentTime()
 {

configure.ac

@@ -60 +60 @@
 # Checks for libraries (skip on mingw32).
 if test x$MINGW32 != xyes; then
     AC_CHECK_LIB([dl], [dlopen])
-    AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([cannot find pthread library]))
+    AC_CHECK_LIB([root], [pthread_create],, AC_MSG_ERROR([cannot find pthread library]))
 fi
 
 CEGUI_CODE_OPTIONS