From: Vincent Povirk <madewokherd@gmail.com>
Date: Sat, 2 Mar 2013 19:53:26 +0000 (-0600)
Subject: Ignore the gdiplus dllmap on Windows.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=3a44c65b03a11319557fb95d06e091a77d5ba76f;p=mono.git

Ignore the gdiplus dllmap on Windows.
---

diff --git a/data/config.in b/data/config.in
index 1faae012ef2..32e075a3856 100644
--- 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 f8d500502a3..a26fadfdef8 100644
--- 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 $@