summaryrefslogtreecommitdiff
path: root/compat/cuda
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2017-08-29 01:46:13 +0100
committerTimo Rothenpieler <timo@rothenpieler.org>2017-08-30 11:20:34 +0200
commit7fbc0825773eb597c5a3f5679a8d58ced0d9456f (patch)
tree7fea51b67228682b9aea3b0ac420834f6d814fb0 /compat/cuda
parent1ac03c8dc0a9359cdd33e341303296862a0e5f84 (diff)
downloadffmpeg-7fbc0825773eb597c5a3f5679a8d58ced0d9456f.tar.gz
compat/cuda/ptx2c: strip CR from each line
Windows nvcc + cl.exe produce a .ctx file with CR+LF newlines which need to be stripped to work with gcc. Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Diffstat (limited to 'compat/cuda')
-rwxr-xr-xcompat/cuda/ptx2c.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/cuda/ptx2c.sh b/compat/cuda/ptx2c.sh
index 1f37023290..5ccabbf56f 100755
--- a/compat/cuda/ptx2c.sh
+++ b/compat/cuda/ptx2c.sh
@@ -29,7 +29,7 @@ NAME="$(basename "$IN" | sed 's/\..*//')"
printf "const char %s_ptx[] = \\" "$NAME" > "$OUT"
while read LINE
do
- printf "\n\t\"%s\\\n\"" "$(printf "%s" "$LINE" | sed 's/["\\]/\\&/g')" >> "$OUT"
+ printf "\n\t\"%s\\\n\"" "$(printf "%s" "$LINE" | sed -e 's/\r//g' -e 's/["\\]/\\&/g')" >> "$OUT"
done < "$IN"
printf ";\n" >> "$OUT"