Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
b160086a
Commit
b160086a
authored
Jan 21, 2016
by
Steve Lhomme
Committed by
Rémi Denis-Courmont
Jan 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decklink: fix the CXXFLAGS overriding
Signed-off-by:
Rémi Denis-Courmont
<
remi@remlab.net
>
parent
c5939bff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
modules/access/Makefile.am
modules/access/Makefile.am
+1
-1
modules/video_output/Makefile.am
modules/video_output/Makefile.am
+1
-1
No files found.
modules/access/Makefile.am
View file @
b160086a
...
@@ -155,7 +155,7 @@ access_LTLIBRARIES += $(LTLIBlinsys_hdsdi) $(LTLIBlinsys_sdi)
...
@@ -155,7 +155,7 @@ access_LTLIBRARIES += $(LTLIBlinsys_hdsdi) $(LTLIBlinsys_sdi)
EXTRA_LTLIBRARIES
+=
liblinsys_hdsdi_plugin.la liblinsys_sdi_plugin.la
EXTRA_LTLIBRARIES
+=
liblinsys_hdsdi_plugin.la liblinsys_sdi_plugin.la
libdecklink_plugin_la_SOURCES
=
access/decklink.cpp access/sdi.c access/sdi.h
libdecklink_plugin_la_SOURCES
=
access/decklink.cpp access/sdi.c access/sdi.h
libdecklink_plugin_la_CXXFLAGS
=
$(AM_CFLAGS)
$(CPPFLAGS_decklink)
libdecklink_plugin_la_CXXFLAGS
=
$(AM_C
XX
FLAGS)
$(CPPFLAGS_decklink)
libdecklink_plugin_la_LIBADD
=
$(LIBS_decklink)
$(LIBDL)
-lpthread
libdecklink_plugin_la_LIBADD
=
$(LIBS_decklink)
$(LIBDL)
-lpthread
if
HAVE_DECKLINK
if
HAVE_DECKLINK
access_LTLIBRARIES
+=
libdecklink_plugin.la
access_LTLIBRARIES
+=
libdecklink_plugin.la
...
...
modules/video_output/Makefile.am
View file @
b160086a
...
@@ -5,7 +5,7 @@ EXTRA_DIST += video_output/README
...
@@ -5,7 +5,7 @@ EXTRA_DIST += video_output/README
if
HAVE_DECKLINK
if
HAVE_DECKLINK
libdecklinkoutput_plugin_la_SOURCES
=
video_output/decklink.cpp
libdecklinkoutput_plugin_la_SOURCES
=
video_output/decklink.cpp
libdecklinkoutput_plugin_la_CXXFLAGS
=
$(AM_CFLAGS)
$(CPPFLAGS_decklinkoutput)
libdecklinkoutput_plugin_la_CXXFLAGS
=
$(AM_C
XX
FLAGS)
$(CPPFLAGS_decklinkoutput)
libdecklinkoutput_plugin_la_LIBADD
=
$(LIBS_decklink)
$(LIBDL)
-lpthread
libdecklinkoutput_plugin_la_LIBADD
=
$(LIBS_decklink)
$(LIBDL)
-lpthread
vout_LTLIBRARIES
+=
libdecklinkoutput_plugin.la
vout_LTLIBRARIES
+=
libdecklinkoutput_plugin.la
endif
endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment