Current mxe is not building addr2line for the target; remove it from the install...

[dcpomatic.git] / platform / windows / wscript

diff --git a/platform/windows/wscript b/platform/windows/wscript
index baca6b55359448070c4aac3e8537843e8e699072..b1665bfa9fc99fb5da8bba308228e7171fd7e3b7 100644 (file)
--- 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)
@@ -294,7 +293,7 @@ SetOutPath "$INSTDIR"
 File "%resources%/../../fonts/LiberationSans-Regular.ttf"
 File "%resources%/../../fonts/LiberationSans-Italic.ttf"
 File "%resources%/../../fonts/LiberationSans-Bold.ttf"
-File "%resources%/../../fonts/fonts.conf"
+File /oname=fonts.conf "%resources%/../../fonts/fonts.conf.windows"
 File "%graphics%/splash.png"
 File "%graphics%/zoom.png"
 File "%graphics%/zoom_all.png"