From dcaa19dca7ca1077c6a1991dafd8f3eb5be069a7 Mon Sep 17 00:00:00 2001 From: Arthur Huillet Date: Sun, 21 Jul 2013 13:57:33 +0000 Subject: [PATCH] csc_nvcuda: add hardcoded paths to setup.py git-svn-id: https://xpra.org/svn/Xpra/trunk@3932 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/setup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/setup.py b/src/setup.py index 61e37b0149..7d9a2625dd 100755 --- a/src/setup.py +++ b/src/setup.py @@ -1012,11 +1012,12 @@ def make_constants(*paths): **swscale_pkgconfig), min_version=(0, 16)) toggle_packages(csc_nvcuda_ENABLED, "xpra.codecs.csc_nvcuda") -#if csc_nvcuda_ENABLED: -# nvcuda_pkgconfig = pkgconfig("cuda") -# cython_add(Extension("xpra.codecs.csc_nvcuda.colorspace_converter", -# ["xpra/codecs/csc_nvcuda/colorspace_converter.pyx", "xpra/codecs/csc_nvcuda/csc_nvcuda.c"], -# **nvcuda_pkgconfig), min_version=(0, 16)) +if csc_nvcuda_ENABLED: + cython_add(Extension("xpra.codecs.csc_nvcuda.colorspace_converter", + ["xpra/codecs/csc_nvcuda/colorspace_converter.pyx", "xpra/codecs/csc_nvcuda/csc_nvcuda.c"], + include_dirs = ['/opt/cuda/include','/usr/local/cuda/include'], + libraries = ['cudart', 'npp', 'cuda'], + library_dirs = ['/opt/cuda/lib64']), min_version=(0, 16)) toggle_packages(vpx_ENABLED, "xpra.codecs.vpx")