diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2014-01-11 13:53:39 +0100 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2014-01-11 13:53:39 +0100 |
| commit | 60323b48f917e2c7495d3899a3c4bec87cd98750 (patch) | |
| tree | 34943b6a03f7ae3a0d6a1fbd65608ca9ffa906a7 | |
| parent | 9fb2a238d99480bf966a67abb1de1b9a7d4eb6e5 (diff) | |
| download | luarocks-60323b48f917e2c7495d3899a3c4bec87cd98750.tar.gz luarocks-60323b48f917e2c7495d3899a3c4bec87cd98750.tar.bz2 luarocks-60323b48f917e2c7495d3899a3c4bec87cd98750.zip | |
minor update
| -rw-r--r-- | install.bat | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/install.bat b/install.bat index 22cdd523..94e9b71f 100644 --- a/install.bat +++ b/install.bat | |||
| @@ -18,7 +18,10 @@ vars.LUA_LIBDIR = nil | |||
| 18 | vars.LUA_LIBNAME = nil | 18 | vars.LUA_LIBNAME = nil |
| 19 | vars.LUA_VERSION = "5.1" | 19 | vars.LUA_VERSION = "5.1" |
| 20 | vars.LUA_SHORTV = nil -- "51" | 20 | vars.LUA_SHORTV = nil -- "51" |
| 21 | vars.LUA_LIB_NAMES = "lua5.1.lib lua51.dll liblua.dll.a" | 21 | -- MinGW does not generate .lib, nor needs it to link, but MSVC does |
| 22 | -- so .lib must be listed first to ensure they are found first if present. | ||
| 23 | -- To prevent MSVC trying to link to a .dll, which won't work. | ||
| 24 | vars.LUA_LIB_NAMES = "lua5.1.lib lua51.lib lua5.1.dll lua51.dll liblua.dll.a" | ||
| 22 | vars.LUA_RUNTIME = nil | 25 | vars.LUA_RUNTIME = nil |
| 23 | vars.UNAME_M = nil | 26 | vars.UNAME_M = nil |
| 24 | 27 | ||
| @@ -147,7 +150,7 @@ Configuring the Lua interpreter: | |||
| 147 | /LIB, and /BIN options. | 150 | /LIB, and /BIN options. |
| 148 | /INC [dir] Location of Lua includes - e.g. c:\lua\5.1\include | 151 | /INC [dir] Location of Lua includes - e.g. c:\lua\5.1\include |
| 149 | If provided overrides sub directory found using /LUA. | 152 | If provided overrides sub directory found using /LUA. |
| 150 | /LIB [dir] Location of Lua libraries (.dll) - e.g. c:\lua\5.1\lib | 153 | /LIB [dir] Location of Lua libraries (.dll/.lib) - e.g. c:\lua\5.1\lib |
| 151 | If provided overrides sub directory found using /LUA. | 154 | If provided overrides sub directory found using /LUA. |
| 152 | /BIN [dir] Location of Lua executables - e.g. c:\lua\5.1\bin | 155 | /BIN [dir] Location of Lua executables - e.g. c:\lua\5.1\bin |
| 153 | If provided overrides sub directory found using /LUA. | 156 | If provided overrides sub directory found using /LUA. |
