diff options
| author | alepulver <alepulver@FreeBSD.org> | 2007-03-22 11:30:20 +0800 |
|---|---|---|
| committer | alepulver <alepulver@FreeBSD.org> | 2007-03-22 11:30:20 +0800 |
| commit | ee747342034e85be904fc8612a93b655dc5b35df (patch) | |
| tree | c0c9facc1da372043247d52d6f63d255d82a442b /games/sdlquake2 | |
| parent | 94d75c2b8f5b45ebf0d0ad365b876c26ed862a25 (diff) | |
| download | freebsd-ports-gnome-ee747342034e85be904fc8612a93b655dc5b35df.tar.gz freebsd-ports-gnome-ee747342034e85be904fc8612a93b655dc5b35df.tar.zst freebsd-ports-gnome-ee747342034e85be904fc8612a93b655dc5b35df.zip | |
- Fix building with GCC 4.x.
- Remove 2 continuous blank lines to make portlint(1) happy.
Reported by: pointyhat
Diffstat (limited to 'games/sdlquake2')
| -rw-r--r-- | games/sdlquake2/Makefile | 1 | ||||
| -rw-r--r-- | games/sdlquake2/files/patch-baseq2__g_items.c | 15 | ||||
| -rw-r--r-- | games/sdlquake2/files/patch-gl_sdl.c | 29 |
3 files changed, 44 insertions, 1 deletions
diff --git a/games/sdlquake2/Makefile b/games/sdlquake2/Makefile index c9d15a25a7a2..63ded0675d1d 100644 --- a/games/sdlquake2/Makefile +++ b/games/sdlquake2/Makefile @@ -28,7 +28,6 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} MAKE_ENV= LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR=${LIBDIR:S/${PREFIX}\///} - .include "${.CURDIR}/../quake2-data/Makefile.include" .include <bsd.port.pre.mk> diff --git a/games/sdlquake2/files/patch-baseq2__g_items.c b/games/sdlquake2/files/patch-baseq2__g_items.c new file mode 100644 index 000000000000..6be4d536fa3b --- /dev/null +++ b/games/sdlquake2/files/patch-baseq2__g_items.c @@ -0,0 +1,15 @@ +--- baseq2/g_items.c.orig Thu May 19 17:56:13 2005 ++++ baseq2/g_items.c Thu Mar 22 00:22:37 2007 +@@ -40,9 +40,9 @@ + gitem_armor_t combatarmor_info = { 50, 100, .60, .30, ARMOR_COMBAT}; + gitem_armor_t bodyarmor_info = {100, 200, .80, .60, ARMOR_BODY}; + +-static int jacket_armor_index; +-static int combat_armor_index; +-static int body_armor_index; ++int jacket_armor_index; ++int combat_armor_index; ++int body_armor_index; + static int power_screen_index; + static int power_shield_index; + diff --git a/games/sdlquake2/files/patch-gl_sdl.c b/games/sdlquake2/files/patch-gl_sdl.c new file mode 100644 index 000000000000..60adc619d88a --- /dev/null +++ b/games/sdlquake2/files/patch-gl_sdl.c @@ -0,0 +1,29 @@ +--- gl_sdl.c.orig Thu May 19 17:56:13 2005 ++++ gl_sdl.c Thu Mar 22 00:20:55 2007 +@@ -108,12 +108,12 @@ + // state struct passed in Init + static in_state_t *in_state; + +-static cvar_t *sensitivity; ++cvar_t *sensitivity; + static cvar_t *my_lookstrafe; +-static cvar_t *m_side; +-static cvar_t *m_yaw; +-static cvar_t *m_pitch; +-static cvar_t *m_forward; ++cvar_t *m_side; ++cvar_t *m_yaw; ++cvar_t *m_pitch; ++cvar_t *m_forward; + static cvar_t *my_freelook; + + #ifdef HAVE_JOYSTICK +@@ -321,7 +321,7 @@ + #endif + } + +-static void IN_DeactivateMouse( void ) ++void IN_DeactivateMouse( void ) + { + if (!mouse_avail) + return; |