Changeset 56dd78bd1f54651d7cc9623c8c723c73d727e3ad

Show
Ignore:
Timestamp:
07/08/03 18:21:00 (5 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1057681260 +0000
git-parent:

[31f0666a4667eaed90ee21bf5a766e02e7d3d49d]

git-author:
Sam Hocevar <sam@videolan.org> 1057681260 +0000
Message:
  • toolbox: we cannot use printf '\r' under Cygwin; use a real M character
    instead.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • toolbox

    re10b64a r56dd78b  
    22 
    33##  toolbox for the VLC media player 
    4 ##  $Id: toolbox,v 1.39 2003/07/08 13:09:30 sam Exp $ 
     4##  $Id: toolbox,v 1.40 2003/07/08 16:21:00 sam Exp $ 
    55## 
    66##  Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    125125  fi 
    126126 
    127   #  The evil ^M 
    128   M="`printf '\r'`" 
     127  #  The evil ^M. printf '\r' does not work in Cygwin. 
     128  M=' 
     129' 
    129130 
    130131  #  Variables we get from configure.ac 
    …… 
    164165      cat >> ${target} << EOF 
    165166# Begin Source File${M} 
    166 SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     167SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} 
    167168# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} 
    168169# End Source File${M} 
    …… 
    180181        cat >> ${target} << EOF 
    181182# Begin Source File${M} 
    182 SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     183SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} 
    183184# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} 
    184185!IF "\$(CFG)" == "libvlc - Win32 (WCE MIPS) Release"${M} 
    …… 
    218219          cat >> ${target} << EOF 
    219220# Begin Source File${M} 
    220 SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     221SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} 
    221222# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\\".\\" /D DATA_PATH=\\"share\\"${M} 
    222223!IF "\$(CFG)" == "libvlc - Win32 Release"${M} 
    …… 
    241242      cat >> ${target} << EOF 
    242243# Begin Source File${M} 
    243 SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     244SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} 
    244245# End Source File${M} 
    245246EOF 
    …… 
    252253      cat >> ${target} << EOF 
    253254# Begin Source File${M} 
    254 SOURCE="..\\`echo $file | sed -e 's%/%\\\\%g'`"${M} 
     255SOURCE="..\\`echo ${file} | sed -e 's%/%\\\\%g'`"${M} 
    255256# End Source File${M} 
    256257EOF 
    …… 
    274275      hfiles=`for i in ${allfiles} ; do echo "$i" ; done | grep '\.h$'` 
    275276      cfiles=`for i in ${allfiles} ; do echo "$i" ; done | grep -v '\.h$'` 
    276       for dir in evc msvc 
     277      for msdir in evc msvc 
    277278      do 
    278         test "${dir}" = "evc" && suf="vcp" || suf="dsp" 
    279         source="${dir}/plugins.${suf}.in" 
    280         target="${dir}/plugin_${mod}.${suf}" 
     279        test "${msdir}" = "evc" && suf="vcp" || suf="dsp" 
     280        source="${msdir}/plugins.${suf}.in" 
     281        target="${msdir}/plugin_${mod}.${suf}" 
    281282        echo "${target}" 
    282283        perl -pe 'if(/�SOURCES�/){last;} s/�PLUGIN�/'${mod}'/g' < ${source} > ${target}