diff options
author | Jacek Blaszczynski <biosciencenow@outlook.com> | 2018-11-19 12:29:11 +0100 |
---|---|---|
committer | Jan Vorlicek <janvorli@microsoft.com> | 2018-11-19 12:29:11 +0100 |
commit | 31cb6d2e899b818ab72fd8c02ae3d9e69312e661 (patch) | |
tree | 6b86e7ecc94e1bcc01d1b15cbb74c2ad88f11fb2 | |
parent | 497419bf8f19c649d821295da7e225e55581cce9 (diff) | |
download | coreclr-31cb6d2e899b818ab72fd8c02ae3d9e69312e661.tar.gz coreclr-31cb6d2e899b818ab72fd8c02ae3d9e69312e661.tar.bz2 coreclr-31cb6d2e899b818ab72fd8c02ae3d9e69312e661.zip |
Add headers to crossgen, cee_crossgen, corzap_crossgen vcxproj files (#20082)
-rw-r--r-- | src/tools/crossgen/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/vm/crossgen/CMakeLists.txt | 300 | ||||
-rw-r--r-- | src/zap/crossgen/CMakeLists.txt | 27 |
3 files changed, 238 insertions, 90 deletions
diff --git a/src/tools/crossgen/CMakeLists.txt b/src/tools/crossgen/CMakeLists.txt index 3b9c5ba8db..410f82d929 100644 --- a/src/tools/crossgen/CMakeLists.txt +++ b/src/tools/crossgen/CMakeLists.txt @@ -8,6 +8,7 @@ include_directories(../../pal/prebuilt/corerror) set(crossgen_SOURCES crossgen.cpp ../util/consoleargs.cpp) if(WIN32) + list(APPEND crossgen_SOURCES ../util/consoleargs.h) set(crossgen_RESOURCES Native.rc) add_definitions(-D_CRT_NON_CONFORMING_WCSTOK) endif() diff --git a/src/vm/crossgen/CMakeLists.txt b/src/vm/crossgen/CMakeLists.txt index 75742b599f..9c761753e6 100644 --- a/src/vm/crossgen/CMakeLists.txt +++ b/src/vm/crossgen/CMakeLists.txt @@ -1,95 +1,196 @@ include(${CLR_DIR}/crossgen.cmake) set(VM_CROSSGEN_SOURCES - ../class.cpp - ../appdomain.cpp - ../array.cpp - ../assembly.cpp - ../assemblyspec.cpp - ../binder.cpp - ../ceeload.cpp - ../ceemain.cpp - ../classhash.cpp - ../clrex.cpp - ../clrprivbinderutil.cpp - ../clsload.cpp - ../comdelegate.cpp - ../codeman.cpp - ../compile.cpp - ../custommarshalerinfo.cpp - ../domainfile.cpp - ../baseassemblyspec.cpp - ../corebindresult.cpp - ../coreassemblyspec.cpp - ../dataimage.cpp - ../decodemd.cpp - ../debuginfostore.cpp - ../ecall.cpp - ../eeconfig.cpp - ../eehash.cpp - ../eetwain.cpp - ../excep.cpp - ../field.cpp - ../fieldmarshaler.cpp - ../formattype.cpp - ../genericdict.cpp - ../generics.cpp - ../genmeth.cpp - ../hash.cpp - ../ilinstrumentation.cpp - ../ilmarshalers.cpp - ../ilstubcache.cpp - ../ilstubresolver.cpp - ../instmethhash.cpp - ../interoputil.cpp - ../invokeutil.cpp - ../inlinetracking.cpp - ../contractimpl.cpp - ../jithost.cpp - ../jitinterface.cpp - ../loaderallocator.cpp - ../memberload.cpp - ../method.cpp - ../methodimpl.cpp - ../methodtable.cpp - ../methodtablebuilder.cpp - ../mscorlib.cpp - ../stubcache.cpp - ../mlinfo.cpp - ../dllimport.cpp - ../dllimportcallback.cpp - ../pefile.cpp - ../peimage.cpp - ../peimagelayout.cpp - ../pendingload.cpp - ../precode.cpp - ../olevariant.cpp - ../siginfo.cpp - ../sigformat.cpp - ../simplerwlock.cpp - ../spinlock.cpp - ../stackingallocator.cpp - ../stubgen.cpp - ../stublink.cpp - ../typectxt.cpp - ../typedesc.cpp - ../typehandle.cpp - ../typehash.cpp - ../typeparse.cpp - ../typestring.cpp - ../util.cpp - ../vars.cpp - ../versionresilienthashcode.cpp - ../zapsig.cpp - ../gcinfodecoder.cpp - ../sha1.cpp - ../crossgencompile.cpp + ../appdomain.cpp + ../array.cpp + ../assembly.cpp + ../assemblyspec.cpp + ../baseassemblyspec.cpp + ../binder.cpp + ../ceeload.cpp + ../ceemain.cpp + ../class.cpp + ../classhash.cpp + ../clrex.cpp + ../clrprivbinderutil.cpp + ../clsload.cpp + ../codeman.cpp + ../comdelegate.cpp + ../compile.cpp + ../contractimpl.cpp + ../coreassemblyspec.cpp + ../corebindresult.cpp + ../crossgencompile.cpp + ../custommarshalerinfo.cpp + ../dataimage.cpp + ../debuginfostore.cpp + ../decodemd.cpp + ../dllimport.cpp + ../dllimportcallback.cpp + ../domainfile.cpp + ../ecall.cpp + ../eeconfig.cpp + ../eehash.cpp + ../eetwain.cpp + ../excep.cpp + ../field.cpp + ../fieldmarshaler.cpp + ../formattype.cpp + ../gcinfodecoder.cpp + ../genericdict.cpp + ../generics.cpp + ../genmeth.cpp + ../hash.cpp + ../ilinstrumentation.cpp + ../ilmarshalers.cpp + ../ilstubcache.cpp + ../ilstubresolver.cpp + ../inlinetracking.cpp + ../instmethhash.cpp + ../interoputil.cpp + ../invokeutil.cpp + ../jithost.cpp + ../jitinterface.cpp + ../loaderallocator.cpp + ../memberload.cpp + ../method.cpp + ../methodimpl.cpp + ../methodtable.cpp + ../methodtablebuilder.cpp + ../mlinfo.cpp + ../mscorlib.cpp + ../olevariant.cpp + ../pefile.cpp + ../peimage.cpp + ../peimagelayout.cpp + ../pendingload.cpp + ../precode.cpp + ../sha1.cpp + ../sigformat.cpp + ../siginfo.cpp + ../simplerwlock.cpp + ../spinlock.cpp + ../stackingallocator.cpp + ../stubcache.cpp + ../stubgen.cpp + ../stublink.cpp + ../typectxt.cpp + ../typedesc.cpp + ../typehandle.cpp + ../typehash.cpp + ../typeparse.cpp + ../typestring.cpp + ../util.cpp + ../vars.cpp + ../versionresilienthashcode.cpp + ../zapsig.cpp +) + +set(VM_CROSSGEN_HEADERS + ../appdomain.hpp + ../appdomain.inl + ../array.h + ../assembly.hpp + ../assemblyspec.hpp + ../assemblyspecbase.h + ../baseassemblyspec.h + ../baseassemblyspec.inl + ../binder.h + ../ceeload.h + ../ceeload.inl + ../ceemain.h + ../class.h + ../class.inl + ../classhash.h + ../clrex.h + ../clrprivbinderloadfile.h + ../clsload.hpp + ../clsload.inl + ../codeman.h + ../comdelegate.h + ../compile.h + ../contractimpl.h + ../custommarshalerinfo.h + ../dataimage.h + ../debuginfostore.h + ../decodemd.h + ../dllimport.h + ../dllimportcallback.h + ../domainfile.h + ../domainfile.inl + ../ecall.h + ../eeconfig.h + ../eehash.h + ../eehash.inl + ../excep.h + ../field.h + ../fieldmarshaler.h + ../genericdict.h + ../generics.h + ../generics.inl + ../hash.h + ../ilinstrumentation.h + ../ilmarshalers.h + ../ilstubcache.h + ../ilstubresolver.h + ../inlinetracking.h + ../instmethhash.h + ../interoputil.h + ../invokeutil.h + ../jithost.h + ../jitinterface.h + ../loaderallocator.hpp + ../loaderallocator.inl + ../memberload.h + ../method.hpp + ../method.inl + ../methodimpl.h + ../methodtable.h + ../methodtable.inl + ../methodtablebuilder.h + ../methodtablebuilder.inl + ../mlinfo.h + ../mscorlib.h + ../olevariant.h + ../pefile.h + ../pefile.inl + ../peimage.h + ../peimage.inl + ../peimagelayout.h + ../peimagelayout.inl + ../pendingload.h + ../precode.h + ../sha1.h + ../sigformat.h + ../siginfo.hpp + ../simplerwlock.hpp + ../spinlock.h + ../stackingallocator.h + ../stubcache.h + ../stubgen.h + ../stublink.h + ../stublink.inl + ../typectxt.h + ../typedesc.h + ../typedesc.inl + ../typehandle.h + ../typehandle.inl + ../typehash.h + ../typeparse.h + ../typestring.h + ../util.hpp + ../vars.hpp + ../versionresilienthashcode.h + ../zapsig.h ) if(FEATURE_READYTORUN) - list(APPEND VM_CROSSGEN_SOURCES - ../readytoruninfo.cpp - ) + list(APPEND VM_CROSSGEN_SOURCES + ../readytoruninfo.cpp + ) + list(APPEND VM_CROSSGEN_HEADERS + ../readytoruninfo.h + ) endif(FEATURE_READYTORUN) include_directories(BEFORE ..) @@ -97,20 +198,26 @@ include_directories(${CLR_DIR}/src/gc) include_directories(../${ARCH_SOURCES_DIR}) if(CLR_CMAKE_TARGET_ARCH_AMD64) - list(APPEND VM_CROSSGEN_SOURCES + list(APPEND VM_CROSSGEN_SOURCES ../${ARCH_SOURCES_DIR}/stublinkeramd64.cpp ) + list(APPEND VM_CROSSGEN_HEADERS + ../${ARCH_SOURCES_DIR}/stublinkeramd64.h + ) elseif(CLR_CMAKE_TARGET_ARCH_I386) - list(APPEND VM_CROSSGEN_SOURCES + list(APPEND VM_CROSSGEN_SOURCES ../${ARCH_SOURCES_DIR}/stublinkerx86.cpp ../gcdecode.cpp ) + list(APPEND VM_CROSSGEN_HEADERS + ../${ARCH_SOURCES_DIR}/stublinkerx86.h + ) elseif(CLR_CMAKE_TARGET_ARCH_ARM) - list(APPEND VM_CROSSGEN_SOURCES + list(APPEND VM_CROSSGEN_SOURCES ../${ARCH_SOURCES_DIR}/stubs.cpp ) elseif(CLR_CMAKE_TARGET_ARCH_ARM64) - list(APPEND VM_CROSSGEN_SOURCES + list(APPEND VM_CROSSGEN_SOURCES ../${ARCH_SOURCES_DIR}/stubs.cpp ) else() @@ -131,9 +238,22 @@ if (WIN32) ../winrttypenameconverter.cpp ) + list(APPEND VM_CROSSGEN_HEADERS + ../classcompat.h + ../clrprivbinderwinrt.h + ../clrprivtypecachewinrt.h + ../clrtocomcall.h + ../comtoclrcall.h + ../crossgenroresolvenamespace.h + ../runtimecallablewrapper.h + ../winrthelpers.h + ../winrttypenameconverter.h + ) + add_precompiled_header(common.h ../common.cpp VM_CROSSGEN_SOURCES) # mscorlib.cpp does not compile with precompiled header file set_source_files_properties(../mscorlib.cpp PROPERTIES COMPILE_FLAGS "/Y-") + list(APPEND VM_CROSSGEN_SOURCES ${VM_CROSSGEN_HEADERS}) endif (WIN32) if (CLR_CMAKE_PLATFORM_LINUX) diff --git a/src/zap/crossgen/CMakeLists.txt b/src/zap/crossgen/CMakeLists.txt index 3d6ab23f1e..0d45cd1f76 100644 --- a/src/zap/crossgen/CMakeLists.txt +++ b/src/zap/crossgen/CMakeLists.txt @@ -17,15 +17,42 @@ set(ZAP_SOURCES ../nativeformatwriter.cpp ) +set(ZAP_HEADERS + ../zaprelocs.h + ../zapcode.h + ../zapheaders.h + ../zapimage.h + ../zapinfo.h + ../zapimport.h + ../zapinnerptr.h + ../zaplog.h + ../zapmetadata.h + ../zapnodetype.h + ../zapwriter.h + ../zapwrapper.h + ../zapperstats.h + ../nativeformatwriter.h +) + if (FEATURE_READYTORUN) list(APPEND ZAP_SOURCES ../zapreadytorun.cpp ../nativeformatwriter.cpp ) + list(APPEND ZAP_HEADERS + ../zapreadytorun.h + ../nativeformatwriter.h + ) endif (FEATURE_READYTORUN) add_precompiled_header(common.h ../common.cpp ZAP_SOURCES) + +if (WIN32) + list(APPEND ZAP_SOURCES ${ZAP_HEADERS}) +endif(WIN32) + add_library_clr(corzap_crossgen STATIC ${ZAP_SOURCES}) + if(FEATURE_MERGE_JIT_AND_ENGINE) target_link_libraries(corzap_crossgen clrjit_crossgen) endif(FEATURE_MERGE_JIT_AND_ENGINE) |