window编译默认改为vs2017

Assets/XLua/Doc/faq.md

@@ -82,11 +82,13 @@ ios和osx需要在mac下编译。
 
 按[Hotfix操作指南](hotfix.md)一步步操作。
 
-## visual studio 2017下编译原生库
+## visual studio 2017下编译UWP原生库
 
-把build\vs2017目录下的脚本拷贝到build目录覆盖相应文件。
+visual studio 2017需要安装：1、“工作负载”下的“通用Window平台开发”；2、“单个组件”下的“用于ARM的Visual C++编译器和库”、“用于ARM64的Visual C++编译器和库”、“是用于ARM64的C++通用Windows平台工具”
 
-如果需要编译UWP，vs需要安装：1、“工作负载”下的“通用Window平台开发”；2、“单个组件”下的“用于ARM的Visual C++编译器和库”、“用于ARM64的Visual C++编译器和库”、“是用于ARM64的C++通用Windows平台工具”
+## visual studio 2015下编译原生库
+
+把build\vs2015下的bat文件拷贝到build目录，覆盖同名文件
 
 ## 报“please install the Tools”
 

build/make_uwp.bat

 mkdir build_uwp & pushd build_uwp
-cmake -G "Visual Studio 14 2015" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
-IF %ERRORLEVEL% NEQ 0 cmake -G "Visual Studio 15 2017" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -G "Visual Studio 15 2017" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp --config Release
 md plugin_lua53\Plugins\WSA\x86
 copy /Y build_uwp\Release\xlua.dll plugin_lua53\Plugins\WSA\x86\xlua.dll
 
 mkdir build_uwp64 & pushd build_uwp64
-cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
-IF %ERRORLEVEL% NEQ 0 cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp64 --config Release
 md plugin_lua53\Plugins\WSA\x64
 copy /Y build_uwp64\Release\xlua.dll plugin_lua53\Plugins\WSA\x64\xlua.dll
 
 mkdir build_uwp_arm & pushd build_uwp_arm
-cmake -G "Visual Studio 14 2015 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
-IF %ERRORLEVEL% NEQ 0 cmake -G "Visual Studio 15 2017 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -G "Visual Studio 15 2017 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp_arm --config Release
 md plugin_lua53\Plugins\WSA\ARM

build/make_win32_lua53.bat

 mkdir build32 & pushd build32
-cmake -G "Visual Studio 14 2015" ..
-IF %ERRORLEVEL% NEQ 0 cmake -G "Visual Studio 15 2017" ..
+cmake -G "Visual Studio 15 2017" ..
 popd
 cmake --build build32 --config Release
 md plugin_lua53\Plugins\x86

build/make_win32_luajit.bat

 @echo off
-if exist "%VS140COMNTOOLS%" (
-	set VCVARS="%VS140COMNTOOLS%..\..\VC\bin\"
-	goto build
-	)  else (goto missing)
 
-
-:build
-
-@set ENV32="%VCVARS%vcvars32.bat"
-
-call "%ENV32%"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
 
 echo Swtich to x86 build env
 cd %~dp0\luajit-2.1.0b3\src
 call msvcbuild_mt.bat static
 cd ..\..
 
-goto :buildxlua
-
-:missing
-echo Can't find Visual Studio 2015.
-pause
-goto :eof
-
-:buildxlua
 mkdir build_lj32 & pushd build_lj32
-cmake -DUSING_LUAJIT=ON -G "Visual Studio 14 2015" ..
+cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017" ..
 IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017" ..
 popd
 cmake --build build_lj32 --config Release

build/make_win64_lua53.bat

 mkdir build64 & pushd build64
-cmake -G "Visual Studio 14 2015 Win64" ..
-IF %ERRORLEVEL% NEQ 0 cmake -G "Visual Studio 15 2017 Win64" ..
+cmake -G "Visual Studio 15 2017 Win64" ..
 popd
 cmake --build build64 --config Release
 md plugin_lua53\Plugins\x86_64

build/make_win64_luajit.bat

 @echo off
-if exist "%VS140COMNTOOLS%" (
-	set VCVARS="%VS140COMNTOOLS%..\..\VC\bin\"
-	goto build
-	)  else (goto missing)
 
-
-:build
-
-@set ENV64="%VCVARS%amd64\vcvars64.bat"
-
-call "%ENV64%"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
 
 echo Swtich to x64 build env
 cd %~dp0\luajit-2.1.0b3\src
 call msvcbuild_mt.bat static
 cd ..\..
 
-goto :buildxlua
-
-:missing
-echo Can't find Visual Studio 2015.
-pause
-goto :eof
-
-:buildxlua
 mkdir build_lj64 & pushd build_lj64
-cmake -DUSING_LUAJIT=ON -G "Visual Studio 14 2015 Win64" ..
+cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017 Win64" ..
 IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017 Win64" ..
 popd
 cmake --build build_lj64 --config Release

build/make_win64_luajit_gc64.bat

 @echo off
-if exist "%VS140COMNTOOLS%" (
-	set VCVARS="%VS140COMNTOOLS%..\..\VC\bin\"
-	goto build
-	)  else (goto missing)
-
-
-:build
-
-@set ENV64="%VCVARS%amd64\vcvars64.bat"
-
-call "%ENV64%"
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
 
 echo Swtich to x64 build env
 cd %~dp0\luajit-2.1.0b3\src
 call msvcbuild_mt.bat gc64 static
 cd ..\..
 
-goto :buildxlua
-
-:missing
-echo Can't find Visual Studio 2015.
-pause
-goto :eof
-
-:buildxlua
 mkdir build_lj64 & pushd build_lj64
 cmake -DUSING_LUAJIT=ON -DGC64=ON -G "Visual Studio 14 2015 Win64" ..
 IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -DGC64=ON -G "Visual Studio 15 2017 Win64" ..

build/vs2017/make_uwp.bat → build/vs2015/make_uwp.bat

 mkdir build_uwp & pushd build_uwp
-cmake -G "Visual Studio 15 2017" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -G "Visual Studio 14 2015" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+IF %ERRORLEVEL% NEQ 0 cmake -G "Visual Studio 15 2017" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp --config Release
 md plugin_lua53\Plugins\WSA\x86
 copy /Y build_uwp\Release\xlua.dll plugin_lua53\Plugins\WSA\x86\xlua.dll
 
 mkdir build_uwp64 & pushd build_uwp64
-cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+IF %ERRORLEVEL% NEQ 0 cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp64 --config Release
 md plugin_lua53\Plugins\WSA\x64
 copy /Y build_uwp64\Release\xlua.dll plugin_lua53\Plugins\WSA\x64\xlua.dll
 
 mkdir build_uwp_arm & pushd build_uwp_arm
-cmake -G "Visual Studio 15 2017 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+cmake -G "Visual Studio 14 2015 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
+IF %ERRORLEVEL% NEQ 0 cmake -G "Visual Studio 15 2017 ARM" -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 ..
 popd
 cmake --build build_uwp_arm --config Release
 md plugin_lua53\Plugins\WSA\ARM

build/vs2017/make_win32_lua53.bat → build/vs2015/make_win32_lua53.bat

 mkdir build32 & pushd build32
-cmake -G "Visual Studio 15 2017" ..
+cmake -G "Visual Studio 14 2015" ..
+IF %ERRORLEVEL% NEQ 0 cmake -G "Visual Studio 15 2017" ..
 popd
 cmake --build build32 --config Release
 md plugin_lua53\Plugins\x86

build/vs2017/make_win32_luajit.bat → build/vs2015/make_win32_luajit.bat

 @echo off
+if exist "%VS140COMNTOOLS%" (
+	set VCVARS="%VS140COMNTOOLS%..\..\VC\bin\"
+	goto build
+	)  else (goto missing)
 
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
+
+:build
+
+@set ENV32="%VCVARS%vcvars32.bat"
+
+call "%ENV32%"
 
 echo Swtich to x86 build env
 cd %~dp0\luajit-2.1.0b3\src
 call msvcbuild_mt.bat static
 cd ..\..
 
+goto :buildxlua
+
+:missing
+echo Can't find Visual Studio 2015.
+pause
+goto :eof
+
+:buildxlua
 mkdir build_lj32 & pushd build_lj32
-cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017" ..
+cmake -DUSING_LUAJIT=ON -G "Visual Studio 14 2015" ..
 IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017" ..
 popd
 cmake --build build_lj32 --config Release

build/vs2017/make_win64_lua53.bat → build/vs2015/make_win64_lua53.bat

 mkdir build64 & pushd build64
-cmake -G "Visual Studio 15 2017 Win64" ..
+cmake -G "Visual Studio 14 2015 Win64" ..
+IF %ERRORLEVEL% NEQ 0 cmake -G "Visual Studio 15 2017 Win64" ..
 popd
 cmake --build build64 --config Release
 md plugin_lua53\Plugins\x86_64

build/vs2017/make_win64_luajit.bat → build/vs2015/make_win64_luajit.bat

 @echo off
+if exist "%VS140COMNTOOLS%" (
+	set VCVARS="%VS140COMNTOOLS%..\..\VC\bin\"
+	goto build
+	)  else (goto missing)
 
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+
+:build
+
+@set ENV64="%VCVARS%amd64\vcvars64.bat"
+
+call "%ENV64%"
 
 echo Swtich to x64 build env
 cd %~dp0\luajit-2.1.0b3\src
 call msvcbuild_mt.bat static
 cd ..\..
 
+goto :buildxlua
+
+:missing
+echo Can't find Visual Studio 2015.
+pause
+goto :eof
+
+:buildxlua
 mkdir build_lj64 & pushd build_lj64
-cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017 Win64" ..
+cmake -DUSING_LUAJIT=ON -G "Visual Studio 14 2015 Win64" ..
 IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -G "Visual Studio 15 2017 Win64" ..
 popd
 cmake --build build_lj64 --config Release

build/vs2017/make_win64_luajit_gc64.bat → build/vs2015/make_win64_luajit_gc64.bat

 @echo off
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+if exist "%VS140COMNTOOLS%" (
+	set VCVARS="%VS140COMNTOOLS%..\..\VC\bin\"
+	goto build
+	)  else (goto missing)
+
+
+:build
+
+@set ENV64="%VCVARS%amd64\vcvars64.bat"
+
+call "%ENV64%"
 
 echo Swtich to x64 build env
 cd %~dp0\luajit-2.1.0b3\src
 call msvcbuild_mt.bat gc64 static
 cd ..\..
 
+goto :buildxlua
+
+:missing
+echo Can't find Visual Studio 2015.
+pause
+goto :eof
+
+:buildxlua
 mkdir build_lj64 & pushd build_lj64
 cmake -DUSING_LUAJIT=ON -DGC64=ON -G "Visual Studio 14 2015 Win64" ..
 IF %ERRORLEVEL% NEQ 0 cmake -DUSING_LUAJIT=ON -DGC64=ON -G "Visual Studio 15 2017 Win64" ..