aboutsummaryrefslogtreecommitdiff
path: root/install.bat
diff options
context:
space:
mode:
Diffstat (limited to 'install.bat')
-rw-r--r--install.bat9
1 files changed, 7 insertions, 2 deletions
diff --git a/install.bat b/install.bat
index 287bad5b..93b159a5 100644
--- a/install.bat
+++ b/install.bat
@@ -138,7 +138,7 @@ Configuring the destinations:
138 if you create a self contained installation. 138 if you create a self contained installation.
139 139
140Configuring the Lua interpreter: 140Configuring the Lua interpreter:
141/LV [version] Lua version to use; either 5.1 or 5.2. 141/LV [version] Lua version to use; either 5.1, 5.2, or 5.3.
142 Default is 5.1 142 Default is 5.1
143/LUA [dir] Location where Lua is installed - e.g. c:\lua\5.1\ 143/LUA [dir] Location where Lua is installed - e.g. c:\lua\5.1\
144 If not provided, the installer will search the system 144 If not provided, the installer will search the system
@@ -249,8 +249,10 @@ local function check_flags()
249 if vars.LUA_VERSION ~= "5.1" then 249 if vars.LUA_VERSION ~= "5.1" then
250 if vars.LUA_VERSION == "5.2" then 250 if vars.LUA_VERSION == "5.2" then
251 vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)1", "5%12") 251 vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)1", "5%12")
252 elseif vars.LUA_VERSION == "5.3" then
253 vars.LUA_LIB_NAMES = vars.LUA_LIB_NAMES:gsub("5([%.]?)1", "5%13")
252 else 254 else
253 die("Bad argument: /LV must either be 5.1 or 5.2") 255 die("Bad argument: /LV must either be 5.1, 5.2, or 5.3")
254 end 256 end
255 end 257 end
256end 258end
@@ -701,6 +703,9 @@ SET "LUA_PATH=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH%"
701IF NOT "%LUA_PATH_5_2%"=="" ( 703IF NOT "%LUA_PATH_5_2%"=="" (
702 SET "LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2%" 704 SET "LUA_PATH_5_2=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_2%"
703) 705)
706IF NOT "%LUA_PATH_5_3%"=="" (
707 SET "LUA_PATH_5_3=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_3%"
708)
704SET "PATH=$BINDIR;%PATH%" 709SET "PATH=$BINDIR;%PATH%"
705"$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %* 710"$LUA_INTERPRETER" "$BINDIR\]]..c..[[.lua" %*
706IF NOT "%ERRORLEVEL%"=="2" GOTO EXITLR 711IF NOT "%ERRORLEVEL%"=="2" GOTO EXITLR