diff options
| author | Erlang/OTP <[email protected]> | 2009-12-17 13:54:38 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2009-12-17 13:54:38 +0000 |
| commit | ebaa01050deb2bbc4cf4e1279e3d8ffe220080d9 (patch) | |
| tree | f30072b98c3727fd157462975c1164976fadadaa /erts | |
| parent | ca9557b50d146b5fe32b9aab3647ee25f4d05824 (diff) | |
| parent | 346b530950c2c6c80d179d8ff1fcc835ed95c1b8 (diff) | |
| download | otp-ebaa01050deb2bbc4cf4e1279e3d8ffe220080d9.tar.gz otp-ebaa01050deb2bbc4cf4e1279e3d8ffe220080d9.tar.bz2 otp-ebaa01050deb2bbc4cf4e1279e3d8ffe220080d9.zip | |
Merge branch 'at/windows_build_fixes' into ccase/r13b04_dev
* at/windows_build_fixes:
Updated README.win32 for compiling with VS2008 and issues with mc.exe
Allow mc.sh and rc.sh to work when path to mc/rc.exe has spaces
OTP-8345 Building on Windows will now work if the paths to mc.exe and
rc.exe contain spaces. The README.win32 file has been updated
with some information about building using Visual Studio 2008.
(Thanks to Andrew Thompson.)
Diffstat (limited to 'erts')
| -rwxr-xr-x | erts/etc/win32/cygwin_tools/vc/mc.sh | 8 | ||||
| -rwxr-xr-x | erts/etc/win32/cygwin_tools/vc/rc.sh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/erts/etc/win32/cygwin_tools/vc/mc.sh b/erts/etc/win32/cygwin_tools/vc/mc.sh index 813b59947b..676b072655 100755 --- a/erts/etc/win32/cygwin_tools/vc/mc.sh +++ b/erts/etc/win32/cygwin_tools/vc/mc.sh @@ -24,7 +24,7 @@ CMD="" OUTPUT_DIRNAME="" # Find the correct mc.exe. This could be done by the configure script, -# But as we seldom use the resource compiler, it might as well be done here... +# But as we seldom use the message compiler, it might as well be done here... MCC="" save_ifs=$IFS IFS=: @@ -32,7 +32,7 @@ for p in $PATH; do if [ -f $p/mc.exe ]; then if [ -n "`$p/mc.exe -? 2>&1 >/dev/null </dev/null \ | grep -i \"message compiler\"`" ]; then - MCC=$p/mc.exe + MCC=`echo "$p/mc.exe" | sed 's/ /\\\\ /g'` fi fi done @@ -68,8 +68,8 @@ while test -n "$1" ; do done p=$$ if [ "X$MC_SH_DEBUG_LOG" != "X" ]; then - echo rc.sh "$SAVE" >>$MC_SH_DEBUG_LOG - echo rc.exe $CMD >>$MC_SH_DEBUG_LOG + echo mc.sh "$SAVE" >>$MC_SH_DEBUG_LOG + echo mc.exe $CMD >>$MC_SH_DEBUG_LOG fi if [ -n "$OUTPUT_DIRNAME" ]; then cd $OUTPUT_DIRNAME diff --git a/erts/etc/win32/cygwin_tools/vc/rc.sh b/erts/etc/win32/cygwin_tools/vc/rc.sh index 748de48890..6a6921c49e 100755 --- a/erts/etc/win32/cygwin_tools/vc/rc.sh +++ b/erts/etc/win32/cygwin_tools/vc/rc.sh @@ -30,8 +30,8 @@ save_ifs=$IFS IFS=: for p in $PATH; do if [ -f $p/rc.exe ]; then - if [ -n "`$p/rc.exe -? 2>&1 | grep -i "resource compiler"`" ]; then - RCC=$p/rc.exe + if [ -n "`$p/rc.exe -? 2>&1 | grep -i "resource compiler"`" ]; then + RCC=`echo "$p/rc.exe" | sed 's/ /\\\\ /g'` fi fi done |