[Scummvm-devel] Merged branch-1-3-0 into master

[Max Horn]

Am 01.06.2011 um 17:02 schrieb Marcus Comstedt:

> 
> Hi Max,
> 
> Max Horn <max at quendi.de> writes:
> 
>> For the PS2 and Dreamcast ports, there were changes that looked like they were meant only for the release builds. I moved this into commented out lines, with a comment "For release builds:" next to them.
> 
> In the DC case, that would be commit e4674689.  It touches
> backends/platform/dc/Makefile and configure.  For the Makefile, your
> resolution looks fine (I expect you meant 'DEFINES +=' and not 'DEFINES
> :=' in the comment, but it's just a comment anyway :),

Right :). Nevertheless, I just corrected it.

> but I'm a
> little curious about the configure script:  There is no comment about
> the correct value of LIBS in a release build, just about DEFINES
> (which is set in a completely different location).  Is this a result
> of the merging methodology, or did you deliberately choose to put a
> comment in only one of the two locations?

This is what happened: Looking at configure in the branch, and on master before the merge, the explanation is simple: The LIBS change is in one big section of configure that I moved around in master. So I had to diff the changes in that moved section manually. They also changed quite considerably, with a lot of rewrapping and other changes. I did notice the noserial change in roning, but since you had told me earlier that this was for release-only, I decided "OK, no relevant change in that section".

Then later, as I was working on the rest of the changes throughout the merge, I decided that I could keep the release only changes  (in commented out form) instead of discarding them. And it turns I screwed up twice in this regard: First, I forgot to comment out the lines in the PS2 Makefiles. Secondly, I forgot that I had seen a "noserial" in the LIBS section for the DC port, so I didn't add it back in.

Anyway, I fixed this now, and even changed the code to automatically do the right thing if "--enable-release" is used.


Cheers,
Max