Split out Mac OS X code from unix.c and added some Carbon-specific co…

…de... moved some stuff around and implemented a few things in BeOS and POSIX bits to accomodate this.
icculus · Mar 21, 2007 · 075e676 · 075e676
1 parent 03fe5bb
commit 075e676
Show file tree

Hide file tree

Showing 6 changed files with 448 additions and 271 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -117,6 +117,7 @@ SET(PHYSFS_SRCS
     platform/pocketpc.c
     platform/posix.c
     platform/unix.c
+    platform/macosx.c
     platform/windows.c
     archivers/dir.c
     archivers/grp.c

diff --git a/physfs_platforms.h b/physfs_platforms.h
@@ -23,7 +23,6 @@
 #  define PHYSFS_PLATFORM_OS2
 #elif ((defined __MACH__) && (defined __APPLE__))
 #  define PHYSFS_PLATFORM_MACOSX
-#  define PHYSFS_PLATFORM_UNIX
 #  define PHYSFS_PLATFORM_POSIX
 #elif defined(macintosh)
 #  error Classic Mac OS support was dropped from PhysicsFS 2.0. Move to OS X.

diff --git a/platform/beos.cpp b/platform/beos.cpp
@@ -30,9 +30,6 @@
 #include "physfs_internal.h"
 
 
-const char *__PHYSFS_platformDirSeparator = "/";
-
-
 int __PHYSFS_platformInit(void)
 {
     return(1);  /* always succeed. */
@@ -158,7 +155,7 @@ static team_id getTeamID(void)
     thread_id tid = find_thread(NULL);
     get_thread_info(tid, &info);
     return(info.team);
-} /* getMyTeamID */
+} /* getTeamID */
 
 
 char *__PHYSFS_platformCalcBaseDir(const char *argv0)
@@ -201,6 +198,12 @@ char *__PHYSFS_platformRealPath(const char *path)
 } /* __PHYSFS_platformRealPath */
 
 
+char *__PHYSFS_platformCurrentDir(void)
+{
+    return(__PHYSFS_platformRealPath("."));  /* let BPath sort it out. */
+} /* __PHYSFS_platformCurrentDir */
+
+
 /* !!! FIXME: semaphores are not mutexes... */
 void *__PHYSFS_platformCreateMutex(void)
 {