Ticket #340: netpanzer-0.8.3.patch

netpanzer-0.8.

@@ -241 +241 @@
 else:
     env.ParseConfig(env['sdlconfig'] + ' --cflags --libs')
     env.Append( NPLIBS = [ 'SDL_mixer' ] )
+    env.Append( NPLIBS = [ 'network' ] )
+    env.Append( NPLIBS = [ 'physfs' ] )
 
 # for crossmingw platform
 if 'crossmingw' in COMMAND_LINE_TARGETS:

src/Lib/Network/SocketBase.cpp

@@ -29 +29 @@
 #include "SocketManager.hpp"
 #include "Util/Log.hpp"
 
+#ifndef MSG_NOSIGNAL 
+#define MSG_NOSIGNAL 0 
+#endif
+
 namespace network
 {
 

src/Lib/Network/SocketSet.hpp

@@ -18 +18 @@
 #ifndef __SOCKETSET_HPP__
 #define __SOCKETSET_HPP__
 
+#include <string.h>
+#include <wchar.h>
+#include <bsd_mem.h>
+#include <sys/select.h>
 #include "SocketHeaders.hpp"
 #include "SocketBase.hpp"
 #include "Util/NoCopy.hpp"

src/Lib/physfs/CMakeLists.txt

@@ -102 +102 @@
     # 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
@@ -303 +305 @@
     CHECK_INCLUDE_FILE(readline/readline.h HAVE_READLINE_H)
     CHECK_INCLUDE_FILE(readline/history.h HAVE_HISTORY_H)
     IF(HAVE_READLINE_H AND HAVE_HISTORY_H)
-        SET(CMAKE_REQUIRED_LIBRARIES curses)
+        FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses)
+        SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY})
         CHECK_LIBRARY_EXISTS("readline" "readline" "" HAVE_LIBREADLINE)
         CHECK_LIBRARY_EXISTS("readline" "history" "" HAVE_LIBHISTORY)
         IF(HAVE_LIBREADLINE AND HAVE_LIBHISTORY)

src/Lib/physfs/physfs_platforms.h

@@ -12 +12 @@
  *  PHYSFS_PLATFORM_UNIX on that system.
  */
 
-#if ((defined __BEOS__) || (defined __beos__))
+#if ((defined __BEOS__) || (defined __beos__) || (defined __HAIKU__))
 #  define PHYSFS_PLATFORM_BEOS
 #  define PHYSFS_PLATFORM_POSIX
 #elif (defined _WIN32_WCE) || (defined _WIN64_WCE)

src/Lib/physfs/platform/beos.cpp

@@ -161 +161 @@
 
 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);

src/NetPanzer/Core/main.cpp

@@ -89 +89 @@
         case SIGFPE: sigtype = "SIGFPE"; break;
         case SIGILL: sigtype = "SIGILL"; break;
         case SIGSEGV: sigtype = "SIGSEGV"; break;
-        case SIGBUS: sigtype = "SIGBUS"; break;
+        
         case SIGABRT: sigtype = "SIGABRT"; break;
         case SIGTRAP: sigtype = "SIGTRAP"; break;
         case SIGSYS: sigtype = "SIGSYS"; break;