From 6fc8a1375401016d97c61494f11231ac47e3db19 Mon Sep 17 00:00:00 2001
From: Kovenksy <diogomfranco@gmail.com>
Date: Sat, 31 Oct 2009 12:36:54 -0300
Subject: [PATCH] Add used configure options

Also added --enable-ffmpeg, so I have a ffmpeg.exe to
copy over for testing / encoding.
---
 build/i586-mingw32msvc/ffmpeg_options                   |  1 +
 build/msys-mingw32/common_options                       |  9 +++++++++
 build/{i586-mingw32msvc => msys-mingw32}/ffmpeg_options |  7 ++-----
 build/msys-mingw32/libass_options                       |  6 ++++++
 build/msys-mingw32/mplayer_options                      | 16 ++++++++++++++++
 5 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 build/msys-mingw32/common_options
 copy build/{i586-mingw32msvc => msys-mingw32}/ffmpeg_options (85%)
 create mode 100644 build/msys-mingw32/libass_options
 create mode 100644 build/msys-mingw32/mplayer_options

diff --git a/build/i586-mingw32msvc/ffmpeg_options b/build/i586-mingw32msvc/ffmpeg_options
index 3daaddeee1..0cfbd8cc2e 100644
--- a/build/i586-mingw32msvc/ffmpeg_options
+++ b/build/i586-mingw32msvc/ffmpeg_options
@@ -22,3 +22,4 @@
 --enable-libopencore-amrnb
 --enable-libopencore-amrwb
 --enable-runtime-cpudetect
+--enable-ffmpeg
\ No newline at end of file
diff --git a/build/msys-mingw32/common_options b/build/msys-mingw32/common_options
new file mode 100644
index 0000000000..7c9249e90c
--- /dev/null
+++ b/build/msys-mingw32/common_options
@@ -0,0 +1,9 @@
+# You can place options common for both MPlayer and FFmpeg configure in
+# this file. This mainly makes sense for generic things like --cc.
+
+# Place each option on its own line. Empty lines and lines starting with '#'
+# are ignored. The options do not need quoting, so you can have for example
+# --extra-libs=-lfoo -lbar
+# (and NOT --extra-libs='-lfoo -lbar').
+--extra-cflags=-DPTW32_STATIC_LIB -DLIBTWOLAME_STATIC -Dspeex_header_free=av_free -fno-common -O3 -march=pentium2 -mtune=i686 -pipe -w
+--extra-libs=-lx264 -lpthread -lws2_32 -lz -lm -lfontconfig -lexpat -lfreetype
\ No newline at end of file
diff --git a/build/i586-mingw32msvc/ffmpeg_options b/build/msys-mingw32/ffmpeg_options
similarity index 85%
copy from build/i586-mingw32msvc/ffmpeg_options
copy to build/msys-mingw32/ffmpeg_options
index 3daaddeee1..5c18518e7f 100644
--- a/build/i586-mingw32msvc/ffmpeg_options
+++ b/build/msys-mingw32/ffmpeg_options
@@ -4,15 +4,12 @@
 # are ignored. The options do not need quoting, so you can have for example
 # --extra-libs=-lfoo -lbar
 # (and NOT --extra-libs='-lfoo -lbar').
---cross-prefix=i586-mingw32msvc-
---target-os=mingw32
---target-exec=wine
---arch=x86
---cpu=i686
+--cpu=pentium2
 --enable-memalign-hack
 --enable-nonfree
 --enable-avisynth
 --enable-libdirac
+--enable-libmp3lame
 --enable-libspeex
 --enable-libtheora
 --enable-libvorbis
diff --git a/build/msys-mingw32/libass_options b/build/msys-mingw32/libass_options
new file mode 100644
index 0000000000..59d447ecfa
--- /dev/null
+++ b/build/msys-mingw32/libass_options
@@ -0,0 +1,6 @@
+# You can place options for libass configure in this file.
+
+# Place each option on its own line. Empty lines and lines starting with '#'
+# are ignored. The options do not need quoting, so you can have for example
+# --extra-libs=-lfoo -lbar
+# (and NOT --extra-libs='-lfoo -lbar').
diff --git a/build/msys-mingw32/mplayer_options b/build/msys-mingw32/mplayer_options
new file mode 100644
index 0000000000..5125fa566e
--- /dev/null
+++ b/build/msys-mingw32/mplayer_options
@@ -0,0 +1,16 @@
+# You can place options for MPlayer configure in this file.
+
+# Place each option on its own line. Empty lines and lines starting with '#'
+# are ignored. The options do not need quoting, so you can have for example
+# --extra-libs=-lfoo -lbar
+# (and NOT --extra-libs='-lfoo -lbar').
+--enable-menu
+--enable-static
+--enable-fontconfig
+--enable-x264
+--enable-matrixview
+--disable-tremor-internal
+--enable-runtime-cpudetection
+--extra-ldflags=-lcaca -lz
+--enable-caca
+--with-fribidi-config=pkg-config fribidi
\ No newline at end of file
-- 
2.11.4.GIT