Merge pull request #1057 from lextm/master

[mono.git] / data / config.in

diff --git a/data/config.in b/data/config.in
index b1df9335c6033300cf7c8c6c52be3ccae71c923a..44fefc080276ca63a6080c5327fa6ce66034ce77 100644 (file)
--- a/data/config.in
+++ b/data/config.in
@@ -2,6 +2,8 @@
        <dllmap dll="i:cygwin1.dll" target="@LIBC@" os="!windows" />
        <dllmap dll="libc" target="@LIBC@" os="!windows"/>
        <dllmap dll="intl" target="@INTL@" os="!windows"/>
+       <dllmap dll="intl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
+       <dllmap dll="libintl" name="bind_textdomain_codeset" target="@LIBC@" os="solaris"/>
        <dllmap dll="libintl" target="@INTL@" os="!windows"/>
        <dllmap dll="i:libxslt.dll" target="libxslt@libsuffix@" os="!windows"/>
        <dllmap dll="i:odbc32.dll" target="libodbc@libsuffix@" os="!windows"/>
@@ -14,5 +16,19 @@
        <dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
        <dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
        <dllmap dll="libX11" target="@X11@" os="!windows" />
+       <dllmap dll="libXinerama" target="@XINERAMA@" 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="libcups" target="libcups.so.2" os="!windows"/>
+       <dllmap dll="libcups" target="libcups.dylib" os="osx"/>
+       <dllmap dll="i:kernel32.dll">
+               <dllentry dll="__Internal" name="CopyMemory" target="mono_win32_compat_CopyMemory"/>
+               <dllentry dll="__Internal" name="FillMemory" target="mono_win32_compat_FillMemory"/>
+               <dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
+               <dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
+       </dllmap>
+       <dllmap dll="gdiplus" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
+       <dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus@libsuffix@"  os="!windows"/>
+       <dllmap dll="gdi32" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
+       <dllmap dll="gdi32.dll" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
 </configuration>