From bd4071765985356faa6c140c7ccf013765cdc85b Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 14 Jan 2014 10:23:37 +0000 Subject: [PATCH] win32 ugly versioned paths for ffmpeg git-svn-id: https://xpra.org/svn/Xpra/trunk@5187 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/setup.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/setup.py b/src/setup.py index 740e02f9f5..7732770013 100755 --- a/src/setup.py +++ b/src/setup.py @@ -602,7 +602,14 @@ def glob_recurse(srcdir): cuda_bin_dir = os.path.join(cuda_path, "bin") #ffmpeg is needed for both swscale and x264: - libffmpeg_path = "C:\\ffmpeg-win32-bin" + if dec_avcodec_ENABLED: + assert not dec_avcodec2_ENABLED, "cannot enable both dec_avcodec and dec_avcodec2" + libffmpeg_path = "C:\\ffmpeg-win32-bin" + elif dec_avcodec2_ENABLED: + assert not dec_avcodec_ENABLED, "cannot enable both dec_avcodec and dec_avcodec2" + libffmpeg_path = "C:\\ffmpeg2-win32-bin" + else: + libffmpeg_path = "UNUSED" libffmpeg_include_dir = os.path.join(libffmpeg_path, "include") libffmpeg_lib_dir = os.path.join(libffmpeg_path, "lib") libffmpeg_bin_dir = os.path.join(libffmpeg_path, "bin")