Browse Source

zrythm_launch: use DYLD_LIBRARY_PATH on macos

split_cycle
parent
commit
12baa54e9d
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 3
      data/meson.build
  2. 2
      data/zrythm_launch.in
  3. 6
      inc/utils/gtk.h
  4. 15
      src/utils/gtk.c

3
data/meson.build

@ -52,6 +52,9 @@ zrythm_launcher_config.set ( @@ -52,6 +52,9 @@ zrythm_launcher_config.set (
zrythm_launcher_config.set (
'ZRYTHM_CARLA_LIBDIR', zrythm_libdir / 'carla')
zrythm_launcher_config.set ('LIBDIR', libdir)
zrythm_launcher_config.set (
'LD_LIBRARY_PATH_ENV',
os_darwin ? 'DYLD_LIBRARY_PATH' : 'LD_LIBRARY_PATH')
# install desktop file and launcher scripts
if os_gnu or os_freebsd or os_darwin

2
data/zrythm_launch.in

@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
# along with Zrythm. If not, see <https://www.gnu.org/licenses/>.
jack_path=$(dirname $(ldconfig -p | grep 'libjack.so ' | head -n 1 | cut -d ' ' -f 4))
export LD_LIBRARY_PATH="@ZRYTHM_CARLA_LIBDIR@:@ZRYTHM_LIBDIR@:$jack_path:@LIBDIR@:$LD_LIBRARY_PATH"
export @LD_LIBRARY_PATH_ENV@="@ZRYTHM_CARLA_LIBDIR@:@ZRYTHM_LIBDIR@:$jack_path:@LIBDIR@:$@LD_LIBRARY_PATH_ENV@"
export GSETTINGS_SCHEMA_DIR=@SCHEMAS_DIR@

6
inc/utils/gtk.h

@ -732,6 +732,12 @@ z_gtk_window_get_windows_hwnd ( @@ -732,6 +732,12 @@ z_gtk_window_get_windows_hwnd (
GtkWindow * window);
#endif
#ifdef __APPLE__
void *
z_gtk_window_get_nsview (
GtkWindow * window);
#endif
/**
* Creates a new pixbuf for the given icon scaled
* at the given width/height.

15
src/utils/gtk.c

@ -2045,6 +2045,21 @@ z_gtk_window_get_windows_hwnd ( @@ -2045,6 +2045,21 @@ z_gtk_window_get_windows_hwnd (
}
#endif
#ifdef __APPLE__
void *
z_gtk_window_get_nsview (
GtkWindow * window)
{
GtkNative * native = GTK_NATIVE (window);
GdkSurface * surface =
gtk_native_get_surface (native);
void * nsview =
gdk_macos_surface_get_view (surface);
g_return_val_if_fail (nsview, NULL);
return nsview;
}
#endif
/**
* Creates a new pixbuf for the given icon scaled
* at the given width/height.

Loading…
Cancel
Save