diff options
| author | lateralusX <lateralusx.github@gmail.com> | 2018-11-06 18:23:56 +0300 |
|---|---|---|
| committer | lateralusX <lateralusx.github@gmail.com> | 2018-11-12 17:16:14 +0300 |
| commit | 269d02cf5b3c906954bbba944fc9d5918fa1ad75 (patch) | |
| tree | b0d789dcf9579773bbbf5929272f1d590f41b6a9 /msvc/mono.sln | |
| parent | f038e7cd8a4edcfc9ebbfb8dfd0b595fdcaada15 (diff) | |
Add support for LLVM integrated build as part of Visual Studio solution
build. LLVM build follows similar pattern as BTLS build and will be build
as part of regular Visual Studio build Mono runtime if LLVM has been enabled
through the autogen.sh, --enable-llvm or –with-llvm argument. It is also
supports msbuild properties MONO_ENABLE_LLVM, MONO_EXTERNAL_LLVM_CONFIG,
if Visual Studio Mono runtime has been built without using autogen.sh.
When just using –enable-llvm, LLVM build will try to build internal LLVM
branch under external/llvm or if override has been set in props file
(using MONO_INTERNAL_LLVM_SOURCE_DIR), an alternative LLVM source
directory path. If –with-llvm has been used pointing to an llvm-config.exe,
no internal LLVM will be build, but the external LLVM build will be used.
Needed LLVM executables (opt.exe, llc.exe) will be installed into regular
Visual Studio Mono runtime build output directory.
The internal Mono LLVM 6.0 release will build as part of changes to this
commit, but it has not yet been fixed to work as expected during runtime.
That work will be done in different commit. The Mono LLVM 3.6 branch will
however work as expected for Windows x64 and can be setup and used using
–with-llvm argument or build as part of Visual Studio build Mono runtime
by enabling msbuild properties, MONO_ENABLE_LLVM and
MONO_INTERNAL_LLVM_SOURCE_DIR.
Diffstat (limited to 'msvc/mono.sln')
| -rw-r--r-- | msvc/mono.sln | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/msvc/mono.sln b/msvc/mono.sln index 4db4deeecaa..1f51a6a6269 100644 --- a/msvc/mono.sln +++ b/msvc/mono.sln @@ -66,6 +66,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eglib", "eglib.vcxproj", "{158073ED-99AE-4196-9EDC-DDB2344F8466}"
ProjectSection(ProjectDependencies) = postProject
{92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
+ {C3D4C623-55F8-4653-980D-61AA629B4E1D} = {C3D4C623-55F8-4653-980D-61AA629B4E1D}
{E41DDF41-0916-454B-A7C2-6E410E45CAFD} = {E41DDF41-0916-454B-A7C2-6E410E45CAFD}
EndProjectSection
EndProject
@@ -209,6 +210,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-external-btls", "buil {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "build-external-llvm", "build-external-llvm.vcxproj", "{C3D4C623-55F8-4653-980D-61AA629B4E1D}"
+ ProjectSection(ProjectDependencies) = postProject
+ {92AE7622-5F58-4234-9A26-9EC71876B3F4} = {92AE7622-5F58-4234-9A26-9EC71876B3F4}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -433,6 +439,14 @@ Global {E41DDF41-0916-454B-A7C2-6E410E45CAFD}.Release|Win32.Build.0 = Release|Win32
{E41DDF41-0916-454B-A7C2-6E410E45CAFD}.Release|x64.ActiveCfg = Release|x64
{E41DDF41-0916-454B-A7C2-6E410E45CAFD}.Release|x64.Build.0 = Release|x64
+ {C3D4C623-55F8-4653-980D-61AA629B4E1D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C3D4C623-55F8-4653-980D-61AA629B4E1D}.Debug|Win32.Build.0 = Debug|Win32
+ {C3D4C623-55F8-4653-980D-61AA629B4E1D}.Debug|x64.ActiveCfg = Debug|x64
+ {C3D4C623-55F8-4653-980D-61AA629B4E1D}.Debug|x64.Build.0 = Debug|x64
+ {C3D4C623-55F8-4653-980D-61AA629B4E1D}.Release|Win32.ActiveCfg = Release|Win32
+ {C3D4C623-55F8-4653-980D-61AA629B4E1D}.Release|Win32.Build.0 = Release|Win32
+ {C3D4C623-55F8-4653-980D-61AA629B4E1D}.Release|x64.ActiveCfg = Release|x64
+ {C3D4C623-55F8-4653-980D-61AA629B4E1D}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -472,6 +486,7 @@ Global {88D2EB79-592D-45F8-B849-AE021C1D983A} = {0EBA83B7-0EB4-4C83-A900-77300A97E8B1}
{675F4175-FFB1-480D-AD36-F397578844D4} = {DE3617B4-17A8-4E5F-A00F-BA43D956881F}
{E41DDF41-0916-454B-A7C2-6E410E45CAFD} = {7AF3635B-001C-42BF-94B9-C036CFDCA71D}
+ {C3D4C623-55F8-4653-980D-61AA629B4E1D} = {7AF3635B-001C-42BF-94B9-C036CFDCA71D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
AMDCaPersistentConfig = Debug|Win32
|