diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-05-26 02:57:13 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-05-26 02:57:13 +0300 |
| commit | 857e4e04d89f30727d60e16c7320a72718a76d1a (patch) | |
| tree | 2c490024ab773024ae33ccca2b9e31c6e6875be6 /build_files/windows/detect_architecture.cmd | |
| parent | 4dee702332abee23086dc0d26e79f014a27a3bb3 (diff) | |
make.bat: refactor make.bat
make.bat was starting to become hard to maintain, this refactors it into separate batch files for each stage of the process.
-Improved detection of msvc2013/2015
-Improved failure handling.
-Added check for working msbuild and C++ compiler
-Added verbose switch to ease trouble shooting.
-Added Check if svn/cmake/git are in the path before using them
-Display the build configuration before asking to download the libraries
-Offer an option to recover an interrupted checkout of the libraries.
-Automatically check out sub-modules in-case they are missing.
Diffstat (limited to 'build_files/windows/detect_architecture.cmd')
| -rw-r--r-- | build_files/windows/detect_architecture.cmd | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/build_files/windows/detect_architecture.cmd b/build_files/windows/detect_architecture.cmd new file mode 100644 index 00000000000..cd211668b7f --- /dev/null +++ b/build_files/windows/detect_architecture.cmd @@ -0,0 +1,16 @@ +if "%BUILD_ARCH%"=="" ( + if "%PROCESSOR_ARCHITECTURE%" == "AMD64" ( + set WINDOWS_ARCH= Win64 + set BUILD_ARCH=x64 + ) else if "%PROCESSOR_ARCHITEW6432%" == "AMD64" ( + set WINDOWS_ARCH= Win64 + set BUILD_ARCH=x64 + ) else ( + set WINDOWS_ARCH= + set BUILD_ARCH=x86 + ) +) else if "%BUILD_ARCH%"=="x64" ( + set WINDOWS_ARCH= Win64 +) else if "%BUILD_ARCH%"=="x86" ( + set WINDOWS_ARCH= +) |