diff options
Diffstat (limited to 'install.bat')
-rw-r--r-- | install.bat | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/install.bat b/install.bat index e1e7cb76..d5e32957 100644 --- a/install.bat +++ b/install.bat | |||
@@ -272,7 +272,7 @@ local function get_file_runtime(p,f) -- path, filename | |||
272 | local outfile = "output.txt" | 272 | local outfile = "output.txt" |
273 | local content | 273 | local content |
274 | -- analyze binary | 274 | -- analyze binary |
275 | if exec([[.\bin\objdump -x "]]..infile..[[" > ]]..outfile) then | 275 | if exec([[.\bin\objdump -x "]]..infile..[[" > ]]..outfile..[[ 2<&1]]) then |
276 | -- read temp file | 276 | -- read temp file |
277 | local fh = io.open(outfile) | 277 | local fh = io.open(outfile) |
278 | content = fh:read("*a") | 278 | content = fh:read("*a") |
@@ -321,7 +321,12 @@ local function get_runtime() | |||
321 | end | 321 | end |
322 | end | 322 | end |
323 | end | 323 | end |
324 | return (type(vars.LUA_RUNTIME) == "string") | 324 | if type(vars.LUA_RUNTIME) ~= "string" then |
325 | -- analysis failed, issue a warning | ||
326 | vars.LUA_RUNTIME = "MSVCR80" | ||
327 | print("*** WARNING ***: could not analyse the runtime used, defaulting to "..vars.LUA_RUNTIME) | ||
328 | end | ||
329 | return true | ||
325 | end | 330 | end |
326 | 331 | ||
327 | local function look_for_lua_install () | 332 | local function look_for_lua_install () |
@@ -353,7 +358,7 @@ local function look_for_lua_install () | |||
353 | if look_for_headers(directory) then | 358 | if look_for_headers(directory) then |
354 | print("Headers found, checking runtime to use...") | 359 | print("Headers found, checking runtime to use...") |
355 | if get_runtime() then | 360 | if get_runtime() then |
356 | print("Runtime found, now testing interpreter...") | 361 | print("Runtime check completed, now testing interpreter...") |
357 | if exec(S[[$LUA_BINDIR\$LUA_INTERPRETER -v 2>NUL]]) then | 362 | if exec(S[[$LUA_BINDIR\$LUA_INTERPRETER -v 2>NUL]]) then |
358 | print(" Ok") | 363 | print(" Ok") |
359 | return true | 364 | return true |