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 win32 linker hell and more #3410

Merged
merged 5 commits into from
Jun 16, 2016
Merged

Fix win32 linker hell and more #3410

merged 5 commits into from
Jun 16, 2016

Conversation

nfedera
Copy link
Contributor

@nfedera nfedera commented Jun 16, 2016

winpr: fix win32 linking issues
Depending on the windows target version (WIN32_WINNT), the used SDK and the build configuration the linker will see multiple libraries exporting the same symbols.
To prevent ugly hacks (e.g. modifying cmake's default system libraries or fragile library linking order chains) we prefix these functions with "winpr
" and create corresponding defines to keep the current api names.

freerdp: remove static inet_ntop
inet_ntop is already implemented in winpr

cmake: remove some void statements and fix winpr source group

cmake: replaced STATIC_CHANNELS with BUILTIN_CHANNELS

channels/audin/client/winmm: requires winpr

nfedera added 5 commits June 15, 2016 13:30
inet_ntop is already implemented in winpr
Depending on the windows target version (_WIN32_WINNT), the used
SDK and the build configuration the linker will see multiple
libraries exporting the same symbols.
To prevent ugly hacks (e.g. modifying cmake's default system
libraries or fragile library linking order chains) we prefix
these functions with "winpr_" and create corresponding defines
to keep the current api names.
@freerdp-bot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://ci.freerdp.com//job/PullRequestTester/1299/

@bmiklautz
Copy link
Member

@nfedera wow. Great job. That saves a lot of troubles. I like the renaming from STATIC_CHANNELS to BUILTIN_CHANNELS very much - that makes it more clear what it in fact does.

+1

@akallabeth
Copy link
Member

nice job!

@mfleisz mfleisz merged commit f166f5d into FreeRDP:master Jun 16, 2016
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.

5 participants