114 lines
3.0 KiB
Plaintext
114 lines
3.0 KiB
Plaintext
From b2a372158b3efa2d97527542eca90b8c0131abaa Mon Sep 17 00:00:00 2001
|
|
From: Yourself <user@shredder.home>
|
|
Date: Tue, 25 Sep 2018 16:05:19 +0000
|
|
Subject: removed reference to unused sys/shm.h
|
|
|
|
|
|
diff --git a/src/net/tcpip.h b/src/net/tcpip.h
|
|
index 000071c..a13ad9d 100644
|
|
--- a/src/net/tcpip.h
|
|
+++ b/src/net/tcpip.h
|
|
@@ -27,7 +27,6 @@
|
|
# include <string.h>
|
|
# include <sys/time.h>
|
|
# include <sys/ipc.h>
|
|
-# include <sys/shm.h>
|
|
# include <sys/socket.h>
|
|
# include <unistd.h>
|
|
# ifdef HAVE_BSTRING_H
|
|
--
|
|
2.23.0
|
|
|
|
|
|
From 6988b0ded22146bf1c51c1f4898b6c976f763b06 Mon Sep 17 00:00:00 2001
|
|
From: Yourself <user@shredder.home>
|
|
Date: Tue, 25 Sep 2018 16:08:30 +0000
|
|
Subject: added missing stdint.h reference
|
|
|
|
|
|
diff --git a/src/intsect.cpp b/src/intsect.cpp
|
|
index 8df9cbf..85fc0ec 100644
|
|
--- a/src/intsect.cpp
|
|
+++ b/src/intsect.cpp
|
|
@@ -13,6 +13,7 @@
|
|
#endif
|
|
|
|
#include <stdlib.h>
|
|
+#include <stdint.h>
|
|
|
|
void pushback(int32_t x1,int32_t y1,int32_t &x2,int32_t &y2,
|
|
int32_t xp1, int32_t yp1, int32_t xp2, int32_t yp2, int xdir, int ydir, int inside)
|
|
--
|
|
2.23.0
|
|
|
|
|
|
From 909dbebf708534dfd1b1e4cd32483289cc0710d8 Mon Sep 17 00:00:00 2001
|
|
From: Ra-V2 <rav.bernacki@gmail.com>
|
|
Date: Thu, 16 Jan 2020 15:28:40 +0000
|
|
Subject: change localization of saves to settings directory
|
|
|
|
|
|
diff --git a/src/sdlport/Makefile.am b/src/sdlport/Makefile.am
|
|
index 202f0d1..b17da01 100644
|
|
--- a/src/sdlport/Makefile.am
|
|
+++ b/src/sdlport/Makefile.am
|
|
@@ -16,7 +16,7 @@ libsdlport_a_SOURCES = \
|
|
$(NULL)
|
|
libsdlport_a_LIBADD =
|
|
|
|
-INCLUDES = -I$(srcdir)/../ -I$(srcdir)/../imlib $(SDL_CFLAGS)
|
|
+INCLUDES = -I$(srcdir)/../ -I$(srcdir)/../imlib -I$(srcdir)/../lisp -I- $(SDL_CFLAGS)
|
|
|
|
CPPFLAGS = @CPPFLAGS@ -DNO_CHECK -DASSETDIR=\"$(assetdir)\"
|
|
|
|
diff --git a/src/sdlport/setup.cpp b/src/sdlport/setup.cpp
|
|
index 3ece66c..5dd6b46 100644
|
|
--- a/src/sdlport/setup.cpp
|
|
+++ b/src/sdlport/setup.cpp
|
|
@@ -38,6 +38,11 @@
|
|
#endif /* __APPLE__ */
|
|
#endif /* HAVE_OPENGL */
|
|
|
|
+#ifdef __HAIKU__
|
|
+#include <FindDirectory.h>
|
|
+#include <fs_info.h>
|
|
+#endif
|
|
+
|
|
#include "specs.h"
|
|
#include "keys.h"
|
|
#include "setup.h"
|
|
@@ -384,6 +389,22 @@ void setup( int argc, char **argv )
|
|
atexit( SDL_Quit );
|
|
|
|
// Set the savegame directory
|
|
+#ifdef __HAIKU__
|
|
+ dev_t volume = dev_for_path("/boot");
|
|
+ char buffer[B_PATH_NAME_LENGTH+B_FILE_NAME_LENGTH];
|
|
+ if(find_directory(B_USER_SETTINGS_DIRECTORY, volume, true, buffer, sizeof(buffer)) == B_OK)
|
|
+ {
|
|
+ strlcat(buffer, "/abuse/", sizeof(buffer));
|
|
+ mkdir(buffer, 0700);
|
|
+ set_save_filename_prefix(buffer);
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ printf( "WARNING: Unable to get B_USER_SETTINGS_DIRECTORY.\n" );
|
|
+ printf( " Savegames will probably fail.\n" );
|
|
+ set_save_filename_prefix( "" );
|
|
+ }
|
|
+#else
|
|
char *homedir;
|
|
char *savedir;
|
|
FILE *fd = NULL;
|
|
@@ -414,6 +435,7 @@ void setup( int argc, char **argv )
|
|
// Hopefully they have write permissions....
|
|
set_save_filename_prefix( "" );
|
|
}
|
|
+#endif
|
|
|
|
// Set the datadir to a default value
|
|
// (The current directory)
|
|
--
|
|
2.23.0
|
|
|