From f46066011f804a4a1bcc0b820ac898811e627d9f Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 1 Apr 2019 23:55:14 +0530 Subject: [PATCH] gst-uninstalled: Add qt5 DLLs to PATH on Windows This is needed for using the qmlgl out of the box inside gst-uninstalled. Of course this won't work if the user is using a native file to specify the path to `qmake`. --- gst-uninstalled.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gst-uninstalled.py b/gst-uninstalled.py index 211c60ad53..982988a010 100755 --- a/gst-uninstalled.py +++ b/gst-uninstalled.py @@ -85,14 +85,20 @@ def get_subprocess_env(options, gst_version): 'gst-python', 'plugin')) prepend_env_var(env, "GST_PLUGIN_PATH", os.path.join(PREFIX_DIR, 'lib', 'gstreamer-1.0')) - prepend_env_var(env, "PATH", os.path.join(PREFIX_DIR, 'bin')) - prepend_env_var(env, lib_path_envvar, os.path.join(PREFIX_DIR, 'lib')) prepend_env_var(env, "GST_VALIDATE_SCENARIOS_PATH", os.path.join( PREFIX_DIR, 'share', 'gstreamer-1.0', 'validate', 'scenarios')) prepend_env_var(env, "GI_TYPELIB_PATH", os.path.join(PREFIX_DIR, 'lib', 'lib', 'girepository-1.0')) prepend_env_var(env, "PKG_CONFIG_PATH", os.path.join(PREFIX_DIR, 'lib', 'pkgconfig')) + # Library and binary search paths + prepend_env_var(env, "PATH", os.path.join(PREFIX_DIR, 'bin')) + if lib_path_envvar != 'PATH': + prepend_env_var(env, lib_path_envvar, os.path.join(PREFIX_DIR, 'lib')) + elif 'QMAKE' in os.environ: + # There's no RPATH on Windows, so we need to set PATH for the qt5 DLLs + prepend_env_var(env, 'PATH', os.path.dirname(os.environ['QMAKE'])) + meson = get_meson() targets_s = subprocess.check_output(meson + ['introspect', options.builddir, '--targets']) targets = json.loads(targets_s.decode())