Merge pull request #587 from madewokherd/gdipdllmap

Ignore the gdiplus dllmap on Windows.

diff --combined runtime/Makefile.am
index 8cf639ff9118ef29b9ccf9706f7259f545ba276f,a26fadfdef8fee239541f39896b7e2f3b9feb8e3..809ee028d46371f0d71379a9dd065bd0be3469ba
--- 1/runtime/Makefile.am
--- 2/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@@ -6,15 -6,13 +6,15 @@@ etctmp = et
  symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini etc/mono/2.0/Browsers/Compat.browser
  
  if INSTALL_4_0
 -symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config
 +symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
  endif
  
  etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
  etc/mono/2.0/web.config: $(top_srcdir)/data/net_2_0/web.config
  etc/mono/browscap.ini: $(top_srcdir)/data/browscap.ini
 -etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/net_2_0/Browsers/Compat.browser
 +etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
 +etc/mono/4.0/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
 +etc/mono/4.5/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
  etc/mono/4.0/machine.config: $(top_srcdir)/data/net_4_0/machine.config
  etc/mono/4.0/web.config: $(top_srcdir)/data/net_4_0/web.config
  etc/mono/4.5/machine.config: $(top_srcdir)/data/net_4_5/machine.config
@@@ -25,11 -23,38 +25,11 @@@ $(symlinks)
  
  SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
  
 -if MOONLIGHT
 -moon-do-basic: Makefile $(SUPPORT_FILES)
 -      cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw
 -
 -moon-do-basic-clean:
 -      cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw clean
 -endif
 -
  if ONLY_MONOTOUCH
  build_profiles = monotouch
  else
 -if ONLY_MOONLIGHT
 -build_profiles = moonlight_raw
 -test_profiles = moonlight_raw
 -else
 -
  build_profiles = 
  
 -if MOONLIGHT
 -build_profiles += moonlight_raw
 -
 -moon-do-moonlight-raw: Makefile $(SUPPORT_FILES)
 -      cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' all-profiles
 -
 -moon-do-moonlight-raw-clean:
 -      cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' clean-profiles
 -
 -moon-do-build: moon-do-moonlight-raw moon-do-basic
 -moon-do-clean: moon-do-moonlight-raw-clean moon-do-basic-clean
 -
 -endif
 -
  if INSTALL_2_0
  build_profiles += net_2_0 net_3_5
  al_profile = net_2_0
@@@ -55,6 -80,7 +55,6 @@@ endi
  
  test_profiles = $(build_profiles)
  
 -endif
  endif
  
  if BUILD_MCS
@@@ -143,12 -169,8 +143,12 @@@ mcs-compileall: mono-wrapper etc/mono/c
            fi; done; done; \
        $$ok
  
 +if NACL_CODEGEN
 +check-local:
 +else
  check-local: mcs-compileall mcs-do-test-profiles
        $(MAKE) $(test_select) mcs-do-run-test-profiles
 +endif
  
  # Compile all mcs tests
  test: mcs-do-test-profiles
@@@ -160,7 -182,7 +160,7 @@@ etc/mono/config: ../data/config Makefil
        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 $@