Merge pull request #887 from janvorli/windows-readytorun
authorJan Vorlicek <janvorli@microsoft.com>
Thu, 30 Apr 2015 18:16:51 +0000 (11:16 -0700)
committerJan Vorlicek <janvorli@microsoft.com>
Thu, 30 Apr 2015 18:16:51 +0000 (11:16 -0700)
Enable ReadyToRun for Windows CoreCLR

1  2 
CMakeLists.txt
crossgen.cmake
src/vm/crossgen/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
diff --cc crossgen.cmake
Simple merge
@@@ -94,13 -96,27 +94,19 @@@ set(VM_CROSSGEN_SOURCE
      ../util.cpp
      ../vars.cpp
      ../zapsig.cpp
 -    ../classcompat.cpp
 -    ../COMtoCLRCall.cpp
 -    ../CLRtoCOMCall.cpp
 -    ../RuntimeCallableWrapper.cpp
 -    ../WinRTHelpers.cpp
 -    ../WinRTTypeNameConverter.cpp
 -    ../DbgGcInfoDecoder.cpp
 -    ../GcInfoDecoder.cpp
 -    ../SHA1.cpp
 -    ../amd64/StubLinkerAMD64.cpp
 +    ../dbggcinfodecoder.cpp
 +    ../gcinfodecoder.cpp
 +    ../sha1.cpp
 +    ../amd64/stublinkeramd64.cpp
      ../crossgencompile.cpp
 -    ../CrossgenRoParseTypeName.cpp
 -    ../CrossgenRoResolveNamespace.cpp
  )
  
+ if (WIN32)
+   list(APPEND VM_CROSSGEN_SOURCES
+       ../readytoruninfo.cpp
+   )
+ endif (WIN32)
  include_directories(BEFORE ..)
  include_directories(${CLR_DIR}/src/gc)
  include_directories(../amd64)