Merge branch 'devel' into bigbreak

Conflicts:
	lib/pure/osproc.nim
This commit is contained in:
Araq 2014-11-03 22:50:55 +01:00
commit a53e97fc89
7 changed files with 157 additions and 33 deletions

View file

@ -92,7 +92,7 @@ const
compileNimInst = "-d:useLibzipSrc tools/niminst/niminst"
proc csource(args: string) =
exec("$4 cc $1 -r $3 --var:version=$2 csource compiler/nim.ini $1" %
exec("$4 cc $1 -r $3 --var:version=$2 --var:mingw=mingw32 csource compiler/nim.ini $1" %
[args, VersionAsString, compileNimInst, findNim()])
proc zip(args: string) =