fix building with gcc3

This commit is contained in:
naddy 2002-09-28 21:25:05 +00:00
parent d7be27b80a
commit 7db93272cb
3 changed files with 28 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2002/08/07 18:31:33 wcobb Exp $
# $OpenBSD: Makefile,v 1.5 2002/09/28 21:25:05 naddy Exp $
COMMENT= "Rich city simulation game for X"
@ -19,8 +19,11 @@ MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/linux/games/ \
USE_X11= Yes
MAKE_FLAGS= CXXFLAGS="${CXXFLAGS}"
MAKE_FLAGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
ALL_TARGET= xlincity
NO_REGRESS= Yes
post-extract:
@cd ${WRKSRC}; ln -s lincity.man xlincity.man
.include <bsd.port.mk>

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Imakefile,v 1.1.1.1 2001/07/29 00:07:36 naddy Exp $
$OpenBSD: patch-Imakefile,v 1.2 2002/09/28 21:25:05 naddy Exp $
--- Imakefile.orig Sat Feb 13 23:55:02 1999
+++ Imakefile Sun Jul 29 01:56:46 2001
+++ Imakefile Sat Sep 28 23:23:22 2002
@@ -15,4 +15,4 @@ LOCAL_LIBRARIES = $(XLIB)
OBJS = xmain.o xmouse.o xscreen.o xmps.o xtypeinit.o\
xengine.o xtransport.o xmarket.o xhelp.o lcx11.o
-ComplexProgramTarget(xlincity)
+ComplexProgramTargetNoMan(xlincity)
+ComplexCplusplusProgramTarget(xlincity)

View File

@ -1,7 +1,24 @@
$OpenBSD: patch-lcx11_cxx,v 1.1.1.1 2001/07/29 00:07:36 naddy Exp $
$OpenBSD: patch-lcx11_cxx,v 1.2 2002/09/28 21:25:05 naddy Exp $
--- lcx11.cxx.orig Fri Feb 26 02:17:54 1999
+++ lcx11.cxx Sun Jul 29 01:56:46 2001
@@ -715,7 +715,7 @@ refresh_screen (int x1, int y1, int x2,
+++ lcx11.cxx Sat Sep 28 23:19:46 2002
@@ -5,16 +5,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <math.h>
-#ifdef IRIX
-#include <strings.h>
-#endif
-// I'm told the following is needed.
-#ifdef SUNOS
-#include <string.h>
-#endif
-#ifdef SCO
#include <string.h>
-#endif
// this is for OS/2 - RVI
#ifdef __EMX__
@@ -715,7 +706,7 @@ refresh_screen (int x1, int y1, int x2,
#ifdef USE_IMAGES
Fgl_putbox_low (display.win, 0, 0,
x1, y1, x2 - x1, y2 - y1,