diff options
Diffstat (limited to 'install.bat')
-rw-r--r-- | install.bat | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/install.bat b/install.bat index f957e7a9..5644fa2a 100644 --- a/install.bat +++ b/install.bat | |||
@@ -43,12 +43,14 @@ IF [%1]==[/?] ( | |||
43 | ECHO /LIB [dir] Location of Lua libraries -e.g. c:\lua\5.1\lib | 43 | ECHO /LIB [dir] Location of Lua libraries -e.g. c:\lua\5.1\lib |
44 | ECHO /BIN [dir] Location of Lua executables - e.g. c:\lua\5.1\bin | 44 | ECHO /BIN [dir] Location of Lua executables - e.g. c:\lua\5.1\bin |
45 | ECHO. | 45 | ECHO. |
46 | ECHO /FORCECONFIG Use a single config location. Do not use the | 46 | ECHO /MW Use mingw as build system instead of MSVC |
47 | ECHO LUAROCKS_CONFIG variable or the user's home directory. | ||
48 | ECHO Useful to avoid conflicts when LuaRocks | ||
49 | ECHO is embedded within an application. | ||
50 | ECHO. | 47 | ECHO. |
51 | ECHO /F Remove installation directory if it already exists. | 48 | ECHO /FORCECONFIG Use a single config location. Do not use the |
49 | ECHO LUAROCKS_CONFIG variable or the user's home directory. | ||
50 | ECHO Useful to avoid conflicts when LuaRocks | ||
51 | ECHO is embedded within an application. | ||
52 | ECHO. | ||
53 | ECHO /F Remove installation directory if it already exists. | ||
52 | ECHO. | 54 | ECHO. |
53 | GOTO QUIT | 55 | GOTO QUIT |
54 | ) | 56 | ) |
@@ -81,6 +83,11 @@ IF /I [%1]==[/L] ( | |||
81 | SHIFT /1 | 83 | SHIFT /1 |
82 | GOTO PARSE_LOOP | 84 | GOTO PARSE_LOOP |
83 | ) | 85 | ) |
86 | IF /I [%1]==[/MW] ( | ||
87 | SET USE_MINGW=ON | ||
88 | SHIFT /1 | ||
89 | GOTO PARSE_LOOP | ||
90 | ) | ||
84 | IF /I [%1]==[/LUA] ( | 91 | IF /I [%1]==[/LUA] ( |
85 | SET LUA_PREFIX=%2 | 92 | SET LUA_PREFIX=%2 |
86 | SHIFT /1 | 93 | SHIFT /1 |
@@ -262,7 +269,11 @@ ECHO LUA_INCDIR=[[%LUA_INCDIR%]]>> "%LUADIR%\luarocks\config.lua" | |||
262 | ECHO LUA_LIBDIR=[[%LUA_LIBDIR%]]>> "%LUADIR%\luarocks\config.lua" | 269 | ECHO LUA_LIBDIR=[[%LUA_LIBDIR%]]>> "%LUADIR%\luarocks\config.lua" |
263 | ECHO LUA_BINDIR=[[%LUA_BINDIR%]]>> "%LUADIR%\luarocks\config.lua" | 270 | ECHO LUA_BINDIR=[[%LUA_BINDIR%]]>> "%LUADIR%\luarocks\config.lua" |
264 | ECHO LUA_INTERPRETER=[[%LUA_INTERPRETER%]]>> "%LUADIR%\luarocks\config.lua" | 271 | ECHO LUA_INTERPRETER=[[%LUA_INTERPRETER%]]>> "%LUADIR%\luarocks\config.lua" |
272 | IF [%USE_MINGW%]==[ON] ( | ||
273 | ECHO LUAROCKS_UNAME_S=[[MINGW]]>> "%LUADIR%\luarocks\config.lua" | ||
274 | ) ELSE ( | ||
265 | ECHO LUAROCKS_UNAME_S=[[WindowsNT]]>> "%LUADIR%\luarocks\config.lua" | 275 | ECHO LUAROCKS_UNAME_S=[[WindowsNT]]>> "%LUADIR%\luarocks\config.lua" |
276 | ) | ||
266 | ECHO LUAROCKS_UNAME_M=[[x86]]>> "%LUADIR%\luarocks\config.lua" | 277 | ECHO LUAROCKS_UNAME_M=[[x86]]>> "%LUADIR%\luarocks\config.lua" |
267 | ECHO LUAROCKS_SYSCONFIG=[[%SYSCONFDIR%/config.lua]]>> "%LUADIR%\luarocks\config.lua" | 278 | ECHO LUAROCKS_SYSCONFIG=[[%SYSCONFDIR%/config.lua]]>> "%LUADIR%\luarocks\config.lua" |
268 | ECHO LUAROCKS_ROCKS_TREE=[[%ROCKS_TREE%]]>> "%LUADIR%\luarocks\config.lua" | 279 | ECHO LUAROCKS_ROCKS_TREE=[[%ROCKS_TREE%]]>> "%LUADIR%\luarocks\config.lua" |