Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GLK/ULTIMA: Disable unstable subengines by default #2453

Merged
merged 2 commits into from Sep 11, 2020

Conversation

@ccawley2011
Copy link
Member

ccawley2011 commented Sep 9, 2020

This is necessary on RISC OS to avoid linker errors due to the size of the executable.

@raziel-
Copy link
Contributor

raziel- commented Sep 9, 2020

@ccawley2011

Just curious.
How are you planning a release once all the engines are stable (and the executable size exceeds the magical size again)?

I might hit errors due to executable size on my platform aswell (some day) and am looking for workarounds before it bites me seriously.

Thank you

@ccawley2011
Copy link
Member Author

ccawley2011 commented Sep 9, 2020

The most likely answer is that I'll have to move to the newer EABI based toolchain for newer hardware and disable the heavier engines in builds for older hardware (I haven't done any in depth profiling, but I doubt that engines like sword25, wintermute or fullpipe would perform very well on the RiscPC, Iyonix or A9home). I don't want to make such major changes to my build environment so close to a release, however (since the RISC OS EABI toolchain is still very new), which is why I'm sticking to keeping the executable size down for now.

@rsn8887
Copy link
Contributor

rsn8887 commented Sep 10, 2020

If I apply this PR and run configure, the list of built-in engines (incorrectly?) states Ultima []. It seems a bit odd. I think the [] should probably contain the list of comma-separated stable sub-engine names. The list of skipped engines correctly shows Ultima [Ultima 1].

@dreammaster
Copy link
Member

dreammaster commented Sep 10, 2020

rsn8887: I agree, that does seem a bit odd. Ideally, is there a way to list the individual games for the supported engine without requiring the return to having each of the games as it's own sub-engine again.

@dreammaster
Copy link
Member

dreammaster commented Sep 10, 2020

Personally, I think it may be simpler to use #ifndef RELEASE_BUILD blocks around the unstable code. That's what I already did in the adrift sub-engine, to exclude detection entries for ADRIFT 6 games that aren't yet supported.

@ccawley2011 ccawley2011 force-pushed the ccawley2011:glk-ultima-unstable branch from d01279f to 61d6b2f Sep 10, 2020
@sev-
Copy link
Member

sev- commented Sep 10, 2020

There is a nice upcoming alternative, though. Once @aryanrawlani28 work on detection is merged, we finally could safely create split builds which will detect the games but inform the user of using another build, with the engine. This way, you could build scummvm and scummvm-glk...

@dreammaster dreammaster merged commit 608484f into scummvm:branch-2-2 Sep 11, 2020
2 of 4 checks passed
2 of 4 checks passed
Windows (win32, x86-windows, x86, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 flui... Windows (win32, x86-windows, x86, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 flui...
Details
Windows (x64, x64, x64-windows, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 fluids... Windows (x64, x64, x64-windows, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 fluids...
Details
Windows (arm64, arm64, arm64-windows, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 ...
Details
deepcode-ci-bot Well done, no issues found!
Details
@ccawley2011 ccawley2011 deleted the ccawley2011:glk-ultima-unstable branch Sep 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.