Compare commits
2 Commits
stable-3.2
...
main
Author | SHA1 | Date |
---|---|---|
Ryan C. Gordon | 9266e773d3 | |
Ryan C. Gordon | fdd38a3f8a |
|
@ -9,7 +9,7 @@
|
||||||
# compile, using preprocessor checks for platform-specific bits instead of
|
# compile, using preprocessor checks for platform-specific bits instead of
|
||||||
# testing in here.
|
# testing in here.
|
||||||
|
|
||||||
set(PHYSFS_VERSION 3.1.0)
|
set(PHYSFS_VERSION 3.3.0)
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.0)
|
cmake_minimum_required(VERSION 3.0)
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# wmake -f Makefile.os2
|
# wmake -f Makefile.os2
|
||||||
|
|
||||||
LIBNAME = physfs
|
LIBNAME = physfs
|
||||||
VERSION = 3.1.0
|
VERSION = 3.3.0
|
||||||
|
|
||||||
LIBFILE = $(LIBNAME).lib
|
LIBFILE = $(LIBNAME).lib
|
||||||
DLLFILE = $(LIBNAME).dll
|
DLLFILE = $(LIBNAME).dll
|
||||||
|
|
|
@ -435,7 +435,7 @@ typedef struct PHYSFS_Version
|
||||||
|
|
||||||
#ifndef DOXYGEN_SHOULD_IGNORE_THIS
|
#ifndef DOXYGEN_SHOULD_IGNORE_THIS
|
||||||
#define PHYSFS_VER_MAJOR 3
|
#define PHYSFS_VER_MAJOR 3
|
||||||
#define PHYSFS_VER_MINOR 1
|
#define PHYSFS_VER_MINOR 3
|
||||||
#define PHYSFS_VER_PATCH 0
|
#define PHYSFS_VER_PATCH 0
|
||||||
#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
|
#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
|
||||||
|
|
||||||
|
|
|
@ -261,12 +261,6 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0)
|
||||||
if (sysctl(mib, 4, fullpath, &buflen, NULL, 0) != -1)
|
if (sysctl(mib, 4, fullpath, &buflen, NULL, 0) != -1)
|
||||||
retval = __PHYSFS_strdup(fullpath);
|
retval = __PHYSFS_strdup(fullpath);
|
||||||
}
|
}
|
||||||
#elif defined(PHYSFS_PLATFORM_SOLARIS)
|
|
||||||
{
|
|
||||||
const char *path = getexecname();
|
|
||||||
if ((path != NULL) && (path[0] == '/')) /* must be absolute path... */
|
|
||||||
retval = __PHYSFS_strdup(path);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* If there's a Linux-like /proc filesystem, you can get the full path to
|
/* If there's a Linux-like /proc filesystem, you can get the full path to
|
||||||
|
@ -278,6 +272,7 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0)
|
||||||
retval = readSymLink("/proc/self/exe");
|
retval = readSymLink("/proc/self/exe");
|
||||||
if (!retval) retval = readSymLink("/proc/curproc/file");
|
if (!retval) retval = readSymLink("/proc/curproc/file");
|
||||||
if (!retval) retval = readSymLink("/proc/curproc/exe");
|
if (!retval) retval = readSymLink("/proc/curproc/exe");
|
||||||
|
if (!retval) retval = readSymLink("/proc/self/path/a.out");
|
||||||
if (retval == NULL)
|
if (retval == NULL)
|
||||||
{
|
{
|
||||||
/* older kernels don't have /proc/self ... try PID version... */
|
/* older kernels don't have /proc/self ... try PID version... */
|
||||||
|
@ -289,6 +284,15 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0)
|
||||||
} /* if */
|
} /* if */
|
||||||
} /* if */
|
} /* if */
|
||||||
|
|
||||||
|
#if defined(PHYSFS_PLATFORM_SOLARIS)
|
||||||
|
if (!retval) /* try getexecname() if /proc didn't pan out. This may not be an absolute path! */
|
||||||
|
{
|
||||||
|
const char *path = getexecname();
|
||||||
|
if ((path != NULL) && (path[0] == '/')) /* must be absolute path... */
|
||||||
|
retval = __PHYSFS_strdup(path);
|
||||||
|
} /* if */
|
||||||
|
#endif
|
||||||
|
|
||||||
if (retval != NULL) /* chop off filename. */
|
if (retval != NULL) /* chop off filename. */
|
||||||
{
|
{
|
||||||
char *ptr = strrchr(retval, '/');
|
char *ptr = strrchr(retval, '/');
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include "physfs.h"
|
#include "physfs.h"
|
||||||
|
|
||||||
#define TEST_VERSION_MAJOR 3
|
#define TEST_VERSION_MAJOR 3
|
||||||
#define TEST_VERSION_MINOR 1
|
#define TEST_VERSION_MINOR 3
|
||||||
#define TEST_VERSION_PATCH 0
|
#define TEST_VERSION_PATCH 0
|
||||||
|
|
||||||
static FILE *history_file = NULL;
|
static FILE *history_file = NULL;
|
||||||
|
|
Loading…
Reference in New Issue