Fix LD_LIBRARY_PATH for MSYS

Windows doesn't have LD_LIBRARY_PATH, PATH must be used instead. Allows
ardev to be used with Windows/MSYS.
This commit is contained in:
Franke Burgarino 2025-11-20 13:50:51 -06:00
parent bb6171bbb2
commit 94fc3aae47
2 changed files with 12 additions and 2 deletions

View file

@ -47,10 +47,10 @@ export ARDOUR_DLL_PATH=$libs
export GTK_PATH=~/.ardour3:$libs/clearlooks-newer
export VAMP_PATH=$libs/vamp-plugins:$libs/vamp-pyin${VAMP_PATH:+:$VAMP_PATH}
export LD_LIBRARY_PATH=$libs/tk/ydk-pixbuf:$libs/tk/ztk::$libs/tk/ydk:$libs/tk/ytk:$libs/tk/ztkmm:$libs/tk/ydkmm:$libs/tk/ytkmm:$libs/tk/suil:$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/ctrl-interface/control_protocol:$libs/ctrl-interface/midi_surface:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/aaf:$libs/gtkmm2ext:$libs/widgets:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/temporal:$libs/libltc:$libs/canvas:$libs/waveview:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export @LD_LIBRARY_PATH@=$libs/tk/ydk-pixbuf:$libs/tk/ztk::$libs/tk/ydk:$libs/tk/ytk:$libs/tk/ztkmm:$libs/tk/ydkmm:$libs/tk/ytkmm:$libs/tk/suil:$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/ctrl-interface/control_protocol:$libs/ctrl-interface/midi_surface:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/aaf:$libs/gtkmm2ext:$libs/widgets:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/temporal:$libs/libltc:$libs/canvas:$libs/waveview:$libs/ardouralsautil${@LD_LIBRARY_PATH@:+:$@LD_LIBRARY_PATH@}
# DYLD_LIBRARY_PATH is for darwin.
export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
export DYLD_FALLBACK_LIBRARY_PATH=@LD_LIBRARY_PATH@
# allow Ardour to run when configured with --address-sanitizer
# - halt_on_error=0 - why would we?

View file

@ -4,6 +4,7 @@ from waflib import Options, TaskGen
import waflib.Logs as Logs, waflib.Utils as Utils
import os
import sys
import platform as PLATFORM
import re
import subprocess
import glob
@ -734,6 +735,15 @@ def build(bld):
'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION']
}
if bld.env['build_target'] == 'mingw' and sys.platform == "win32":
wrapper_subst_dict.update({
'LD_LIBRARY_PATH': 'PATH'
})
else:
wrapper_subst_dict.update({
'LD_LIBRARY_PATH': 'LD_LIBRARY_PATH'
})
def set_subst_dict(obj, dict):
for i in dict:
setattr(obj, i, dict[i])