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

DIRECTOR: Fix compilation on platforms with dynamic detection #3058

Merged
merged 2 commits into from Jun 13, 2021

Conversation

@ccawley2011
Copy link
Member

@ccawley2011 ccawley2011 commented Jun 10, 2021

No description provided.

@sev-
Copy link
Member

@sev- sev- commented Jun 10, 2021

What will happen with static builds (static detection and static engine), will it not have duplicated symbols? If it does, then we need to wrap it in a #ifndef DETECTION_STATIC

@lephilousophe
Copy link
Member

@lephilousophe lephilousophe commented Jun 10, 2021

It's a static variable so content will get duplicated but it won't fail to build.

@lephilousophe
Copy link
Member

@lephilousophe lephilousophe commented Jun 12, 2021

@ccawley2011 I have a fix to avoid duplicate storage.
I can push it to your branch if you want.

@lephilousophe
Copy link
Member

@lephilousophe lephilousophe commented Jun 13, 2021

Just pushed the fix.
@sev- it may be OK for you now.

@sev-
Copy link
Member

@sev- sev- commented Jun 13, 2021

Yes, thank you!

@sev- sev- merged commit 1d6b27d into scummvm:master Jun 13, 2021
2 checks passed
2 checks passed
@codacy-production
Codacy Static Code Analysis Codacy Static Code Analysis
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ccawley2011 ccawley2011 deleted the ccawley2011:director-detection branch Jun 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants