mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-03 13:38:52 +02:00
roadfighter, fix references to libSDL*, enable x86_64 (#4056)
This commit is contained in:
committed by
waddlesplash
parent
2a247ebd60
commit
858a6b93b8
@@ -1,4 +1,4 @@
|
|||||||
From 8091950c47b1f6c8dc2cd569e7b3865113b1cbc6 Mon Sep 17 00:00:00 2001
|
From 0995476f61c8033bbc4fa3f9f75d399bc3315841 Mon Sep 17 00:00:00 2001
|
||||||
From: Owen <owenca@users.noreply.github.com>
|
From: Owen <owenca@users.noreply.github.com>
|
||||||
Date: Thu, 21 Dec 2017 03:10:58 +0000
|
Date: Thu, 21 Dec 2017 03:10:58 +0000
|
||||||
Subject: roadfighter: change settings directory to B_USER_SETTINGS_DIRECTORY
|
Subject: roadfighter: change settings directory to B_USER_SETTINGS_DIRECTORY
|
||||||
@@ -45,14 +45,15 @@ index 5f5bfd8..284b1b9 100644
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
--
|
--
|
||||||
2.7.0
|
2.21.0
|
||||||
|
|
||||||
|
|
||||||
From 9767d49ccc349be5163393f3e1ced712388641a4 Mon Sep 17 00:00:00 2001
|
From f2f2016799d39072878e67428bd7c7452ab7a742 Mon Sep 17 00:00:00 2001
|
||||||
From: Owen <owenca@users.noreply.github.com>
|
From: Owen <owenca@users.noreply.github.com>
|
||||||
Date: Fri, 19 Jan 2018 07:46:24 +0000
|
Date: Fri, 19 Jan 2018 07:46:24 +0000
|
||||||
Subject: override LDFLAGS
|
Subject: override LDFLAGS
|
||||||
|
|
||||||
|
|
||||||
diff --git a/build/linux/Makefile b/build/linux/Makefile
|
diff --git a/build/linux/Makefile b/build/linux/Makefile
|
||||||
index 064c63d..9b7a383 100644
|
index 064c63d..9b7a383 100644
|
||||||
--- a/build/linux/Makefile
|
--- a/build/linux/Makefile
|
||||||
@@ -67,5 +68,40 @@ index 064c63d..9b7a383 100644
|
|||||||
CP = cp -r
|
CP = cp -r
|
||||||
MD = mkdir -p
|
MD = mkdir -p
|
||||||
--
|
--
|
||||||
2.7.0
|
2.21.0
|
||||||
|
|
||||||
|
|
||||||
|
From bfa0ea0660f2740a7028038099ec7fdbee3faf5a Mon Sep 17 00:00:00 2001
|
||||||
|
From: begasus <begasus@gmail.com>
|
||||||
|
Date: Sat, 27 Jul 2019 08:47:06 +0200
|
||||||
|
Subject: Fix build with gcc8
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/auxiliar.cpp b/src/auxiliar.cpp
|
||||||
|
index 11cac85..b311fbf 100644
|
||||||
|
--- a/src/auxiliar.cpp
|
||||||
|
+++ b/src/auxiliar.cpp
|
||||||
|
@@ -13,6 +13,11 @@
|
||||||
|
#include "SDL_image.h"
|
||||||
|
#include "SDL_ttf.h"
|
||||||
|
|
||||||
|
+#ifdef __HAIKU__
|
||||||
|
+typedef int boolean;
|
||||||
|
+#define HAVE_BOOLEAN
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include "auxiliar.h"
|
||||||
|
#include "List.h"
|
||||||
|
|
||||||
|
@@ -84,7 +89,7 @@ SDL_Surface *load_maskedimage(char *imagefile,char *maskfile,char *path)
|
||||||
|
mask=IMG_Load(name);
|
||||||
|
|
||||||
|
if (tmp==0 ||
|
||||||
|
- mask==0) return false;
|
||||||
|
+ mask==0) return (boolean)false;
|
||||||
|
|
||||||
|
res=SDL_DisplayFormatAlpha(tmp);
|
||||||
|
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
|
|||||||
@@ -1,32 +1,31 @@
|
|||||||
SUMMARY="A 2D racing game"
|
SUMMARY="A 2D racing game"
|
||||||
DESCRIPTION="
|
DESCRIPTION="The goal is to reach the finish line within the stages without \
|
||||||
The goal is to reach the finish line within the stages without running out of \
|
running out of time, hitting other cars or running out of fuel (fuel is \
|
||||||
time, hitting other cars or running out of fuel (fuel is refilled by hitting a \
|
refilled by hitting a special type of car)."
|
||||||
special type of car)."
|
|
||||||
HOMEPAGE="http://www2.braingames.getput.com/roadf/"
|
HOMEPAGE="http://www2.braingames.getput.com/roadf/"
|
||||||
COPYRIGHT="2003-2009 Brain Games"
|
COPYRIGHT="2003-2009 Brain Games"
|
||||||
LICENSE="GNU GPL v2"
|
LICENSE="GNU GPL v2"
|
||||||
REVISION="3"
|
REVISION="4"
|
||||||
SOURCE_URI="http://braingames.jorito.net/roadfighter/downloads/roadfighter.src_1.0.1269.tgz"
|
SOURCE_URI="http://braingames.jorito.net/roadfighter/downloads/roadfighter.src_1.0.1269.tgz"
|
||||||
CHECKSUM_SHA256="c6ed315c4b2bf25d598ffa6b5dfd471e7f187ff29b86fd3213054fb6be7c57e7"
|
CHECKSUM_SHA256="88d97bd2fdad4f0e7a722a55076a1b191f086c6bb508152b24a6bf0fcfec4d3b"
|
||||||
PATCHES="roadfighter-$portVersion.patchset"
|
PATCHES="roadfighter-$portVersion.patchset"
|
||||||
|
|
||||||
ARCHITECTURES="x86_gcc2"
|
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
|
||||||
|
|
||||||
PROVIDES="
|
PROVIDES="
|
||||||
roadfighter = $portVersion
|
roadfighter = $portVersion
|
||||||
"
|
"
|
||||||
REQUIRES="
|
REQUIRES="
|
||||||
haiku$secondaryArchSuffix
|
haiku$secondaryArchSuffix
|
||||||
lib:libsdl$secondaryArchSuffix
|
lib:libSDL_1.2$secondaryArchSuffix
|
||||||
lib:libSDL_image$secondaryArchSuffix
|
lib:libSDL_image_1.2$secondaryArchSuffix
|
||||||
lib:libSDL_mixer$secondaryArchSuffix
|
lib:libSDL_mixer_1.2$secondaryArchSuffix
|
||||||
lib:libSDL_sound$secondaryArchSuffix
|
lib:libSDL_sound_1.0$secondaryArchSuffix
|
||||||
lib:libSDL_ttf$secondaryArchSuffix
|
lib:libSDL_ttf_2.0$secondaryArchSuffix
|
||||||
"
|
"
|
||||||
|
|
||||||
BUILD_REQUIRES="
|
BUILD_REQUIRES="
|
||||||
devel:libsdl$secondaryArchSuffix
|
devel:libSDL$secondaryArchSuffix
|
||||||
devel:libSDL_image$secondaryArchSuffix
|
devel:libSDL_image$secondaryArchSuffix
|
||||||
devel:libSDL_mixer$secondaryArchSuffix
|
devel:libSDL_mixer$secondaryArchSuffix
|
||||||
devel:libSDL_sound$secondaryArchSuffix
|
devel:libSDL_sound$secondaryArchSuffix
|
||||||
@@ -50,6 +49,7 @@ INSTALL()
|
|||||||
installDir=$appsDir/"Road Fighter"
|
installDir=$appsDir/"Road Fighter"
|
||||||
mkdir -p "$installDir"
|
mkdir -p "$installDir"
|
||||||
make install PREFIX="$installDir" GAMEDIR="$installDir"
|
make install PREFIX="$installDir" GAMEDIR="$installDir"
|
||||||
|
rm -rf "$installDir"/share/{applications,pixmaps}
|
||||||
|
|
||||||
cd "$installDir"
|
cd "$installDir"
|
||||||
echo -e "#!/bin/sh\n`cat roadfighter`" > roadfighter
|
echo -e "#!/bin/sh\n`cat roadfighter`" > roadfighter
|
||||||
|
|||||||
Reference in New Issue
Block a user