haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

OpenJK:Jedi Academy: fix build for x86

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-05-17 20:09:35 +10:00
parent 17a0fa98c7
commit d22b624aaa
2 changed files with 71 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
games-fps/openjk_academy/openjk_academy-2020.03.09.recipe
View File

@@ -18,7 +18,7 @@ OpenJK does not have Jedi Outcast multiplayer support."
HOMEPAGE="https://github.com/JACoders/OpenJK"
COPYRIGHT="2003 Activision"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
srcGitRev="52030235f052772008d99e6ccb16de48e7ddb688"
SOURCE_URI="https://github.com/JACoders/OpenJK/archive/$srcGitRev.tar.gz"
CHECKSUM_SHA256="2b6fadf16cca2fdf4cce32f977e0d0aa34e2a19d1c596b996f9857b6a97c7d32"

74
games-fps/openjk_academy/patches/openjk_academy-2020.03.09.patchset
View File

@@ -1,4 +1,4 @@
From fea0136d1313005a33ff6021c7eef009017880e5 Mon Sep 17 00:00:00 2001
From fbc196f3d58e2c5759b28b2773bd66608ee0f645 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 30 Oct 2019 00:18:24 +1000
Subject: Add Haiku support
@@ -178,7 +178,7 @@ index 96f5b7a..c90f068 100644
2.26.0
From ac4a9eb934426533e735f219bb44f72a88b996cb Mon Sep 17 00:00:00 2001
From f66678ef68dad4199263d7848f7d8e2d1cd4306e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 10 Mar 2020 20:22:50 +1000
Subject: use internal zlib
@@ -201,7 +201,7 @@ index 4ef4c7e..a25a99a 100644
2.26.0
From fd6463ce82bb20c66111794bfadad9e985f0d322 Mon Sep 17 00:00:00 2001
From eb785c535fd2e7c13b3e1aa78e39957159e14d54 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 16 May 2020 20:29:43 +1000
Subject: Fix buils Jedi Academy
@@ -239,7 +239,7 @@ index 2127128..c560694 100644
2.26.0
From a444c733333fc560ba39b8ccf684e62b393438af Mon Sep 17 00:00:00 2001
From bff7fbadc16d49bce431ea676a6613628b784349 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 May 2020 10:28:53 +1000
Subject: Add gamedir path from env
@@ -265,3 +265,69 @@ index 4fb8b4a..9d8a794 100644
--
2.26.0
From 1da8e7fa13b8d2c4cc6b098a6512048ba84c926c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 May 2020 19:09:55 +1000
Subject: Fix build for x86
diff --git a/codemp/mp3code/config.h b/codemp/mp3code/config.h
index 36a2651..c95e683 100644
--- a/codemp/mp3code/config.h
+++ b/codemp/mp3code/config.h
@@ -59,6 +59,10 @@ typedef int socklen_t;
// real number
typedef double real;
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#else
+
#if UCHAR_MAX == 0xff
typedef unsigned char uint8;
@@ -101,6 +105,7 @@ typedef short int32;
#else
#error This machine has no 32-bit type
#endif
+#endif
// What character marks the end of a directory entry? For DOS and
--
2.26.0
From 4537cd02588b0d531e71cb5f2727c1157d1d2a89 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 May 2020 19:10:22 +1000
Subject: Fix build for x86
diff --git a/code/mp3code/config.h b/code/mp3code/config.h
index 36a2651..c95e683 100644
--- a/code/mp3code/config.h
+++ b/code/mp3code/config.h
@@ -59,6 +59,10 @@ typedef int socklen_t;
// real number
typedef double real;
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#else
+
#if UCHAR_MAX == 0xff
typedef unsigned char uint8;
@@ -101,6 +105,7 @@ typedef short int32;
#else
#error This machine has no 32-bit type
#endif
+#endif
// What character marks the end of a directory entry? For DOS and
--
2.26.0