Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
7483d688
Commit
7483d688
authored
Sep 11, 2006
by
Sam Hocevar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Always use PIC to build the Mozilla plugin.
parent
c8f13a2b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
17 deletions
+4
-17
configure.ac
configure.ac
+0
-13
mozilla/Makefile.am
mozilla/Makefile.am
+4
-4
No files found.
configure.ac
View file @
7483d688
...
...
@@ -5468,19 +5468,6 @@ AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no
AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"],
FILE_LIBVLC_DLL="" )
dnl
dnl we need pic on amd64 fo the mozilla plugin
case "${target_cpu}" in
x86_64)
pic=pic
;;
*)
pic=""
;;
esac
AC_SUBST(pic)
dnl Import conditional variables generated by bootstrap
VLC_CONDITIONALS
...
...
mozilla/Makefile.am
View file @
7483d688
...
...
@@ -159,11 +159,11 @@ libvlcplugin_la_LDFLAGS = `$(VLC_CONFIG) --libs mozilla` -module -avoid-version
libvlcplugin_la_LIBADD
=
../src/libvlc.la
libnpvlc_a_SOURCES
=
$(SOURCES_mozilla_common)
$(SOURCES_support)
libnpvlc_a_CFLAGS
=
`
$(VLC_CONFIG)
--cflags
mozilla
$(pic)
`
\
libnpvlc_a_CFLAGS
=
`
$(VLC_CONFIG)
--cflags
mozilla
pic
`
\
$(CPPFLAGS_mozilla_EXTRA)
libnpvlc_a_CXXFLAGS
=
`
$(VLC_CONFIG)
--cxxflags
mozilla
$(pic)
`
\
libnpvlc_a_CXXFLAGS
=
`
$(VLC_CONFIG)
--cxxflags
mozilla
pic
`
\
$(CPPFLAGS_mozilla_EXTRA)
LDFLAGS_libnpvlc
=
$(LDFLAGS_npvlc)
`
$(VLC_CONFIG)
--libs
mozilla vlc
builtin
$(pic)
`
LDFLAGS_libnpvlc
=
$(LDFLAGS_npvlc)
`
$(VLC_CONFIG)
--libs
mozilla vlc
builtin
pic
`
libnpvlc_a_DEPENDENCIES
=
$(DATA_npvlc_rc)
$(npvlc)
:
$(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
...
...
@@ -176,7 +176,7 @@ $(npvlc): $(libnpvlc_a_OBJECTS) $(libnpvlc_a_DEPENDENCIES) stamp-pic
# Stamp rules
###############################################################################
stamp-pic
:
@
for
dep
in
""
`
$(VLC_CONFIG)
--target
builtin
$(pic)
`
;
do
\
@
for
dep
in
""
`
$(VLC_CONFIG)
--target
builtin
pic
`
;
do
\
if
test
"
$
${dep}
"
-nt
"
$(LIBRARIES_mozilla)
"
;
then
\
rm
-f
$@
;
\
break
;
\
...
...
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