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 compilation with LC_ONLY_DECODER #47

Merged
merged 1 commit into from
Mar 11, 2020
Merged

fix compilation with LC_ONLY_DECODER #47

merged 1 commit into from
Mar 11, 2020

Conversation

neheb
Copy link
Contributor

@neheb neheb commented Mar 11, 2020

881b5e2 broke compilation by always
defining DRN and DRM_PS. Fix this and place the define where it belongs.

@fabiangreffrath
Copy link
Collaborator

But now you unconditionally enable DRM support, even in the non-DRM build. This cannot be correct, either.

How about this: We pass a new macro at build stage

libfaad_drm_la_CFLAGS = ${libfaad_la_CFLAGS} -DDRM_SUPPORT

and then define DRM and DRM_PS in the libfaad/common.h header file only if this macro is defined

#ifdef DRM_SUPPORT
#define DRM
#define DRM_PS
#endif

so we can #undef them later if LC_ONLY_DECODER is defined.

@neheb
Copy link
Contributor Author

neheb commented Mar 11, 2020

That's already the case. See: #15

881b5e2 broke compilation by always
defining DRN and DRM_PS. Fix this and place the define where it belongs.
@neheb
Copy link
Contributor Author

neheb commented Mar 11, 2020

Applied suggested changes.

@fabiangreffrath
Copy link
Collaborator

That's already the case. See: #15

No, it's not. It creates two shared libraries, one with DRM support (libfaad_drm.la) and one without (libfaad.la).

@fabiangreffrath fabiangreffrath merged commit 74e949f into knik0:master Mar 11, 2020
@neheb neheb deleted the nolc branch March 11, 2020 10:34
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.

2 participants