From afa4de32504fff2c16127bd1afad33a1db5e932e Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 17 Jan 2004 21:25:41 +0000 Subject: Fixed linking problem --- games/scummvm/distinfo | 4 ++-- games/scummvm/patches/patch-aa | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'games/scummvm') diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo index 6f45a9a9058..3b17908230d 100644 --- a/games/scummvm/distinfo +++ b/games/scummvm/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2003/09/10 11:02:18 adam Exp $ +$NetBSD: distinfo,v 1.11 2004/01/17 21:25:41 adam Exp $ SHA1 (scummvm-0.5.1.tar.bz2) = cbeb01bee5c86bb4844ca04d199814fbcd752710 Size (scummvm-0.5.1.tar.bz2) = 1149076 bytes -SHA1 (patch-aa) = 58bfda6a0aa8a2c64831ae2f9d9a9ff9ec6b2622 +SHA1 (patch-aa) = 037b809ab439802c3c39a23c8b5ee25762c562f2 SHA1 (patch-ab) = 86c74b6d31695a02d05dacf6161da0f3c09b42cf diff --git a/games/scummvm/patches/patch-aa b/games/scummvm/patches/patch-aa index 3006c95f8a9..38f4706b06d 100644 --- a/games/scummvm/patches/patch-aa +++ b/games/scummvm/patches/patch-aa @@ -1,18 +1,22 @@ -$NetBSD: patch-aa,v 1.8 2003/09/10 11:02:18 adam Exp $ +$NetBSD: patch-aa,v 1.9 2004/01/17 21:25:41 adam Exp $ ---- Makefile.orig 2003-07-16 22:36:38.000000000 +0200 +--- Makefile.orig 2003-07-16 20:36:38.000000000 +0000 +++ Makefile @@ -2,3 +2,3 @@ -CXX := c++ +#CXX := c++ AR := ar cru -@@ -19,3 +19,3 @@ CP := cp +@@ -19,7 +19,5 @@ CP := cp -CXXFLAGS:= -g -O +CXXFLAGS+=${CFLAGS} DEFINES := -@@ -55,4 +55,4 @@ LIBS += -lmad +-LDFLAGS := + INCLUDES:= -I. -Icommon +-LIBS := + OBJS := +@@ -55,4 +53,4 @@ LIBS += -lmad # Uncomment this to activate the Ogg Vorbis lib for compressed sound files -# DEFINES += -DUSE_VORBIS -# LIBS += -lvorbisfile -lvorbis -- cgit v1.2.3