[FFmpeg-cvslog] build: fix msvc build

Charlie Arnold git at videolan.org
Sat Jan 23 22:25:33 CET 2016


ffmpeg | branch: master | Charlie Arnold <charlie.arnold at gmail.com> | Sat Jan 23 13:11:59 2016 -0800| [22ee0a576faff87a24e30b2a27a3607dee4ca6c7] | committer: Andreas Cadhalpun

build: fix msvc build

Fix configure to set DST_PATH to the Windows style path when building with MSVC

Fixes ticket #5180.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22ee0a576faff87a24e30b2a27a3607dee4ca6c7
---

 configure |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 8f4642b..f7d1000 100755
--- a/configure
+++ b/configure
@@ -6233,6 +6233,12 @@ enabled stripping || strip="echo skipping strip"
 
 config_files="$TMPH config.mak doc/config.texi"
 
+if enabled msvc; then
+    dst_path=$(pwd -W)
+else
+    dst_path=$(pwd)
+fi
+
 cat > config.mak <<EOF
 # Automatically generated by configure - do not modify!
 ifndef FFMPEG_CONFIG_MAK
@@ -6251,7 +6257,7 @@ SRC_PATH=$source_path
 ifndef MAIN_MAKEFILE
 SRC_PATH:=\$(SRC_PATH:.%=..%)
 endif
-DST_PATH=$(pwd)
+DST_PATH=$dst_path
 CC_IDENT=$cc_ident
 ARCH=$arch
 INTRINSICS=$intrinsics



More information about the ffmpeg-cvslog mailing list