aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2015-04-02 15:38:31 -0300
committerHisham Muhammad <hisham@gobolinux.org>2015-04-02 15:38:31 -0300
commit6f87c47128404bd1bf2e9d00e3410d7027c4be61 (patch)
treee362398c8472d95b1fee28bf8dda80ce00a9b648
parent5cb4aa78f7a3ebcb760c1f47df6d86b567f1f640 (diff)
parentcbde5735ce56ad647142d804f92377ded09a695e (diff)
downloadluarocks-6f87c47128404bd1bf2e9d00e3410d7027c4be61.tar.gz
luarocks-6f87c47128404bd1bf2e9d00e3410d7027c4be61.tar.bz2
luarocks-6f87c47128404bd1bf2e9d00e3410d7027c4be61.zip
Merge pull request #343 from xpol/master
Add options to hide the MSVC tools' startup logo.
-rw-r--r--src/luarocks/build/builtin.lua2
-rw-r--r--src/luarocks/cfg.lua4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua
index 5d15bbf2..00fd09ea 100644
--- a/src/luarocks/build/builtin.lua
+++ b/src/luarocks/build/builtin.lua
@@ -138,7 +138,7 @@ function builtin.run(rockspec)
138 local resname = basename..".res" 138 local resname = basename..".res"
139 local wrapname = basename..".exe" 139 local wrapname = basename..".exe"
140 make_rc(fullname, fullbasename..".rc") 140 make_rc(fullname, fullbasename..".rc")
141 local ok = execute(variables.RC, "-r", "-fo"..resname, rcname) 141 local ok = execute(variables.RC, "-nologo", "-r", "-fo"..resname, rcname)
142 if not ok then return ok end 142 if not ok then return ok end
143 ok = execute(variables.CC.." "..variables.CFLAGS, "-c", "-Fo"..object, 143 ok = execute(variables.CC.." "..variables.CFLAGS, "-c", "-Fo"..object,
144 "-I"..variables.LUA_INCDIR, variables.WRAPPER) 144 "-I"..variables.LUA_INCDIR, variables.WRAPPER)
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index f806f822..70c16a2a 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -332,8 +332,8 @@ if detected.windows then
332 defaults.variables.LD = "link" 332 defaults.variables.LD = "link"
333 defaults.variables.MT = "mt" 333 defaults.variables.MT = "mt"
334 defaults.variables.LUALIB = "lua"..cfg.lua_version..".lib" 334 defaults.variables.LUALIB = "lua"..cfg.lua_version..".lib"
335 defaults.variables.CFLAGS = "/MD /O2" 335 defaults.variables.CFLAGS = "/nologo /MD /O2"
336 defaults.variables.LIBFLAG = "/dll" 336 defaults.variables.LIBFLAG = "/nologo /dll"
337 337
338 local bins = { "SEVENZ", "CP", "FIND", "LS", "MD5SUM", 338 local bins = { "SEVENZ", "CP", "FIND", "LS", "MD5SUM",
339 "MKDIR", "MV", "PWD", "RMDIR", "TEST", "UNAME", "WGET" } 339 "MKDIR", "MV", "PWD", "RMDIR", "TEST", "UNAME", "WGET" }