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

MAKEFILE: Add dependencies for scummvm.rc #2919

Merged
merged 1 commit into from Apr 6, 2021
Merged

Conversation

@orgads
Copy link
Contributor

@orgads orgads commented Apr 5, 2021

When an engine is added or removed, it affects the embedded resources in
scummvm.rc, so config.mk is required.

Apart from that, list all the files it uses and set them as dependencies,
so if a file changes, the resource file will be rebuilt.

@orgads
Copy link
Contributor Author

@orgads orgads commented Apr 5, 2021

Don't merge yet. I need to run some more tests.

@orgads orgads force-pushed the orgads:rc-deps branch 3 times, most recently from 593100b to f756f1f Apr 6, 2021
When an engine is added or removed, it affects the embedded resources in
scummvm.rc, so config.mk is required.

+ Add some missing dependencies in win32.mk.
@orgads orgads force-pushed the orgads:rc-deps branch from f756f1f to fffff37 Apr 6, 2021
@orgads
Copy link
Contributor Author

@orgads orgads commented Apr 6, 2021

@ccawley2011 @digitall (others are welcome too ;))

This change currently lists all the required dependencies. Do you think it is valuable to have automatic tracking? I have a preliminary proposal in #2921 but I'm a bit reluctant about it. See my comment there.

What do you think?

@deepcode-ci-bot
Copy link

@deepcode-ci-bot deepcode-ci-bot bot commented Apr 6, 2021

Congratulations 🎉. DeepCode analyzed your code in 0.997 seconds and we found no issues. Enjoy a moment of no bugs ☀️.

👉 View analysis in DeepCode’s Dashboard | Configure the bot

@digitall
Copy link
Member

@digitall digitall commented Apr 6, 2021

@orgads: This change looks reasonable. I would suggest that it is not an exclusive-or situation. This PR should be merged and tested as an improvement... then the merits and issues with PR #2921 for automatic dependency tracking can be dealt with.

@orgads
Copy link
Contributor Author

@orgads orgads commented Apr 6, 2021

I agree. Merging then.

@orgads orgads merged commit be2b8e7 into scummvm:master Apr 6, 2021
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deepcode-ci-bot Well done, no issues found!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants