On Fri, May 30, 2014 at 06:30:52PM +0100, Edd Barrett wrote:
> Can you check it doesn't use nasm. If it does then it will need magic.
> On 30 May 2014 16:41, "Ryan Freeman" <[email protected]> wrote:
ah of course. as i did this quick hack on a work laptop amd64, it
doesn't even have nasm. will check my i386 at home :)
should also check to make sure simple presense of nasm doesn't pull
it in automatically?
cheers,
-ryan
>
> > On Thu, May 29, 2014 at 11:53:08AM +0100, Edd Barrett wrote:
> > > On Wed, May 28, 2014 at 10:21:29AM -0700, Ryan Freeman wrote:
> > > >
> > > > any reason to hate the software client? it works fine too
> > > > in my playtests over the past few years, would have been
> > > > on i386 tho when i last tested it, and of course just with
> > > > the 'port' i showed you where i basically had a do-build
> > > > target call gmake ;)
> > >
> > > We can certainly add them at a later date. I'm going to commit what we
> > > have later.
> > >
> > > Thanks!
> >
> > Cheers, this works! :)
> >
> > -ryan
> >
> > --- Makefile.orig Wed May 28 10:31:20 2014
> > +++ Makefile Thu May 29 12:52:06 2014
> > @@ -35,9 +35,13 @@
> >
> > DOMAKE = ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
> > do-build:
> > + cd ${WRKBUILD}/engine/hexen2 && ${DOMAKE} h2
> > + cd ${WRKBUILD}/engine/hexen2 && ${DOMAKE} clean
> > cd ${WRKBUILD}/engine/hexen2 && ${DOMAKE} glh2
> > cd ${WRKBUILD}/engine/hexen2/server && ${DOMAKE}
> > cd ${WRKBUILD}/engine/hexenworld/server && ${DOMAKE}
> > + cd ${WRKBUILD}/engine/hexenworld/client && ${DOMAKE} hw
> > + cd ${WRKBUILD}/engine/hexenworld/client && ${DOMAKE} clean
> > cd ${WRKBUILD}/engine/hexenworld/client && ${DOMAKE} glhw
> > cd ${WRKBUILD}/launcher && ${DOMAKE}
> > cd ${WRKBUILD}/h2patch && ${DOMAKE}
> > @@ -45,8 +49,10 @@
> > cd ${WRKBUILD}/hw_utils/hwmquery && ${DOMAKE}
> > cd ${WRKBUILD}/hw_utils/hwrcon && ${DOMAKE}
> >
> > -BINS = engine/hexen2/glhexen2 \
> > +BINS = engine/hexen2/hexen2 \
> > + engine/hexen2/glhexen2 \
> > engine/hexen2/server/h2ded \
> > + engine/hexenworld/client/hwcl \
> > engine/hexenworld/client/glhwcl \
> > engine/hexenworld/server/hwsv \
> > launcher/h2launcher \
> >
> > --- pkg/PLIST.orig Sat May 24 09:32:13 2014
> > +++ pkg/PLIST Thu May 29 14:17:00 2014
> > @@ -4,6 +4,8 @@
> > bin/h2ded
> > bin/h2launcher
> > bin/h2patch
> > +bin/hexen2
> > +bin/hwcl
> > bin/hwmaster
> > bin/hwmquery
> > bin/hwrcon
> > @@ -63,9 +65,10 @@
> > @bin share/uhexen2/h2ded
> > @bin share/uhexen2/h2launcher
> > @bin share/uhexen2/h2patch
> > -share/uhexen2/hexen2
> > +@bin share/uhexen2/hexen2
> > share/uhexen2/hexen2.png
> > share/uhexen2/hexen2.svga
> > +@bin share/uhexen2/hwcl
> > @bin share/uhexen2/hwmaster
> > @bin share/uhexen2/hwmquery
> > @bin share/uhexen2/hwrcon
> >
