Current mxe is not building addr2line for the target; remove it from the install...
authorCarl Hetherington <cth@carlh.net>
Mon, 8 Apr 2019 21:55:50 +0000 (22:55 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 8 Apr 2019 21:55:50 +0000 (22:55 +0100)
cscript
platform/windows/wscript

diff --git a/cscript b/cscript
index 428fddc..870cdb3 100644 (file)
--- 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)
index a6b7054..b1665bf 100644 (file)
@@ -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)