diff options
| author | lateralusX <lateralusx.github@gmail.com> | 2019-01-08 16:06:14 +0300 |
|---|---|---|
| committer | lateralusX <lateralusx.github@gmail.com> | 2019-01-08 16:06:14 +0300 |
| commit | 46a1c80a41c6d5be7204fbd9c38875dd393b456f (patch) | |
| tree | 61d4ce8b07e2943d37b2a13992330b5d1dddfbeb /msvc/build-external-llvm.bat | |
| parent | b9e209fc9376f823707b674ea0a734a54b7a7fb4 (diff) | |
Fix warnings and build errors when bumping Mono on alternative Windows platforms.
Several of the name changes fixes MSVC warnings where local variables
hides global variables using the same name.
Number of adjustments not building on platforms not defining HAVE_CLASSIC_WINAPI_SUPPORT.
Fix a couple of build projects not setting dependencies on build-init.vcxproj.
This could cause races in build order if projects depend on build initialization.
Added support to force external builds to use msbuild even if ninja is present.
Diffstat (limited to 'msvc/build-external-llvm.bat')
| -rw-r--r-- | msvc/build-external-llvm.bat | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/msvc/build-external-llvm.bat b/msvc/build-external-llvm.bat index 4982a64c42d..22a0ad50938 100644 --- a/msvc/build-external-llvm.bat +++ b/msvc/build-external-llvm.bat @@ -14,6 +14,7 @@ :: %8 VS configuration (Debug/Release).
:: %9 VS target.
:: %10 MsBuild bin path, if used.
+:: %11 Force MSBuild (true/false), if used.
:: --------------------------------------------------
@echo off
@@ -30,15 +31,26 @@ set NINJA_BIN_NAME=ninja.exe set PYTHON_BIN_NAME=python.exe
set LLVM_DIR=%~1
-set LLVM_BUILD_DIR=%~2
-set LLVM_INSTALL_DIR=%~3
-set MONO_DIST_DIR=%~4
-set VS_CFLAGS=%~5
-set LLVM_ADDITIONAL_CMAKE_ARGS=%~6
-set VS_PLATFORM=%~7
-set VS_CONFIGURATION=%~8
-set VS_TARGET=%~9
-set MSBUILD_BIN_PATH=%~10
+shift
+set LLVM_BUILD_DIR=%~1
+shift
+set LLVM_INSTALL_DIR=%~1
+shift
+set MONO_DIST_DIR=%~1
+shift
+set VS_CFLAGS=%~1
+shift
+set LLVM_ADDITIONAL_CMAKE_ARGS=%~1
+shift
+set VS_PLATFORM=%~1
+shift
+set VS_CONFIGURATION=%~1
+shift
+set VS_TARGET=%~1
+shift
+set MSBUILD_BIN_PATH=%~1
+shift
+set FORCE_MSBUILD=%~1
:: Setup toolchain.
:: set GIT=
@@ -83,6 +95,10 @@ if "%VS_TARGET%" == "" ( set VS_TARGET=Build
)
+if "%FORCE_MSBUILD%" == "" (
+ set FORCE_MSBUILD=false
+)
+
if not exist "%LLVM_DIR%" (
echo Could not find "%LLVM_DIR%".
goto ON_ERROR
@@ -362,7 +378,11 @@ if "%CMAKE%" == "" ( )
if /i "%VS_TARGET%" == "build" (
- echo Found CMake: %CMAKE%
+ echo Found CMake: "%CMAKE%"
+)
+
+if /i "%FORCE_MSBUILD%" == "true" (
+ goto _SETUP_CMAKE_ENVIRONMENT_VS_GENERATOR
)
:: Check for optional cmake generate and build tools.
@@ -395,7 +415,7 @@ goto _SETUP_CMAKE_ENVIRONMENT_EXIT :_SETUP_CMAKE_ENVIRONMENT_NINJA_GENERATOR
if /i "%VS_TARGET%" == "build" (
- echo Found Ninja: %NINJA%
+ echo Found Ninja: "%NINJA%"
echo Using Ninja build generator.
)
|