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

LTris: fix build for x64

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-05-01 21:21:04 +10:00
parent dc1005404e
commit 173fa5df89
2 changed files with 149 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
games-puzzle/ltris/ltris-1.0.19.recipe
View File

@@ -6,12 +6,12 @@ units with the aim of building lines without gaps which then disappear \
HOMEPAGE="http://lgames.sourceforge.net/"
COPYRIGHT="2002-2011 Michael Speck"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="3"
SOURCE_URI="http://sourceforge.net/projects/lgames/files/ltris/ltris-1.0.19.tar.gz"
CHECKSUM_SHA256="8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1"
PATCHES="ltris-1.0.19.patchset"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
PROVIDES="
ltris = $portVersion

163
games-puzzle/ltris/patches/ltris-1.0.19.patchset
View File

@@ -1,12 +1,8 @@
From 3afd9f9500c8cc0a9cc7d8f09128e4c44b5c2538 Mon Sep 17 00:00:00 2001
From f693722c544bf3193d0bffe063be7f166d03a493 Mon Sep 17 00:00:00 2001
From: Markus Himmel <markus@himmel-villmar.de>
Date: Mon, 12 Jan 2015 20:53:30 +0000
Subject: [PATCH 1/2] Original resource definition file
Subject: Original resource definition file
---
LTris.rdef | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 LTris.rdef
diff --git a/LTris.rdef b/LTris.rdef
new file mode 100644
@@ -52,20 +48,14 @@ index 0000000..b1cea42
+ $"380E"
+};
--
1.8.3.4
2.26.0
From c735a348244339d0e12c90a027e20cce1de18370 Mon Sep 17 00:00:00 2001
From 6de1572536a027526d45224219b53a33712de630 Mon Sep 17 00:00:00 2001
From: Markus Himmel <markus@himmel-villmar.de>
Date: Mon, 12 Jan 2015 22:16:46 +0000
Subject: [PATCH 2/2] Move settings and highscores to B_USER_SETTINGS_DIRECTORY
Subject: Move settings and highscores to B_USER_SETTINGS_DIRECTORY
---
src/chart.c | 4 ++++
src/config.c | 18 +++++++++++++++++-
src/config.h | 4 ++++
src/manager.c | 20 ++++++++++++++++++++
4 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/src/chart.c b/src/chart.c
index 87d8e03..8cee31d 100644
@@ -183,5 +173,146 @@ index b8cc411..de07f73 100644
levelsets_load_names(); /* reinit name lists and configs indices */
/* reassign these name lists as position in memory has changed */
--
1.8.3.4
2.26.0
From c511bcc1551702a5222ba9e59563d9e21d88f29c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 1 May 2020 21:17:07 +1000
Subject: Remove inline functions
diff --git a/src/sdl.c b/src/sdl.c
index c4fc6b5..8a5900d 100644
--- a/src/sdl.c
+++ b/src/sdl.c
@@ -905,7 +905,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);
}
@@ -1132,7 +1132,7 @@ SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *so
/*
get milliseconds since last call
*/
-inline int get_time()
+int get_time()
{
int ms;
cur_time = SDL_GetTicks();
@@ -1148,7 +1148,7 @@ inline int get_time()
/*
reset timer
*/
-inline void reset_timer()
+void reset_timer()
{
last_time = SDL_GetTicks();
}
diff --git a/src/sdl.h b/src/sdl.h
index 3a83bb0..f5a378a 100644
--- a/src/sdl.h
+++ b/src/sdl.h
@@ -132,7 +132,7 @@ Video_Mode* cur_video_mode();
char** get_mode_names( int *count );
int set_video_mode( Video_Mode mode );
void hardware_cap();
-inline void refresh_screen( int x, int y, int w, int h );
+void refresh_screen( int x, int y, int w, int h );
void refresh_rects();
void add_refresh_rect(int x, int y, int w, int h);
int wait_for_key();
@@ -148,8 +148,8 @@ void take_screenshot( int i );
SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source );
/* timer */
-inline int get_time();
-inline void reset_timer();
+int get_time();
+void reset_timer();
#ifdef __cplusplus
};
diff --git a/src/tools.c b/src/tools.c
index 853ac49..4075752 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -23,27 +23,27 @@
#include "ltris.h"
/* compares to strings and returns true if their first strlen(str1) chars are equal */
-inline int strequal( char *str1, char *str2 )
+int strequal( char *str1, char *str2 )
{
if ( strlen( str1 ) != strlen( str2 ) ) return 0;
return ( !strncmp( str1, str2, strlen( str1 ) ) );
}
/* set delay to ms milliseconds */
-inline void delay_set( Delay *delay, int ms )
+void delay_set( Delay *delay, int ms )
{
delay->limit = ms;
delay->cur = 0;
}
/* reset delay ( cur = 0 )*/
-inline void delay_reset( Delay *delay )
+void delay_reset( Delay *delay )
{
delay->cur = 0;
}
/* check if times out and reset */
-inline int delay_timed_out( Delay *delay, int ms )
+int delay_timed_out( Delay *delay, int ms )
{
delay->cur += ms;
if ( delay->cur >= delay->limit ) {
@@ -56,12 +56,12 @@ inline int delay_timed_out( Delay *delay, int ms )
}
/* set timer so that we have a time out next call of delay_timed_out() */
-inline void delay_force_time_out( Delay *delay )
+void delay_force_time_out( Delay *delay )
{
delay->cur = delay->limit;
}
-inline void goto_tile( int *x, int *y, int d )
+void goto_tile( int *x, int *y, int d )
{
/* 0 -up, clockwise, 5 - left up */
switch ( d ) {
diff --git a/src/tools.h b/src/tools.h
index 8afdd23..18ed5da 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -45,16 +45,16 @@ typedef struct {
} Delay;
/* set delay to ms milliseconds */
-inline void delay_set( Delay *delay, int ms );
+void delay_set( Delay *delay, int ms );
/* reset delay ( cur = 0 )*/
-inline void delay_reset( Delay *delay );
+void delay_reset( Delay *delay );
/* check if time's out ( add ms milliseconds )and reset */
-inline int delay_timed_out( Delay *delay, int ms );
+int delay_timed_out( Delay *delay, int ms );
/* set timer so that we have a time out next call of delay_timed_out() */
-inline void delay_force_time_out( Delay *delay );
+void delay_force_time_out( Delay *delay );
/* return distance betwteen to map positions */
int get_dist( int x1, int y1, int x2, int y2 );
--
2.26.0