From daa53f9d523d4aaaf146a690b0fcc0228d736fa5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 Apr 2019 22:55:50 +0100 Subject: [PATCH] Current mxe is not building addr2line for the target; remove it from the install for now. --- cscript | 2 +- platform/windows/wscript | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cscript b/cscript index 428fddcab..870cdb39e 100644 --- a/cscript +++ b/cscript @@ -527,7 +527,7 @@ def package_windows(target): target.command('sed -i "s~%%graphics%%~%s/graphics~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) target.command('sed -i "s~%%static_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.windows_prefix, identifier)) target.command('sed -i "s~%%cdist_deps%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.directory, identifier)) - target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.mingw_path, identifier)) + target.command('sed -i "s~%%mingw%%~%s~g" build/platform/windows/installer2.%s.nsi' % (target.environment_prefix, identifier)) target.command('sed -i "s~%%binaries%%~%s/build~g" build/platform/windows/installer2.%s.nsi' % (os.getcwd(), identifier)) target.command('sed -i "s~%%bits%%~32~g" build/platform/windows/installer2.%s.nsi' % identifier) target.command('makensis build/platform/windows/installer2.%s.nsi' % identifier) diff --git a/platform/windows/wscript b/platform/windows/wscript index a6b705496..b1665bfa9 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -206,8 +206,7 @@ File "%cdist_deps%/bin/ffprobe.exe" print('File "%resources%/dcpomatic2_batch_debug.bat"', file=f) print('File "%resources%/dcpomatic2_kdm_debug.bat"', file=f) print('File "%resources%/dcpomatic2_player_debug.bat"', file=f) - print('File "%mingw%/gdb.exe"', file=f) - print('File "%mingw%/addr2line.exe"', file=f) + print('File "%mingw%/bin/gdb.exe"', file=f) else: print('File "%binaries%/src/wx/dcpomatic2-wx.dll"', file=f) print('File "%binaries%/src/lib/dcpomatic2.dll"', file=f) -- 2.30.2