mirror of https://github.com/moparisthebest/curl
build: Added initial VC14 support to generate.bat
Visual Studio project files and updates to makefile.am to follow.
This commit is contained in:
parent
98e8b050ef
commit
9b95306d4c
|
@ -79,6 +79,8 @@ rem If you need to set the errorlevel do this instead: CALL :seterr [#]
|
||||||
set VERSION=VC11
|
set VERSION=VC11
|
||||||
) else if /i "%~1" == "vc12" (
|
) else if /i "%~1" == "vc12" (
|
||||||
set VERSION=VC12
|
set VERSION=VC12
|
||||||
|
) else if /i "%~1" == "vc14" (
|
||||||
|
set VERSION=VC14
|
||||||
) else if /i "%~1" == "-clean" (
|
) else if /i "%~1" == "-clean" (
|
||||||
set MODE=CLEAN
|
set MODE=CLEAN
|
||||||
) else (
|
) else (
|
||||||
|
@ -108,6 +110,7 @@ rem If you need to set the errorlevel do this instead: CALL :seterr [#]
|
||||||
if "%VERSION%" == "VC10" goto vc10
|
if "%VERSION%" == "VC10" goto vc10
|
||||||
if "%VERSION%" == "VC11" goto vc11
|
if "%VERSION%" == "VC11" goto vc11
|
||||||
if "%VERSION%" == "VC12" goto vc12
|
if "%VERSION%" == "VC12" goto vc12
|
||||||
|
if "%VERSION%" == "VC14" goto vc14
|
||||||
|
|
||||||
:vc6
|
:vc6
|
||||||
echo.
|
echo.
|
||||||
|
@ -227,12 +230,27 @@ rem If you need to set the errorlevel do this instead: CALL :seterr [#]
|
||||||
call :clean Windows\VC12\lib\libcurl.vcxproj
|
call :clean Windows\VC12\lib\libcurl.vcxproj
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if not "%VERSION%" == "ALL" goto success
|
||||||
|
|
||||||
|
:vc14
|
||||||
|
echo.
|
||||||
|
|
||||||
|
if "%MODE%" == "GENERATE" (
|
||||||
|
echo Generating VC14 project files
|
||||||
|
call :generate vcxproj Windows\VC14\src\curl.tmpl Windows\VC14\src\curl.vcxproj
|
||||||
|
call :generate vcxproj Windows\VC14\lib\libcurl.tmpl Windows\VC14\lib\libcurl.vcxproj
|
||||||
|
) else (
|
||||||
|
echo Removing VC14 project files
|
||||||
|
call :clean Windows\VC14\src\curl.vcxproj
|
||||||
|
call :clean Windows\VC14\lib\libcurl.vcxproj
|
||||||
|
)
|
||||||
|
|
||||||
goto success
|
goto success
|
||||||
|
|
||||||
rem Main generate function.
|
rem Main generate function.
|
||||||
rem
|
rem
|
||||||
rem %1 - Project Type (dsp for VC6, vcproj1 for VC7 and VC7.1, vcproj2 for VC8 and VC9
|
rem %1 - Project Type (dsp for VC6, vcproj1 for VC7 and VC7.1, vcproj2 for VC8 and VC9
|
||||||
rem or vcxproj for VC10, VC11 and VC12)
|
rem or vcxproj for VC10, VC11, VC12 and VC14)
|
||||||
rem %2 - Input template file
|
rem %2 - Input template file
|
||||||
rem %3 - Output project file
|
rem %3 - Output project file
|
||||||
rem
|
rem
|
||||||
|
@ -296,7 +314,7 @@ rem
|
||||||
rem Generates a single file xml element.
|
rem Generates a single file xml element.
|
||||||
rem
|
rem
|
||||||
rem %1 - Project Type (dsp for VC6, vcproj1 for VC7 and VC7.1, vcproj2 for VC8 and VC9
|
rem %1 - Project Type (dsp for VC6, vcproj1 for VC7 and VC7.1, vcproj2 for VC8 and VC9
|
||||||
rem or vcxproj for VC10, VC11 and VC12)
|
rem or vcxproj for VC10, VC11, VC12 and VC14)
|
||||||
rem %2 - Directory (src, lib, lib\vauth or lib\vtls)
|
rem %2 - Directory (src, lib, lib\vauth or lib\vtls)
|
||||||
rem %3 - Source filename
|
rem %3 - Source filename
|
||||||
rem %4 - Output project file
|
rem %4 - Output project file
|
||||||
|
@ -450,6 +468,7 @@ rem Returns exit code 0 on success or 1 on failure.
|
||||||
echo vc10 - Use Visual Studio 2010
|
echo vc10 - Use Visual Studio 2010
|
||||||
echo vc11 - Use Visual Studio 2012
|
echo vc11 - Use Visual Studio 2012
|
||||||
echo vc12 - Use Visual Studio 2013
|
echo vc12 - Use Visual Studio 2013
|
||||||
|
echo vc14 - Use Visual Studio 2015
|
||||||
echo.
|
echo.
|
||||||
echo -clean - Removes the project files
|
echo -clean - Removes the project files
|
||||||
goto error
|
goto error
|
||||||
|
|
Loading…
Reference in New Issue