Skip to content

Commit

Permalink
py2exe needs the pthread dll for enc_x264
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@6398 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed May 7, 2014
1 parent 20f616f commit cd7d2ff
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit cd7d2ff

Please sign in to comment.