mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 05:40:07 +02:00
53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
diff -up physfs-2.0.1/CMakeLists.txt.orig physfs-2.0.1/CMakeLists.txt
|
|
--- physfs-2.0.1/CMakeLists.txt.orig 2010-04-28 19:12:08.240386048 -0600
|
|
+++ physfs-2.0.1/CMakeLists.txt 2010-04-28 19:12:15.603717632 -0600
|
|
@@ -108,7 +108,9 @@ IF(BEOS)
|
|
# We add this explicitly, since we don't want CMake to think this
|
|
# is a C++ project unless we're on BeOS.
|
|
SET(PHYSFS_BEOS_SRCS platform/beos.cpp)
|
|
- SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} be root)
|
|
+ FIND_LIBRARY(BE_LIBRARY be)
|
|
+ FIND_LIBRARY(ROOT_LIBRARY root)
|
|
+ SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${BE_LIBRARY} ${ROOT_LIBRARY})
|
|
ENDIF(BEOS)
|
|
|
|
# Almost everything is "compiled" here, but things that don't apply to the
|
|
@@ -298,7 +300,8 @@ IF(PHYSFS_BUILD_TEST)
|
|
FIND_PATH(READLINE_H readline/readline.h)
|
|
FIND_PATH(HISTORY_H readline/history.h)
|
|
IF(READLINE_H AND HISTORY_H)
|
|
- SET(CMAKE_REQUIRED_LIBRARIES curses)
|
|
+ FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses)
|
|
+ SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY})
|
|
FIND_LIBRARY(READLINE_LIBRARY readline)
|
|
FIND_LIBRARY(HISTORY_LIBRARY history)
|
|
IF(READLINE_LIBRARY AND HISTORY_LIBRARY)
|
|
diff -up physfs-2.0.1/platform/beos.cpp.orig physfs-2.0.1/platform/beos.cpp
|
|
--- physfs-2.0.1/platform/beos.cpp.orig 2010-05-01 18:11:13.848822272 -0600
|
|
+++ physfs-2.0.1/platform/beos.cpp 2010-05-01 18:11:01.658767872 -0600
|
|
@@ -174,14 +174,17 @@ static team_id getTeamID(void)
|
|
|
|
char *__PHYSFS_platformCalcBaseDir(const char *argv0)
|
|
{
|
|
- /* in case there isn't a BApplication yet, we'll construct a roster. */
|
|
- BRoster roster;
|
|
- app_info info;
|
|
- status_t rc = roster.GetRunningAppInfo(getTeamID(), &info);
|
|
- BAIL_IF_MACRO(rc < B_OK, strerror(rc), NULL);
|
|
- BEntry entry(&(info.ref), true);
|
|
+ image_info info;
|
|
+ int32 cookie = 0;
|
|
+
|
|
+ while (get_next_image_info(0, &cookie, &info) == B_OK) {
|
|
+ if (info.type == B_APP_IMAGE)
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ BEntry entry(info.name, true);
|
|
BPath path;
|
|
- rc = entry.GetPath(&path); /* (path) now has binary's path. */
|
|
+ status_t rc = entry.GetPath(&path); /* (path) now has binary's path. */
|
|
assert(rc == B_OK);
|
|
rc = path.GetParent(&path); /* chop filename, keep directory. */
|
|
assert(rc == B_OK);
|