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

BASE: WIN32: Exclude scummvm's base directory from plugin path #2448

Merged
merged 1 commit into from Sep 13, 2020

Conversation

@lotharsm
Copy link
Member

lotharsm commented Sep 6, 2020

Currently, the plugin architecture searches for plugins in ScummVM's
base directory and in the plugins directory itself.

However, for Win32, we need to bundle several DLL files in order to
make ScummVM run at all. Currently, this leads to several warning
messages since ScummVM tries to load those DLLs as plugins.

This patch excludes the ScummVM base directory when running on Win32 and
only accepts plugins from the plugins directory.

Currently, the plugin architecture searches for plugins in ScummVM's
base directory and in the plugins directory itself.

However, for Win32, we need to bundle several DLL files in order to
make ScummVM run at all. Currently, this leads to several warning
messages since ScummVM tries to load those DLLs as plugins.

This patch excludes the ScummVM base directory when running on Win32 and
only accepts plugins from the plugins directory.
@henke37
Copy link
Contributor

henke37 commented Sep 6, 2020

I think this was by design. Bad design. I support this fix.

@lotharsm
Copy link
Member Author

lotharsm commented Sep 12, 2020

@aryanrawlani28 Would this change in any shape or form interfere with your plans regarding the plugins system? Otherwise, I'll merge this to master soon.

@aryanrawlani28
Copy link
Contributor

aryanrawlani28 commented Sep 12, 2020

@lotharsm Thanks for letting me know! No, it doesn't really effect my plugins PR. Feel free to merge :)

@lotharsm lotharsm merged commit 51c4247 into scummvm:master Sep 13, 2020
5 checks passed
5 checks passed
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...
Details
Windows (arm64, arm64, arm64-windows, --enable-faad --enable-mpeg2 --disable-fribidi, curl faad2 ...
Details
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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

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