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
56d009ad
Commit
56d009ad
authored
Feb 19, 2006
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Propagate libvlc move in plugins
parent
238cc870
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
8 deletions
+5
-8
activex/Makefile.am
activex/Makefile.am
+1
-1
bindings/mediacontrol-python/setup.py
bindings/mediacontrol-python/setup.py
+2
-2
mozilla/Makefile.am
mozilla/Makefile.am
+2
-5
No files found.
activex/Makefile.am
View file @
56d009ad
...
@@ -59,7 +59,7 @@ DIST_misc = \
...
@@ -59,7 +59,7 @@ DIST_misc = \
test.html
\
test.html
\
$(NULL)
$(NULL)
LIBRARIES_libvlc
=
$(top_builddir)
/
lib
/libvlc.a
LIBRARIES_libvlc
=
$(top_builddir)
/
src
/libvlc.a
if
BUILD_ACTIVEX
if
BUILD_ACTIVEX
...
...
bindings/mediacontrol-python/setup.py
View file @
56d009ad
...
@@ -3,10 +3,10 @@ import os
...
@@ -3,10 +3,10 @@ import os
if
os
.
sys
.
platform
in
(
'win32'
,
'darwin'
):
if
os
.
sys
.
platform
in
(
'win32'
,
'darwin'
):
# Do not use PIC version on win32 and Mac OS X
# Do not use PIC version on win32 and Mac OS X
vlclib
=
'../../
lib
/libvlc.a'
vlclib
=
'../../
src
/libvlc.a'
picflag
=
''
picflag
=
''
else
:
else
:
vlclib
=
'../../
lib
/libvlc_pic.a'
vlclib
=
'../../
src
/libvlc_pic.a'
picflag
=
'pic'
picflag
=
'pic'
def
get_vlcconfig
():
def
get_vlcconfig
():
...
...
mozilla/Makefile.am
View file @
56d009ad
...
@@ -26,6 +26,8 @@ DIST_misc = \
...
@@ -26,6 +26,8 @@ DIST_misc = \
vlcintf.idl
\
vlcintf.idl
\
$(NULL)
$(NULL)
LIBRARIES_libvlc
=
$(top_builddir)
/src/libvlc.a
if
BUILD_MOZILLA
if
BUILD_MOZILLA
# Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix
# Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix
...
@@ -33,7 +35,6 @@ if BUILD_MOZILLA
...
@@ -33,7 +35,6 @@ if BUILD_MOZILLA
# under Win32 and npunix.c under Unix.
# under Win32 and npunix.c under Unix.
if
HAVE_WIN32
if
HAVE_WIN32
LIBRARIES_libvlc
=
$(top_builddir)
/lib/libvlc.a
npvlc_DATA
=
npvlc
$(LIBEXT)
npvlc_DATA
=
npvlc
$(LIBEXT)
npvlcdir
=
$(libdir)
npvlcdir
=
$(libdir)
...
@@ -52,8 +53,6 @@ LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc bu
...
@@ -52,8 +53,6 @@ LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc bu
else
else
if
HAVE_DARWIN
if
HAVE_DARWIN
LIBRARIES_libvlc
=
$(top_builddir)
/lib/libvlc.a
npvlc_DATA
=
npvlc
$(LIBEXT)
npvlc_DATA
=
npvlc
$(LIBEXT)
npvlcdir
=
$(libdir)
npvlcdir
=
$(libdir)
...
@@ -87,8 +86,6 @@ VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib
...
@@ -87,8 +86,6 @@ VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib
else
else
LIBRARIES_libvlc
=
$(top_builddir)
/lib/libvlc_pic.a
npvlc_DATA
=
libvlcplugin
$(LIBEXT)
npvlc_DATA
=
libvlcplugin
$(LIBEXT)
npvlcdir
=
$(libdir)
/mozilla/plugins
npvlcdir
=
$(libdir)
/mozilla/plugins
...
...
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