resolved conflicts with master

This commit is contained in:
Araq 2014-01-18 01:16:45 +01:00
commit 36afdca87f
22 changed files with 225 additions and 611 deletions

View file

@ -128,8 +128,8 @@ case $myos in
# var linkCmd = ""
# for ff in items(c.cfiles[osA][cpuA]):
# let f = ff.toUnix
echo "$CC $COMP_FLAGS -Inimcache -c ?{f} -o ?{changeFileExt(f, "o")}"
$CC $COMP_FLAGS -Inimcache -c ?{f} -o ?{changeFileExt(f, "o")}
echo "$CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")}"
$CC $COMP_FLAGS -Ic_code -c ?{f} -o ?{changeFileExt(f, "o")}
# add(linkCmd, " \\\n" & changeFileExt(f, "o"))
# end for
echo "$LINKER -o ?{"$binDir/" & toLower(c.name)} ?linkCmd $LINK_FLAGS"