diff options
author | Alex Rønne Petersen <alex@lycus.org> | 2013-10-21 21:00:26 +0400 |
---|---|---|
committer | Alex Rønne Petersen <alex@lycus.org> | 2013-10-21 21:00:26 +0400 |
commit | 457a8453f7a0b58d2eae114e3476e62765f9502a (patch) | |
tree | 3965c0c0c8a3830a108aae00f478d1661062fc3b | |
parent | 67d6c8f685a7dc43df7d384714d237a68950512c (diff) | |
parent | 3a44c65b03a11319557fb95d06e091a77d5ba76f (diff) |
Merge pull request #587 from madewokherd/gdipdllmap
Ignore the gdiplus dllmap on Windows.
-rw-r--r-- | data/config.in | 4 | ||||
-rw-r--r-- | runtime/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
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 8cf639ff911..809ee028d46 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -160,7 +160,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 $@ |