Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
FreeBSD patches; appears to be fully functional now.
  • Loading branch information
icculus committed Jul 17, 2002
1 parent 74a9c06 commit c02838a
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 8 deletions.
20 changes: 18 additions & 2 deletions configure.in
Expand Up @@ -226,6 +226,17 @@ if test x$we_have_sed = xyes; then
AC_MSG_RESULT([$this_is_macosx])
fi

this_is_freebsd=no
if test x$we_have_sed = xyes; then
AC_MSG_CHECKING([if this is FreeBSD])
x=`echo $build_os |tr A-Z a-z |sed "s/.*freebsd.*/freebsd/"`
if test x$x = xfreebsd; then
this_is_freebsd=yes
fi

AC_MSG_RESULT([$this_is_freebsd])
fi

# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h string.h])
Expand All @@ -242,15 +253,20 @@ dnl AC_TYPE_SIZE_T
AC_FUNC_MEMCMP
AC_CHECK_FUNCS([memset strrchr])

CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"
LDFLAGS="$LDFLAGS -no-undefined"

if test x$this_is_freebsd = x$yes; then
LDFLAGS="$LDFLAGS -pthread"
fi

dnl Add Makefile conditionals
AM_CONDITIONAL(BUILD_ZLIB, test x$enable_internal_zlib = xyes)
AM_CONDITIONAL(BUILD_TEST_PHYSFS, test x$enable_testprog = xyes)
AM_CONDITIONAL(BUILD_MACOSX, test x$this_is_macosx = xyes)
AM_CONDITIONAL(BUILD_BEOS, test x$this_is_beos = xyes)
AM_CONDITIONAL(BUILD_CYGWIN, test x$this_is_cygwin = xyes)

LDFLAGS="$LDFLAGS -no-undefined"

AC_OUTPUT([
Makefile
archivers/Makefile
Expand Down
18 changes: 12 additions & 6 deletions platform/unix.c
Expand Up @@ -13,9 +13,15 @@
/* BeOS uses beos.cpp and posix.c ... Cygwin and such use win32.c ... */
#if ((!defined __BEOS__) && (!defined WIN32))

#ifdef __FreeBSD__
# if (!defined __BSD__)
# define __BSD__
# endif
#endif

#if ((defined __APPLE__) && (defined __MACH__))
# if (!defined __DARWIN__)
# define __DARWIN__
# if (!defined __BSD__)
# define __BSD__
# endif
#endif

Expand All @@ -33,10 +39,10 @@
#include <time.h>
#include <errno.h>

#if (!defined __DARWIN__)
#include <mntent.h>
#else
#if (defined __BSD__)
#include <sys/ucred.h>
#else
#include <mntent.h>
#endif

#include <sys/mount.h>
Expand All @@ -62,7 +68,7 @@ int __PHYSFS_platformDeinit(void)



#if (defined __DARWIN__)
#if (defined __BSD__)

char **__PHYSFS_platformDetectAvailableCDs(void)
{
Expand Down

0 comments on commit c02838a

Please sign in to comment.