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 /runtime/Makefile.am | |
parent | 67d6c8f685a7dc43df7d384714d237a68950512c (diff) | |
parent | 3a44c65b03a11319557fb95d06e091a77d5ba76f (diff) |
Merge pull request #587 from madewokherd/gdipdllmap
Ignore the gdiplus dllmap on Windows.
Diffstat (limited to 'runtime/Makefile.am')
-rw-r--r-- | runtime/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
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 $@ |