aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2010-01-25 01:25:59 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2010-01-25 01:25:59 +0000
commitd9cd11ad44bfccf2be37b2473a675f009365e945 (patch)
treebab7bacb9da2c36a6226108ace949961c981d397
parent0b69d6254f7f554c80c9f3048a862dbe840a1805 (diff)
downloadffmpeg-d9cd11ad44bfccf2be37b2473a675f009365e945.tar.gz
Only define _WIN32_WINNT=0x0501 if $target_os = "mingw32".
If compatibility with pre-XP versions is desired, use --target-os=mingw32-prexp Patch by Martin Storsjö <martin at martin dot st>. Originally committed as revision 21441 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure7
-rw-r--r--doc/general.texi4
2 files changed, 7 insertions, 4 deletions
diff --git a/configure b/configure
index f0913bc5ed..b9d6a42d37 100755
--- a/configure
+++ b/configure
@@ -2075,8 +2075,11 @@ case $target_os in
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
;;
mingw32*)
- # Only WinXP or greater are supported
- add_cflags -D_WIN32_WINNT=0x0501
+ # Adding _WIN32_WINNT=0x0501 makes functions that require
+ # XP visible and thus may make it binary incompatible with
+ # earlier versions. Set --target-os=mingw32-prexp if this
+ # isn't desired.
+ test $target_os = "mingw32" && add_cflags -D_WIN32_WINNT=0x0501
if test $target_os = "mingw32ce"; then
disable network
else
diff --git a/doc/general.texi b/doc/general.texi
index 69fc50abf6..3fb7a3a7de 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -998,8 +998,8 @@ and for a build with shared libraries
@subsection Win9x/Win2000 support
FFmpeg is built by default for Windows XP and above. To run it on any Windows
-version prior to XP, you may have to disable network support. Additionally, for
-Windows 98/Me you must install KernelEx from:
+version prior to XP, you must use @code{--target-os=mingw32-prexp}.
+Additionally, for Windows 98/Me you must install KernelEx from:
http://sourceforge.net/projects/kernelex/
@section BeOS