Fixed bug #615

Scott McCreary 2008-08-21 10:48:14 PDT This patch adds support for Haiku. http://ports.haiku-files.org/browser/haikuports/trunk/media-libs/libsdl/SDL-1.2.13-haiku.diff Haiku is an open-source recreation of BeOS. It has better POSIX compliance than beOS did, and other improved features, which in some cases causes us to have to "undo" previous BeOS workarounds. Here's our port log entry for it, showing the steps to force the changes into configure and Makefile: http://ports.haiku-files.org/wiki/media-libs/libsdl/1.2.13/1 Note that this was only tried on 1.2.13 stable so far. Haiku is using a newer config.guess / config.sub that doesn't yet seem to be in the released libtool, so we are having to copy it in for now. http://haiku-files.org/files/optional-packages/
libsdl-org · Sep 21, 2009 · 0842fde · 0842fde
1 parent 0bf9b81
commit 0842fde
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/configure.in b/configure.in
@@ -2542,7 +2542,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
         SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
         SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
         ;;
-    *-*-beos*)
+    *-*-beos* | *-*-haiku*)
         ARCH=beos
         ac_default_prefix=/boot/develop/tools/gnupro
         CheckDummyVideo

diff --git a/include/SDL_platform.h b/include/SDL_platform.h
@@ -33,6 +33,10 @@
 #undef __BEOS__
 #define __BEOS__	1
 #endif
+#if defined(__HAIKU__)
+#undef __HAIKU__
+#define __HAIKU__	1
+#endif
 #if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
 #undef __BSDI__
 #define __BSDI__	1

diff --git a/include/begin_code.h b/include/begin_code.h
@@ -33,7 +33,7 @@
 
 /* Some compilers use a special export keyword */
 #ifndef DECLSPEC
-# if defined(__BEOS__)
+# if defined(__BEOS__) || defined(__HAIKU__)
 #  if defined(__GNUC__)
 #   define DECLSPEC	__declspec(dllexport)
 #  else

diff --git a/test/automated/platform/platform.c b/test/automated/platform/platform.c
@@ -139,14 +139,16 @@ const char *platform_getPlatform (void)
    return
 #if __AIX__   
       "AIX"
+#elif __HAIKU__
+/* Haiku must appear here before BeOS, since it also defines __BEOS__ */
+      "Haiku"
 #elif __BEOS__
       "BeOS"
 #elif __BSDI__
       "BSDI"
 #elif __DREAMCAST__
       "Dreamcast"
 #elif __FREEBSD__
-
       "FreeBSD"
 #elif __HPUX__ 
       "HP-UX"

diff --git a/test/configure.in b/test/configure.in
@@ -20,7 +20,7 @@ case "$host" in
         MATHLIB=""
         SYS_GL_LIBS="-lopengl32"
         ;;
-    *-*-beos*)
+    *-*-beos* | *-*-haiku*)
         EXE=""
         MATHLIB=""
         SYS_GL_LIBS="-lGL"

diff --git a/test/testplatform.c b/test/testplatform.c
@@ -160,6 +160,9 @@ main(int argc, char *argv[])
         printf("This system is running %s\n",
 #if __AIX__
                "AIX"
+#elif __HAIKU__
+/* Haiku must appear here before BeOS, since it also defines __BEOS__ */
+               "Haiku"
 #elif __BEOS__
                "BeOS"
 #elif __BSDI__