Fix 4 building failed in x86_64 issues. (#1993)

* Fix bdhcalc

* Fix ppviewer

* Fix helios

* Fix lpairs

* Remove autoreconf

* Remove 'x'

* Update helios-1.7.2.recipe

* revision update

* Change arch variable

* x86_64 issues has been fixed upstream

* patches of ppviewer hass been merged to upstream

* Patches of BDH-Calc has been merged to upstream
This commit is contained in:
Shiroko
2018-01-02 11:44:13 -08:00
committed by Scott McCreary
parent f8c60411b4
commit bd9ef372da
5 changed files with 55 additions and 35 deletions

View File

@@ -1,11 +1,8 @@
From 62c097ba3a2dc90d55c7064ca9c28094354a7eb4 Mon Sep 17 00:00:00 2001
From 0861af061dad76b3fdb3aa6f34ce06d74273b1b3 Mon Sep 17 00:00:00 2001
From: Markus Himmel <markus@himmel-villmar.de>
Date: Wed, 14 Jan 2015 19:19:28 +0000
Subject: [PATCH 1/2] applying patch lpairs-1.0.4.patch
Subject: applying patch lpairs-1.0.4.patch
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 4dcecb1..a1908af 100755
@@ -21,17 +18,14 @@ index 4dcecb1..a1908af 100755
# Check whether --enable-install was given.
--
1.8.3.4
2.14.2
From 563cfd6ddafe187d5555f801c539a16bccf960e0 Mon Sep 17 00:00:00 2001
From 4055056b9afda14cee1255e846d3fb4ffb52743d Mon Sep 17 00:00:00 2001
From: Markus Himmel <markus@himmel-villmar.de>
Date: Wed, 14 Jan 2015 19:36:34 +0000
Subject: [PATCH 2/2] Move config to LGames folder in user settings
Subject: Move config to LGames folder in user settings
---
lpairs/cfg.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/lpairs/cfg.c b/lpairs/cfg.c
index 301878a..a786e39 100644
@@ -69,5 +63,28 @@ index 301878a..a786e39 100644
else
strncpy(c_pth, p, sizeof(c_pth)-1);
--
1.8.3.4
2.14.2
From 51114168f60efd37ff3b7983535512cff43c3123 Mon Sep 17 00:00:00 2001
From: Shiroko <hhx.xxm@gmail.com>
Date: Fri, 29 Dec 2017 12:52:29 +0000
Subject: Solved gcc2->gcc5 problem
diff --git a/lpairs/sdl.c b/lpairs/sdl.c
index 5937097..e4779c4 100644
--- a/lpairs/sdl.c
+++ b/lpairs/sdl.c
@@ -480,7 +480,7 @@ void hardware_cap()
/*
update rectangle (0,0,0,0)->fullscreen
*/
-inline void refresh_screen(int x, int y, int w, int h)
+void refresh_screen(int x, int y, int w, int h)
{
SDL_UpdateRect(sdl.screen, x, y, w, h);
}
--
2.14.2