diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2011-12-10 16:34:37 -0200 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2011-12-10 16:34:37 -0200 |
| commit | 1bd5267ed3706571d61dc420c0575709091021fb (patch) | |
| tree | fde62902f554db2faf88a25e813d9488c94abf61 | |
| parent | 483e4442cae6efcbd55b7dd63ade802f7c6b2b0b (diff) | |
| parent | 6ac40ff5bb8a96389a5cb408c0501a513f068209 (diff) | |
| download | luarocks-2.0.7.tar.gz luarocks-2.0.7.tar.bz2 luarocks-2.0.7.zip | |
Merge branch 'master' of github.com:keplerproject/luarocksv2.0.7
Conflicts:
src/luarocks/deps.lua
src/luarocks/path.lua
| -rw-r--r-- | src/luarocks/cfg.lua | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 5f9952bb..6007db2f 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
| @@ -231,6 +231,7 @@ if detected.windows then | |||
| 231 | defaults.variables.WRAPPER = site_config.LUAROCKS_PREFIX .. "\\2.0\\rclauncher.obj" | 231 | defaults.variables.WRAPPER = site_config.LUAROCKS_PREFIX .. "\\2.0\\rclauncher.obj" |
| 232 | defaults.variables.LD = "link" | 232 | defaults.variables.LD = "link" |
| 233 | defaults.variables.MT = "mt" | 233 | defaults.variables.MT = "mt" |
| 234 | defaults.variables.LUALIB = "lua5.1.lib" | ||
| 234 | defaults.variables.CFLAGS = "/MD /O2" | 235 | defaults.variables.CFLAGS = "/MD /O2" |
| 235 | defaults.variables.LIBFLAG = "/dll" | 236 | defaults.variables.LIBFLAG = "/dll" |
| 236 | defaults.variables.LUALIB = "lua5.1.lib" | 237 | defaults.variables.LUALIB = "lua5.1.lib" |