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
f8ba1a11
Commit
f8ba1a11
authored
Sep 25, 2006
by
Olivier Aubert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mediacontrol-python: try to fix r16794
parent
4c5ad8e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
bindings/mediacontrol-python/Makefile.am
bindings/mediacontrol-python/Makefile.am
+1
-1
bindings/mediacontrol-python/setup.py
bindings/mediacontrol-python/setup.py
+6
-8
No files found.
bindings/mediacontrol-python/Makefile.am
View file @
f8ba1a11
...
...
@@ -16,7 +16,7 @@ else
endif
all
:
top_srcdir
=
"
$(top_
srcdir)
"
top_builddir
=
"
$(top_builddir)
"
python
"
$(srcdir)
/setup.py"
build
$(COMPILERARG)
"--build-base=
$(top_builddir)
/bindings/mediacontrol-python"
"--build-temp=
$(top_builddir)
/bindings/mediacontrol-python"
srcdir
=
"
$(
srcdir)
"
top_builddir
=
"
$(top_builddir)
"
python
"
$(srcdir)
/setup.py"
build
$(COMPILERARG)
"--build-base=
$(top_builddir)
/bindings/mediacontrol-python"
"--build-temp=
$(top_builddir)
/bindings/mediacontrol-python"
# FIXME: python setup.py install does not have any option to install from a different build directory
# so this will not work in a separate builddir
...
...
bindings/mediacontrol-python/setup.py
View file @
f8ba1a11
...
...
@@ -14,17 +14,15 @@ if not top_builddir:
os
.
environ
[
'top_builddir'
]
=
top_builddir
try
:
top_srcdir
=
os
.
environ
[
'top_
srcdir'
]
srcdir
=
os
.
environ
[
'
srcdir'
]
except
KeyError
:
# Note: same as above
srcdir
=
None
if
not
top_srcdir
:
top_srcdir
=
os
.
path
.
join
(
'..'
,
'..'
)
os
.
environ
[
'top_srcdir'
]
=
top_srcdir
if
not
srcdir
:
srcdir
=
'.'
vlclib
=
"-L"
+
os
.
path
.
join
(
top_builddir
,
'src'
)
+
"
-lvlc"
vlclib
=
"
-lvlc"
picflag
=
''
srcdir
=
os
.
path
.
join
(
top_srcdir
,
'bindings'
,
'mediacontrol-python'
)
def
get_vlcconfig
():
vlcconfig
=
None
...
...
@@ -79,12 +77,12 @@ source_files = [ 'vlc_module.c' ]
vlclocal
=
Extension
(
'vlc'
,
sources
=
[
os
.
path
.
join
(
srcdir
,
f
)
for
f
in
source_files
],
include_dirs
=
[
top_builddir
,
os
.
path
.
join
(
top_srcdir
,
'include'
),
os
.
path
.
join
(
srcdir
,
'..'
,
'..'
,
'include'
),
srcdir
,
'/usr/win32/include'
],
extra_objects
=
[
vlclib
],
extra_compile_args
=
get_cflags
(),
extra_link_args
=
[
'-L'
+
top_builddir
]
+
get_ldflags
(),
extra_link_args
=
[
'-L'
+
os
.
path
.
join
(
top_builddir
,
'src'
)
]
+
get_ldflags
(),
)
setup
(
name
=
'VLC Bindings'
,
...
...
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