More BeOS wankery.

icculus · Dec 13, 2006 · e386bf5 · e386bf5
1 parent 1bbbba1
commit e386bf5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,8 +37,9 @@ IF(MACOSX)
     SET(OPTIONAL_LIBS ${OPTIONAL_LIBS} "-framework Carbon")
 ENDIF(MACOSX)
 
-# !!! FIXME: Workaround for lua issue...fix this better.
 IF(BEOS)
+    ADD_DEFINITIONS(-DPLATFORM_BEOS=1)
+    # !!! FIXME: Workaround for lua issue...fix this better.
     ADD_DEFINITIONS(-D_setjmp=setjmp)
     ADD_DEFINITIONS(-D_longjmp=longjmp)
 ENDIF(BEOS)

diff --git a/fileio.c b/fileio.c
@@ -4,7 +4,7 @@
 #include "fileio.h"
 #include "platform.h"
 
-#ifdef __BEOS__   // !!! FIXME
+#if PLATFORM_BEOS  // !!! FIXME
 #define realpath(x,y) NULL
 #endif
 

diff --git a/platform.h b/platform.h
@@ -57,6 +57,8 @@ boolean MojoPlatform_osVersion(char *buf, size_t len);
 #define PLATFORM_NAME "macosx"
 #elif PLATFORM_UNIX
 #define PLATFORM_NAME "unix"
+#elif PLATFORM_BEOS
+#define PLATFORM_NAME "beos"
 #else
 #error Unknown platform.
 #endif

diff --git a/platform/unix.c b/platform/unix.c
@@ -11,14 +11,29 @@
 #include <time.h>
 #include <unistd.h>
 
-#if !__BEOS__
+#if !PLATFORM_BEOS
 #include <dlfcn.h>
-#else
-#include <be/kernel/image.h>
+#endif
+
+#include "../platform.h"
+
+
+#if PLATFORM_BEOS
+// BeOS headers conflict badly with MojoSetup, so just chisel in the things
+//  we specifically need...
+typedef int32 image_id;
+typedef int32 status_t;
+extern __declspec(dllimport) image_id load_add_on(const char *path);
+extern __declspec(dllimport) status_t unload_add_on(image_id imid);
+extern __declspec(dllimport) status_t get_image_symbol(image_id imid,
+                                const char *name, int32 sclass, void **ptr);
 
 static void *beos_dlopen(const char *fname)
 {
-    return (void *) load_add_on(fname);
+    const image_id lib = load_add_on(fname);
+    if (lib < 0)
+        return NULL;
+    return (void *) lib;
 } // beos_dlopen
 
 static void *beos_dlsym(void *lib, const char *sym)
@@ -37,10 +52,9 @@ static void beos_dlclose(void *lib)
 #define dlopen(fname) beos_dlopen(fname)
 #define dlsym(lib, sym) beos_dlsym(lib, sym)
 #define dlclose(lib) beos_dlclose(lib)
-#endif  // __BEOS__
+#endif  // PLATFORM_BEOS
 
 
-#include "../platform.h"
 
 static struct timeval startup_time;
 
@@ -158,6 +172,8 @@ boolean MojoPlatform_osType(char *buf, size_t len)
 {
 #if PLATFORM_MACOSX
     xstrncpy(buf, "macosx", len);
+#elif PLATFORM_BEOS
+    xstrncpy(buf, "beos", len);   // !!! FIXME: zeta? haiku?
 #elif defined(linux) || defined(__linux) || defined(__linux__)
     xstrncpy(buf, "linux", len);
 #elif defined(__FreeBSD__) || defined(__DragonFly__)

diff --git a/universal.h b/universal.h
@@ -163,7 +163,7 @@ extern MojoSetupEntryPoints GEntryPoints;
 
 
 #ifndef DOXYGEN_SHOULD_IGNORE_THIS
-#if ((defined _MSC_VER) || (__BEOS__))
+#if ((defined _MSC_VER) || (PLATFORM_BEOS))
 #define __EXPORT__ __declspec(dllexport)
 #elif (__GNUC__ >= 3)
 #define __EXPORT__ __attribute__((visibility("default")))