From cd7d2ff8128e17e6ced57ec73c5bc811969767ce Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 7 May 2014 16:52:34 +0000 Subject: [PATCH] py2exe needs the pthread dll for enc_x264 git-svn-id: https://xpra.org/svn/Xpra/trunk@6398 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/setup.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/setup.py b/src/setup.py index d663f1efa3..500255dfda 100755 --- a/src/setup.py +++ b/src/setup.py @@ -1121,6 +1121,14 @@ def add_gui_exe(*args): #but we use something more generic, without the version numbers: add_data_files('', [webp_bin_dir+"\\libwebp.dll"]) add_data_files('webm', ["xpra/codecs/webm/LICENSE"]) + if enc_x264_ENABLED: + add_data_files('', ['%s\\libx264.dll' % x264_bin_dir]) + #find pthread DLL... + for x in (["C:\\MinGW\\bin"]+os.environ.get("PATH").split(";")): + f = os.path.join(x, "pthreadGC2.dll") + if os.path.exists(f): + add_data_files('', [f]) + break #END OF py2exe SECTION #UI applications (detached from shell: no text output if ran from cmd.exe) @@ -1296,8 +1304,6 @@ def pkgconfig(*pkgs_options, **ekw): if not isinstance(e, WindowsError) or (not "already exists" in str(e)): #@UndefinedVariable raise - if enc_x264_ENABLED: - add_data_files('', ['%s\\libx264.dll' % x264_bin_dir]) html5_dir = '' #END OF win32