| Newsgroups |
gmane.comp.gnome.mono.patches |
| Message-ID |
<00000141dbfa917a-7b5d5b7b-27f1-4506-93ad-77b456d0ce6b-000000@email.amazonses.com> |
Branch: refs/heads/master
Home: https://github.com/mono/mono
Compare: https://github.com/mono/mono/compare/67d6c8f685a7...457a8453f7a0
Commit: 3a44c65b03a11319557fb95d06e091a77d5ba76f
Author: Vincent Povirk <[email protected]> (madewokherd)
Date: 2013-03-02 19:54:47 GMT
URL: https://github.com/mono/mono/commit/3a44c65b03a11319557fb95d06e091a77d5ba76f
Ignore the gdiplus dllmap on Windows.
Changed paths:
M data/config.in
M runtime/Makefile.am
Modified: 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>
Modified: 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 $@
Commit: 457a8453f7a0b58d2eae114e3476e62765f9502a
Author: Alex Rønne Petersen <[email protected]> (alexrp)
Date: 2013-10-21 17:00:26 GMT
URL: https://github.com/mono/mono/commit/457a8453f7a0b58d2eae114e3476e62765f9502a
Merge pull request #587 from madewokherd/gdipdllmap
Ignore the gdiplus dllmap on Windows.
Changed paths:
M data/config.in
M runtime/Makefile.am
Modified: 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>
Modified: 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 $@
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches