Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/xwt.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsevo <sevoku@microsoft.com>2021-12-01 19:26:26 +0300
committersevo <sevoku@microsoft.com>2021-12-01 19:26:26 +0300
commit97d9adcfc28010959b71b769cbbd85829cb00300 (patch)
treeb38e1b41060085fa2d00ebc05eaba7ab6399f0eb
parent127c61038689626676d66815c2887e4fa4f0c93f (diff)
Use $mono_libdir instead of a hardcoded pathfixes-monterey-pangolib
Mono runtime will resolve the variable to its own lib path automatically. See https://github.com/mono/xwt/pull/1075#pullrequestreview-819080596
-rw-r--r--Xwt.Gtk/Xwt.Gtk.dll.config15
1 files changed, 7 insertions, 8 deletions
diff --git a/Xwt.Gtk/Xwt.Gtk.dll.config b/Xwt.Gtk/Xwt.Gtk.dll.config
index 2ee2337e..1f7be21a 100644
--- a/Xwt.Gtk/Xwt.Gtk.dll.config
+++ b/Xwt.Gtk/Xwt.Gtk.dll.config
@@ -10,13 +10,12 @@
<dllmap os="!windows,osx" dll="libwebkitgtk-1.0-0.dll" target="libwebkitgtk-1.0.so.0"/>
<dllmap os="!windows,osx" dll="fontconfig" target="libfontconfig.so.1"/>
- <dllmap os="osx" dll="libglib-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libglib-2.0.0.dylib"/>
- <dllmap os="osx" dll="libgobject-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libgobject-2.0.0.dylib"/>
- <dllmap os="osx" dll="libatk-1.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libatk-1.0.0.dylib"/>
- <dllmap os="osx" dll="libgtk-win32-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libgtk-quartz-2.0.0.dylib"/>
- <dllmap os="osx" dll="libgdk-win32-2.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libgdk-quartz-2.0.0.dylib"/>
- <dllmap os="osx" dll="libpango-1.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libpango-1.0.0.dylib"/>
- <dllmap os="osx" dll="libpangocairo-1.0-0.dll" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libpangocairo-1.0.0.dylib"/>
+ <dllmap os="osx" dll="libglib-2.0-0.dll" target="$mono_libdir/libglib-2.0.0.dylib"/>
+ <dllmap os="osx" dll="libgobject-2.0-0.dll" target="$mono_libdir/libgobject-2.0.0.dylib"/>
+ <dllmap os="osx" dll="libatk-1.0-0.dll" target="$mono_libdir/libatk-1.0.0.dylib"/>
+ <dllmap os="osx" dll="libgtk-win32-2.0-0.dll" target="$mono_libdir/libgtk-quartz-2.0.0.dylib"/>
+ <dllmap os="osx" dll="libpango-1.0-0.dll" target="$mono_libdir/libpango-1.0.0.dylib"/>
+ <dllmap os="osx" dll="libpangocairo-1.0-0.dll" target="$mono_libdir/libpangocairo-1.0.0.dylib"/>
<dllmap os="osx" dll="libwebkitgtk-1.0-0.dll" target="libwebkitgtk-1.0.0.dylib"/>
- <dllmap os="osx" dll="fontconfig" target="/Library/Frameworks/Mono.framework/Versions/Current/lib/libfontconfig.1.dylib"/>
+ <dllmap os="osx" dll="fontconfig" target="$mono_libdir/libfontconfig.1.dylib"/>
</configuration>