simutrans: fix build for Haiku R1B2 (#5619)

* simutrans: fix build for Haiku R1B2
This commit is contained in:
kenmays
2021-01-20 23:17:24 -08:00
committed by GitHub
parent 12553d1d25
commit 856f1c7c0a
2 changed files with 44 additions and 3 deletions

View File

@@ -1,4 +1,4 @@
From a1714af9856bfd9da1d89713d45eb94c1a9fb2c1 Mon Sep 17 00:00:00 2001
From 66e56fe20495c0ab6a4d6fce498fba137c3812b7 Mon Sep 17 00:00:00 2001
From: none <user@shredder>
Date: Fri, 4 Jan 2019 19:45:50 +0100
Subject: Bugfix: add ',' at end of line to re-enable building under Haiku
@@ -18,5 +18,46 @@ index 83a46bc..9e7a939 100644
"~/.fonts/",
"~/.local/share/fonts/",
--
2.19.1
2.26.0
From ba6584cf663d367331cd86a199d6560b1aa72e57 Mon Sep 17 00:00:00 2001
From: Ken Mays <kmays2000@gmail.com>
Date: Tue, 19 Jan 2021 07:23:10 +0100
Subject: Fix uint handling under Haiku
diff --git a/simtypes.h b/simtypes.h
index 482fc50..7eb6430 100644
--- a/simtypes.h
+++ b/simtypes.h
@@ -7,6 +7,7 @@
#define SIMTYPES_H
#include "utils/for.h"
+#include <OS.h>
#if defined _MSC_VER
# if _MSC_VER <= 1200
@@ -155,14 +156,18 @@ typedef unsigned int uint32;
#else
// BeOS: int!=long (even though both 32 bit)
typedef signed long sint32;
+#ifndef __HAIKU__
#ifndef NO_UINT32_TYPES
typedef unsigned long uint32;
#endif
#endif
+#endif
typedef signed long long sint64;
+#ifndef __HAIKU__
#ifndef NO_UINT64_TYPES
typedef unsigned long long uint64;
#endif
+#endif
#ifdef _MSC_VER
# define GCC_PACKED
# define GCC_ALIGN(a)
--
2.26.0

View File

@@ -9,7 +9,7 @@ HOMEPAGE="http://www.simutrans.com"
COPYRIGHT="1997-2004 Hj. Malthaner
2005-2018 The Simutrans Team"
LICENSE="Artistic"
REVISION="1"
REVISION="2"
SvnRevision="8600"
GitRevision="89498c762ffb8c709167a875b2de836af50f608e"
SOURCE_URI="https://github.com/aburch/simutrans/archive/$GitRevision.tar.gz"