Ignore the gdiplus dllmap on Windows.

diff --git a/data/config.in b/data/config.in
index 1faae012ef2be58c6435da97f162047d2a081ae3..32e075a3856e6aee10ab22d48ccba0ca89b7e918 100644 (file)
--- a/data/config.in
+++ b/data/config.in
@@ -26,6 +26,6 @@
                <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@" />
-       <dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus@libsuffix@" />
+       <dllmap dll="gdiplus" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
+       <dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus@libsuffix@"  os="!windows"/>
 </configuration>

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index f8d500502a3ac246de0cb38b27d37721f2425dc8..a26fadfdef8fee239541f39896b7e2f3b9feb8e3 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -182,7 +182,7 @@ etc/mono/config: ../data/config Makefile $(symlinks)
        d=`cd ../support && pwd`; \
        sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@t
        if test -z "$(libgdiplus_loc)"; then :; else \
-         sed 's,<configuration>,& <dllmap dll="gdiplus.dll" target="$(libgdiplus_loc)" />,' $@t > $@tt; \
+         sed 's,<configuration>,& <dllmap dll="gdiplus.dll" target="$(libgdiplus_loc)" os="!windows"/>,' $@t > $@tt; \
          mv -f $@tt $@t; fi
        mv -f $@t $@