Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
4e06876b
Commit
4e06876b
authored
Feb 19, 2006
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Attempt to fix vlc linkage with static libvlc
parent
5f27fad5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
Makefile.am
Makefile.am
+4
-2
No files found.
Makefile.am
View file @
4e06876b
...
...
@@ -220,12 +220,14 @@ endif
if
BUILD_SHARED
LIB_libvlc
=
src/libvlc
$(LIBEXT)
LIB_libvlc_config
=
vlc
#-Wl,-rpath $(libdir)
else
LIB_libvlc
=
src/libvlc.a
LIB_libvlc_config
=
vlc
builtin
endif
vlc_LDFLAGS
=
`
$(VLC_CONFIG)
--libs
vlc
`
$(vlc_WORKAROUNDLDFLAGS)
vlc_LDFLAGS
=
`
$(VLC_CONFIG)
--libs
$(LIB_vlc_config)
`
$(vlc_WORKAROUNDLDFLAGS)
vlc_LDADD
=
$(LIB_libvlc)
$(DATA_win32_rc)
$(INCLUDED_LIBINTL)
vlc_CFLAGS
=
`
$(VLC_CONFIG)
--cflags
vlc
`
...
...
@@ -235,7 +237,7 @@ DEPENDENCIES_vlc = $(LIB_libvlc) $(DATA_win32_rc)
vlc$(EXEEXT)
:
$(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
@
rm
-f
vlc
$(EXEEXT)
@
case
`
$(VLC_CONFIG)
--linkage
vlc
`
in
\
@
case
`
$(VLC_CONFIG)
--linkage
$(LIB_libvlc_config)
`
in
\
c++
)
cmd
=
"
$(CXXLINK)
"
;;
\
objc
)
cmd
=
"
$(OBJCLINK)
"
;;
\
c|
*
)
cmd
=
"
$(LINK)
"
;;
\
...
...
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