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 dlfcn-win32 include after p8-platform rename #8926

Merged
merged 1 commit into from
Jan 20, 2016

Conversation

FernetMenta
Copy link
Contributor

No description provided.

@FernetMenta FernetMenta added Type: Fix non-breaking change which fixes an issue v17 Krypton labels Jan 20, 2016
@FernetMenta
Copy link
Contributor Author

jenkins build addons

@FernetMenta
Copy link
Contributor Author

jenkins build addons please

@FernetMenta
Copy link
Contributor Author

beyond my skills @opdenkamp @fetzerch @wsnipex could you follow up?

@akva2
Copy link
Contributor

akva2 commented Jan 20, 2016

you simply change the line i pointed to, and make it just ${CMAKE_INSTALL_PREFIX}/include. and remove the following 3 lines (the if(WIN32) bit).

@akva2
Copy link
Contributor

akva2 commented Jan 20, 2016

note that kodiplatform and kodi sets prefixed include paths as well. so this will make things inconsistent.

in my original draft it was consistently non-prefixed include paths, but that was changed by you guys.

@Montellese
Copy link
Member

IIRC I added that win32 specific include path because one of the header files that we share with kodi core couldn't handle the include path including the "platform" bit because there the header file is simply part of xbmc/addons/include. But I don't know if that's still the case.

EDIT: Ah looks like this has been fixed differently, see https://github.com/xbmc/xbmc/blob/master/addons/library.xbmc.addon/libXBMC_addon.h#L41

@FernetMenta
Copy link
Contributor Author

objections if I merge this? at least it fixed current build for win32. you can still adapt cmake to whatever you prefer

@MartijnKaijser
Copy link
Member

@Memphiz ping. Jenkins needs some binary addons love as the ios builder isn't doing something.

@opdenkamp
Copy link
Member

fine with me

@Memphiz
Copy link
Member

Memphiz commented Jan 20, 2016

sorry for that - should be fixed ... might need to kill and retrigger ... sry - on the run

FernetMenta added a commit that referenced this pull request Jan 20, 2016
fix dlfcn-win32 include after p8-platform rename
@FernetMenta FernetMenta merged commit eb09837 into xbmc:master Jan 20, 2016
@FernetMenta FernetMenta deleted the platform branch January 20, 2016 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Fix non-breaking change which fixes an issue v17 Krypton
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants