Browse Source

Adds full path to libcairo for correct assembly directory resolution in monterey (#21326)

New MacOS Monterey is not correctly resolving dylib locations when dllmap configuration is not specifying full paths, this makes VS4Mac use libcairo-2.dll from a dependency of a installed library in Hombrew.

A workaround was set full path to libcairo-2 and this fixed the problem.

Co-authored-by: Alexander Köplinger <[email protected]>
Jose Medrano 4 years ago
parent
commit
52d584291e
1 changed files with 1 additions and 1 deletions
  1. 1 1
      data/config.in

+ 1 - 1
data/config.in

@@ -30,7 +30,7 @@
 	<dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
 	<dllmap dll="libasound" target="libasound.so.2" os="!windows" />
 	<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
-	<dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
+	<dllmap dll="libcairo-2.dll" target="$mono_libdir/libcairo.2.dylib" os="osx" />
 	<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
 	<dllmap dll="libcups" target="libcups.dylib" os="osx"/>
 	<dllmap dll="i:kernel32.dll">