projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[RAPPS][TRANSLATION] Estonian localization (#959)
[reactos.git]
/
configure.cmd
diff --git
a/configure.cmd
b/configure.cmd
index
4d550d5
..
d8f44af
100755
(executable)
--- a/
configure.cmd
+++ b/
configure.cmd
@@
-62,7
+62,6
@@
if defined ROS_ARCH (
cl 2>&1 | find "x86" > NUL && set ARCH=i386
cl 2>&1 | find "x64" > NUL && set ARCH=amd64
cl 2>&1 | find "ARM" > NUL && set ARCH=arm
cl 2>&1 | find "x86" > NUL && set ARCH=i386
cl 2>&1 | find "x64" > NUL && set ARCH=amd64
cl 2>&1 | find "ARM" > NUL && set ARCH=arm
- cl 2>&1 | find "15.00." > NUL && set VS_VERSION=9
cl 2>&1 | find "16.00." > NUL && set VS_VERSION=10
cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11
cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12
cl 2>&1 | find "16.00." > NUL && set VS_VERSION=10
cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11
cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12
@@
-70,8
+69,11
@@
if defined ROS_ARCH (
cl 2>&1 | find "19.10." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.11." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.10." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.11." > NUL && set VS_VERSION=15
cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15
+ cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15
+ cl 2>&1 | find "19.14." > NUL && set VS_VERSION=15
+ cl 2>&1 | find "19.15." > NUL && set VS_VERSION=15
if not defined VS_VERSION (
if not defined VS_VERSION (
- echo Error: Visual Studio version too old or version detection failed.
+ echo Error: Visual Studio version too old
^(before 10 ^(2010^)^)
or version detection failed.
goto quit
)
set BUILD_ENVIRONMENT=VS
goto quit
)
set BUILD_ENVIRONMENT=VS
@@
-137,13
+139,7
@@
REM Parse command line parameters
set VS_VERSION=%3
echo Visual Studio Environment set to !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH!
)
set VS_VERSION=%3
echo Visual Studio Environment set to !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH!
)
- if "!VS_VERSION!" == "9" (
- if "!ARCH!" == "amd64" (
- set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"
- ) else (
- set CMAKE_GENERATOR="Visual Studio 9 2008"
- )
- ) else if "!VS_VERSION!" == "10" (
+ if "!VS_VERSION!" == "10" (
if "!ARCH!" == "amd64" (
set CMAKE_GENERATOR="Visual Studio 10 Win64"
) else (
if "!ARCH!" == "amd64" (
set CMAKE_GENERATOR="Visual Studio 10 Win64"
) else (