Commit f8ba1a11 authored by Olivier Aubert's avatar Olivier Aubert
Browse files

mediacontrol-python: try to fix r16794

parent 4c5ad8e3
...@@ -16,7 +16,7 @@ else ...@@ -16,7 +16,7 @@ else
endif endif
all: 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 # 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 # so this will not work in a separate builddir
......
...@@ -14,17 +14,15 @@ if not top_builddir: ...@@ -14,17 +14,15 @@ if not top_builddir:
os.environ['top_builddir'] = top_builddir os.environ['top_builddir'] = top_builddir
try: try:
top_srcdir=os.environ['top_srcdir'] srcdir=os.environ['srcdir']
except KeyError: except KeyError:
# Note: same as above # Note: same as above
srcdir=None srcdir=None
if not top_srcdir: if not srcdir:
top_srcdir = os.path.join( '..', '..' ) srcdir = '.'
os.environ['top_srcdir'] = top_srcdir
vlclib= "-L" + os.path.join( top_builddir, 'src') + " -lvlc" vlclib="-lvlc"
picflag='' picflag=''
srcdir=os.path.join( top_srcdir, 'bindings', 'mediacontrol-python' )
def get_vlcconfig(): def get_vlcconfig():
vlcconfig=None vlcconfig=None
...@@ -79,12 +77,12 @@ source_files = [ 'vlc_module.c' ] ...@@ -79,12 +77,12 @@ source_files = [ 'vlc_module.c' ]
vlclocal = Extension('vlc', vlclocal = Extension('vlc',
sources = [ os.path.join( srcdir, f ) for f in source_files ], sources = [ os.path.join( srcdir, f ) for f in source_files ],
include_dirs = [ top_builddir, include_dirs = [ top_builddir,
os.path.join( top_srcdir, 'include' ), os.path.join( srcdir, '..', '..', 'include' ),
srcdir, srcdir,
'/usr/win32/include' ], '/usr/win32/include' ],
extra_objects = [ vlclib ], extra_objects = [ vlclib ],
extra_compile_args = get_cflags(), 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', setup (name = 'VLC Bindings',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment