head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.54 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.52 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.50 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.48 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.46 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.44 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.42 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.40 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.38 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.36 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.34 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.32 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.30 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.28 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.26 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.24 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.22 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.20 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.18 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.16 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.14 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.12 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.10 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.8 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.6 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.4 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.2 pkgsrc-2003Q4-base:1.8 buildlink2:1.7.0.2 buildlink2-base:1.7 netbsd-1-5-PATCH003:1.7 netbsd-1-5-PATCH001:1.7 netbsd-1-5-RELEASE:1.7 netbsd-1-4-PATCH003:1.7 netbsd-1-4-PATCH002:1.6 comdex-fall-1999:1.6 netbsd-1-4-PATCH001:1.6 netbsd-1-4-RELEASE:1.6 netbsd-1-3-PATCH003:1.4; locks; strict; comment @# @; 1.8 date 2002.07.11.13.29.48; author wiz; state dead; branches; next 1.7; 1.7 date 2000.07.30.05.46.25; author jlam; state Exp; branches; next 1.6; 1.6 date 98.11.24.05.23.23; author mycroft; state Exp; branches; next 1.5; 1.5 date 98.11.24.00.31.07; author hubertf; state Exp; branches; next 1.4; 1.4 date 98.08.27.14.06.09; author garbled; state Exp; branches; next 1.3; 1.3 date 98.08.07.10.40.42; author agc; state Exp; branches; next 1.2; 1.2 date 98.08.02.23.10.48; author tron; state Exp; branches; next 1.1; 1.1 date 98.07.30.23.11.40; author tron; state Exp; branches; next ; desc @@ 1.8 log @Add and enable maelstrom-sdl; rename maelstrom to maelstrom-x11. Remove old maelstrom dir. @ text @$NetBSD: patch-aa,v 1.7 2000/07/30 05:46:25 jlam Exp $ --- Makeflags.orig Mon Jul 14 14:32:13 1997 +++ Makeflags Sun Jul 30 01:32:07 2000 @@@@ -1,12 +1,42 @@@@ +# This file contains the template for Makeflags -# Some sensible defaults -BINDIR = /usr/local/bin -LIBDIR = /usr/local/lib/Maelstrom +SYSTEM = +FEATURES = -DAUDIO_16BIT -DASYNCHRONOUS_IO -DUSE_POSIX_SIGNALS -INSTALL = install +LOGIC = netlogic +XPMINCLUDE = -I$(XPMDIR)/include +XPMLINKDIR = -Wl,-R$(XPMDIR)/lib -L$(XPMDIR)/lib + +BINDIR = $(PREFIX)/bin +LIBDIR = $(PREFIX)/share/maelstrom DATAFILES = Images/*.icon Images/*.cicn "Maelstrom Fonts" \ "Maelstrom Sounds" "Maelstrom Sprites" -all: config +OBJS = main.o framebuf.o v_framebuf.o x11_framebuf.o vga_framebuf.o \ + dga_framebuf.o fontserv.o sound.o Mac_Resource.o imagedump.o \ + init.o $(LOGIC)/$(LOGIC).o \ + controls.o scores.o dialog.o fastrand.o netscore.o checksum.o \ + Utils.o shared.o myerror.o +SOUNDOBJS = Maelstrom_sound.o Mac_Resource.o soundres.o mixer.o shared.o myerror.o + +#CXX = c++ +OPTIMIZE = -O2 +X11INCLUDE = -I$(X11BASE)/include +INCLUDES = -I$(LOGIC) $(X11INCLUDE) $(XPMINCLUDE) +CFLAGS = $(OPTIMIZE) $(INCLUDES) $(FEATURES) \ + -DSYSTEM=\"$(SYSTEM)\" -DLIBDIR=\"$(LIBDIR)\" +EXTRALIBS = +X11LINKDIR = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib +X11LIBS = -lX11 -lXext -lXpm +CSUMLIB = +LIBS = $(EXTRALIBS) $(XPMLINKDIR) $(X11LINKDIR) $(X11LIBS) $(CSUMLIB) +SOUNDLIBS = -lossaudio + +INSTALL = /usr/bin/install + +all: $(MAELSTROM) netplayd/netplayd + +netplayd: + cd netplayd && make @ 1.7 log @Find xpm headers when xpkgwedge is installed. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Use -O2, not -O6. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 1998/11/24 00:31:07 hubertf Exp $ d3 2 a4 2 --- Makeflags.orig Mon Jul 14 20:32:13 1997 +++ Makeflags Mon Aug 3 00:50:27 1998 d17 2 a18 2 +XPMINCLUDE = -I$(X11BASE)/include +XPMLINKDIR = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib @ 1.5 log @optimize, for mycroft @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 1998/08/27 14:06:09 garbled Exp $ d34 1 a34 1 +OPTIMIZE = -O6 @ 1.4 log @Remove a ton of cruft relating to ELF building of pkgs. The trick I had previously used with OBJECT_FMT is not necc. with the revelation that -Wl,-R works. Also fixed alot of PREFIX -> X11BASE typos. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 1998/08/07 10:40:42 agc Exp $ d34 1 a34 1 +OPTIMIZE = @ 1.3 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d17 2 a18 2 +XPMINCLUDE = -I$(PREFIX)/include +XPMLINKDIR = -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib d40 1 a40 1 +X11LINKDIR = $(RPATH) -L$(X11BASE)/lib @ 1.2 log @Improve sound support. @ text @d1 2 @ 1.1 log @New "maelstrom" package created by Tim Rightnour: an incredible, fast moving, high graphics version of asteroids. @ text @d1 3 a3 3 --- Makeflags.orig Mon Jul 14 11:32:13 1997 +++ Makeflags Thu Jul 30 04:46:45 1998 @@@@ -1,8 +1,13 @@@@ d10 1 a10 1 +FEATURES = d21 1 a21 1 @@@@ -10,3 +15,28 @@@@ d42 1 a42 1 +SOUNDLIBS = @