RoadFighter: override LDFLAGS (#2140)

This commit is contained in:
Owen
2018-01-20 13:40:04 -08:00
committed by fbrosson
parent 022aec16a7
commit 98a6350f2c
2 changed files with 25 additions and 17 deletions

View File

@@ -1,24 +1,10 @@
From 47fa7741e38ba15e4b9868945b2b598fda6eb970 Mon Sep 17 00:00:00 2001
From 8091950c47b1f6c8dc2cd569e7b3865113b1cbc6 Mon Sep 17 00:00:00 2001
From: Owen <owenca@users.noreply.github.com>
Date: Thu, 21 Dec 2017 03:10:58 +0000
Subject: roadfighter: change settings directory to B_USER_SETTINGS_DIRECTORY
Fixes #1294
diff --git a/build/linux/Makefile b/build/linux/Makefile
index 064c63d..b62faf3 100644
--- a/build/linux/Makefile
+++ b/build/linux/Makefile
@@ -39,6 +39,9 @@ OBJS = \
CC = g++
CFLAGS = -g3 -O3 `sdl-config --cflags` -I/usr/X11R6/include
LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
+#ifdef __HAIKU__
+LDFLAGS += -lbe
+#endif
RM = rm -f
CP = cp -r
MD = mkdir -p
diff --git a/src/filehandling.cpp b/src/filehandling.cpp
index 5f5bfd8..284b1b9 100644
--- a/src/filehandling.cpp
@@ -61,3 +47,25 @@ index 5f5bfd8..284b1b9 100644
--
2.7.0
From 9767d49ccc349be5163393f3e1ced712388641a4 Mon Sep 17 00:00:00 2001
From: Owen <owenca@users.noreply.github.com>
Date: Fri, 19 Jan 2018 07:46:24 +0000
Subject: override LDFLAGS
diff --git a/build/linux/Makefile b/build/linux/Makefile
index 064c63d..9b7a383 100644
--- a/build/linux/Makefile
+++ b/build/linux/Makefile
@@ -38,7 +38,7 @@ OBJS = \
CC = g++
CFLAGS = -g3 -O3 `sdl-config --cflags` -I/usr/X11R6/include
-LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
+override LDFLAGS += `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
RM = rm -f
CP = cp -r
MD = mkdir -p
--
2.7.0

View File

@@ -6,7 +6,7 @@ special type of car)."
HOMEPAGE="http://www2.braingames.getput.com/roadf/"
COPYRIGHT="2003-2009 Brain Games"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="3"
SOURCE_URI="http://braingames.jorito.net/roadfighter/downloads/roadfighter.src_1.0.1269.tgz"
CHECKSUM_SHA256="c6ed315c4b2bf25d598ffa6b5dfd471e7f187ff29b86fd3213054fb6be7c57e7"
PATCHES="roadfighter-$portVersion.patchset"
@@ -42,7 +42,7 @@ BUILD_PREREQUIRES="
BUILD()
{
make $jobArgs
make LDFLAGS=-lbe $jobArgs
}
INSTALL()