Merge pull request #3997 from lateralusX/jlorenss/win-api-family-support-safearray
authorJohan Lorensson <lateralusx.github@gmail.com>
Mon, 5 Dec 2016 10:45:19 +0000 (11:45 +0100)
committerGitHub <noreply@github.com>
Mon, 5 Dec 2016 10:45:19 +0000 (11:45 +0100)
Add possibility to exclude COM SafeArray implementation on some none desktop Windows API families.

1  2 
mono/metadata/Makefile.am
msvc/libmonoruntime.vcxproj

index 6a229a87a31582c6a8fe1304a840fd88ffd2d5a6,3217ba6029a0b85958094b2a3e1264d3acdd78a7..db8663c6e592141fdfd9e25a56afd9e8e77530d0
@@@ -2,6 -2,7 +2,7 @@@ if HOST_WIN3
  win32_sources = \
        console-win32.c \
        console-win32-internals.h \
+       cominterop-win32-internals.h \
        file-io-windows.c \
        file-io-windows-internals.h \
        icall-windows.c \
@@@ -118,7 -119,6 +119,7 @@@ null_gc_sources = 
  
  common_sources = \
        $(platform_sources)     \
 +      appdomain-icalls.h      \
        assembly.c              \
        assembly-internals.h    \
        attach.h                \
index 81d8a7e3e5b166856e0b62febde575da8f621948,eb199f1dfa19869a6c3756a81d79ddeefa94c67a..b73ba7d0cf2f6f7c11e95f1c20609e2ff7eb67b3
    </ItemGroup>\r
    <ItemGroup>\r
      <ClInclude Include="..\mono\metadata\appdomain.h" />\r
 +    <ClInclude Include="..\mono\metadata\appdomain-icalls.h" />\r
      <ClInclude Include="..\mono\metadata\assembly.h" />\r
      <ClInclude Include="..\mono\metadata\attach.h" />\r
      <ClInclude Include="..\mono\metadata\cil-coff.h" />\r
      <ClInclude Include="..\mono\metadata\class-internals.h" />\r
      <ClInclude Include="..\mono\metadata\class.h" />\r
+     <ClInclude Include="..\mono\metadata\cominterop-win32-internals.h" />\r
      <ClInclude Include="..\mono\metadata\cominterop.h" />\r
      <ClInclude Include="..\mono\metadata\console-io.h" />\r
      <ClInclude Include="..\mono\metadata\console-win32-internals.h" />\r