[Scummvm-devel] Merging TsAGE engine into trunk

[Paul Gilbert]

On Sat, Apr 9, 2011 at 1:20 AM, A Milburn <fuzzie at users.sourceforge.net>wrote:

> On Fri, Apr 08, 2011 at 05:14:13PM +0200, Jordi Vilalta Prat wrote:
> > That's what I meant. There's just no need to package extra source
> > files that won't be used. IMHO it just adds the chance some
> > distribution packager will enable it.
>
> If you really think that's a problem, the simplest solution would be to
> simply remove all the unused engines/etc when we branch for the release?
> We already have such examples in trunk, and it seems that having to
> worry about what goes into master seems exactly what the release branches
> are meant to solve.
>
> - fuzzie
>

Since we already have other engines that would be disabled for the release,
in my opinion there's no real problem with adding another engine to the
trunk right now.

I've generated a pull request for merging the engine. If one of the admins
can give the final approval? And I'd be happier with someone more familiar
with Git taking care of the merging - it should exclude the changes to the
icons/scummvm.rc file; the fork had a hacked version of the path so that
compilation could previously work under MSVC9. I've since committed a
reversion, but it would be better to keep the two commits off of trunk if
possible.

Paul.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.scummvm.org/pipermail/scummvm-devel/attachments/20110410/a3d211e7/attachment.html>