X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Ftools%2Fqcc.sh;h=dfc375bb5a984fab52d12b4720c62b2e7e70c225;hb=c6e1864a0d1bbe7a5bfe721edb92318216195463;hp=15cbfc4aab5a222f8a06da9091884057c5f84fe3;hpb=35eff34d3dd4296ca9a9ab553f6d71e76dd9581f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/tools/qcc.sh b/qcsrc/tools/qcc.sh index 15cbfc4aa..dfc375bb5 100755 --- a/qcsrc/tools/qcc.sh +++ b/qcsrc/tools/qcc.sh @@ -20,7 +20,7 @@ function qpp() { server) DEFS="-DGAMEQC -DSVQC" ;; esac - >&2 echo + ${CPP} "${@:3}" ${DEFS} "${IN}" + #>&2 echo + ${CPP} "${@:3}" ${DEFS} "${IN}" set +e # additional information ${CPP} "${@:3}" ${DEFS} \ @@ -32,11 +32,11 @@ function qpp() { err=$? set -e if [ ${err} -ne 0 ]; then return ${err}; fi - sed 's/^#\(line\)\? \([[:digit:]]\+\) "\(.*\)".*/\n#pragma file(\3)\n#pragma line(\2)/g' "${WORKDIR}/${MODE}.txt" + sed -E 's/^#(line)? ([[:digit:]]+) "(.*)".*/'$'\\\n''#pragma file(\3)'$'\\\n''#pragma line(\2)/g' "${WORKDIR}/${MODE}.txt" } function qcc() { - >&2 echo + $(basename ${QCC}) $@ + #>&2 echo + $(basename ${QCC}) $@ # FIXME: relative compiler path is too deep (cd tools && ${QCC} "$@") }