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

Fix a symbol being defined twice #174

Merged
merged 1 commit into from
Oct 16, 2022

Conversation

untodesu
Copy link

HexEditted particles.lib renaming _hypot to _STUB1 to avoid linker error-ing about a symbol being defined twice.
I was unable to find any traces of /force:multiple in vpc_scripts though.


PR Checklist

  • My PR follows all guidelines in the CONTRIBUTING.md file
  • My PR targets a develop branch OR targets another branch with a specific goal in mind

Avoid _hypot being defined twice by renaming it to _STUB1
Taken from my own code at untodesu/refraction#14
@untodesu
Copy link
Author

untodesu commented Jan 26, 2022

What is that commit reference history wall over there

@untodesu untodesu changed the base branch from master to develop January 26, 2022 20:32
@Blixibon
Copy link
Member

What is that commit reference history wall over there

It's from targeting the master branch, which you claimed in the PR checklist you weren't doing

@untodesu
Copy link
Author

untodesu commented Jan 26, 2022

Whoops, fixed and confirmed - I am blind as hell

@Blixibon
Copy link
Member

Does this function when compiling under VS2013?

@untodesu
Copy link
Author

Does this function when compiling under VS2013?

I don't see any reasons to fail as particles.lib doesn't use _hypot in any way and just embeds the whole thing. However let me check...

@untodesu
Copy link
Author

So it builds and runs on my source code tree.
Now checking mapbase...

@untodesu
Copy link
Author

It builds and runs.

@Blixibon Blixibon merged commit e9ade19 into mapbase-source:develop Oct 16, 2022
VDeltaGabriel pushed a commit to Project-P2009/p2009_sdk that referenced this pull request Apr 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants