summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorSlavik Gnatenko <miracle9@newmail.ru>2003-03-11 12:09:13 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-03-11 12:09:13 +0000
commit69db4e10f27abe4d3a7036d5cdb29e1f9745c7a4 (patch)
treecc6816441950e87fe37d22dc37ea1dd25e0995d6 /configure
parentdf99755bda623b8619476697d12eaab3f5af61c3 (diff)
restoring OS/2 compatibility patch by ("Slavik Gnatenko" <miracle9 at newmail dot ru>)
Originally committed as revision 1663 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 6 insertions, 5 deletions
diff --git a/configure b/configure
index 0bc2cc7e3c..79a9b3e577 100755
--- a/configure
+++ b/configure
@@ -188,10 +188,11 @@ LDFLAGS="$LDFLAGS -rdynamic"
;;
OS/2)
TMPE=$TMPE".exe"
-ar="emxomfar -p32"
-strip="echo ignore strip"
-CFLAGS="-Zomf"
-LDFLAGS="-Zomf -Zstack 16384"
+ar="emxomfar -p64"
+ranlib="echo ignoring ranlib"
+strip="echo ignoring strip"
+CFLAGS="-Zomf -O3"
+LDFLAGS="-Zomf -Zstack 16384 -s"
SHFLAGS=""
FFSLDFLAGS=""
LIBPREF=""
@@ -561,7 +562,7 @@ int main( void ) { return (int) FT_Init_FreeType(0); }
EOF
freetype2=no
-if test "x$targetos" != "xBeOS"; then
+if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then
which freetype-config > /dev/null
if test $? -eq 0; then
if $cc -o $TMPE $TMPC `freetype-config --cflags` `freetype-config --libs` 2> /dev/null ; then