fixed windows build

Originally committed as revision 2278 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 19 insertions, 19 deletions

diff --git a/configure b/configure
index f986c92b61..13921937e0 100755
--- a/configure
+++ b/configure
@@ -20,6 +20,7 @@ TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
 # default parameters
 prefix="/usr/local"
 mandir=""
+bindir=""
 cross_prefix=""
 cc="gcc"
 ar="ar"
@@ -98,6 +99,7 @@ LIBPREF="lib"
 LIBSUF=".a"
 SLIBPREF="lib"
 SLIBSUF=".so"
+EXESUF=""
 risky="yes"
 amr_nb="no"
 amr_nb_fixed="no"
@@ -186,16 +188,9 @@ CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
 esac
 ;;
 MINGW32*)
-v4l="no"
-audio_oss="no"
-dv1394="no"
-ffserver="no"
-network="no"
+# Note: the rest of the mingw32 config is done afterwards as mingw32
+# can be forced on command line for linux cross compilation
 mingw32="yes"
-LIBPREF=""
-LIBSUF=".lib"
-SLIBPREF=""
-SLIBSUF=".dll"
 ;;
 CYGWIN*)
 v4l="no"
@@ -224,6 +219,7 @@ LIBPREF=""
 LIBSUF=".lib"
 SLIBPREF=""
 SLIBSUF=".dll"
+EXESUF=".exe"
 extralibs=""
 v4l="no"
 audio_oss="no"
@@ -503,8 +499,15 @@ if test "$mingw32" = "yes" ; then
     v4l="no"
     audio_oss="no"
     dv1394="no"
+    ffserver="no"
     network="no"
-    prefix="/c/Progra~1/FFmpeg"
+    LIBPREF=""
+    LIBSUF=".lib"
+    SLIBPREF=""
+    SLIBSUF=".dll"
+    EXESUF=".exe"
+    prefix="/c/Program Files/FFmpeg"
+    bindir="$prefix"
 fi
 
 cc="${cross_prefix}${cc}"
@@ -737,6 +740,10 @@ if test "$optimize" = "yes"; then
 	CFLAGS="$CFLAGS -O3"
 fi
 
+if test x"$bindir" = x""; then
+bindir="${prefix}/bin"
+fi
+
 if test x"$mandir" = x""; then
 mandir="${prefix}/man"
 fi
@@ -850,6 +857,7 @@ echo "# Automatically generated by configure - do not modify" > config.mak
 echo "/* Automatically generated by configure - do not modify */" > $TMPH
 
 echo "prefix=$prefix" >> config.mak
+echo "bindir=$bindir" >> config.mak
 echo "mandir=$mandir" >> config.mak
 echo "MAKE=$make" >> config.mak
 echo "CC=$cc" >> config.mak
@@ -864,6 +872,7 @@ echo "LIBPREF=$LIBPREF" >> config.mak
 echo "LIBSUF=$LIBSUF" >> config.mak
 echo "SLIBPREF=$SLIBPREF" >> config.mak
 echo "SLIBSUF=$SLIBSUF" >> config.mak
+echo "EXESUF=$EXESUF" >> config.mak
 echo "TARGET_OS=$TARGET_OS" >> config.mak
 if test "$cpu" = "x86" ; then
   echo "TARGET_ARCH_X86=yes" >> config.mak
@@ -900,9 +909,6 @@ if test "$mmx" = "yes" ; then
   echo "#define HAVE_MMX 1" >> $TMPH
   echo "#define __CPU__ 586" >> $TMPH
 fi
-if test "$mingw32" = "yes" ; then
-  echo "TARGET_MINGW32=yes" >> config.mak
-fi
 if test "$builtin_vector" = "yes" ; then
   echo "TARGET_BUILTIN_VECTOR=yes" >> config.mak
   echo "#define HAVE_BUILTIN_VECTOR 1" >> $TMPH
@@ -1060,12 +1066,6 @@ if test "$mingw32" = "yes" ; then
   echo "#ifndef __MINGW32__" >> $TMPH
   echo "#define __MINGW32__ 1" >> $TMPH
   echo "#endif" >> $TMPH
-  echo "__MINGW32__=1" >> config.mak
-fi
-
-if test "$cygwin" = "yes" ; then
-  # setup correct exesuffix
-  echo "CONFIG_WIN32=yes" >> config.mak
 fi
 
 if test "$os2" = "yes" ; then