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
This commit is contained in:
Slavik Gnatenko 2003-03-11 12:09:13 +00:00 committed by Michael Niedermayer
parent df99755bda
commit 69db4e10f2
6 changed files with 15 additions and 9 deletions

11
configure vendored
View File

@ -188,10 +188,11 @@ LDFLAGS="$LDFLAGS -rdynamic"
;; ;;
OS/2) OS/2)
TMPE=$TMPE".exe" TMPE=$TMPE".exe"
ar="emxomfar -p32" ar="emxomfar -p64"
strip="echo ignore strip" ranlib="echo ignoring ranlib"
CFLAGS="-Zomf" strip="echo ignoring strip"
LDFLAGS="-Zomf -Zstack 16384" CFLAGS="-Zomf -O3"
LDFLAGS="-Zomf -Zstack 16384 -s"
SHFLAGS="" SHFLAGS=""
FFSLDFLAGS="" FFSLDFLAGS=""
LIBPREF="" LIBPREF=""
@ -561,7 +562,7 @@ int main( void ) { return (int) FT_Init_FreeType(0); }
EOF EOF
freetype2=no freetype2=no
if test "x$targetos" != "xBeOS"; then if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then
which freetype-config > /dev/null which freetype-config > /dev/null
if test $? -eq 0; then if test $? -eq 0; then
if $cc -o $TMPE $TMPC `freetype-config --cflags` `freetype-config --libs` 2> /dev/null ; then if $cc -o $TMPE $TMPC `freetype-config --cflags` `freetype-config --libs` 2> /dev/null ; then

View File

@ -33,6 +33,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/select.h> #include <sys/select.h>
#include <stdlib.h> #include <stdlib.h>
#define usleep(t) _sleep2((t)/1000)
#endif #endif
#include <time.h> #include <time.h>
#include <ctype.h> #include <ctype.h>

View File

@ -125,9 +125,7 @@ tests: apiexample cpuid_test $(TESTS)
$(LIB): $(OBJS) $(LIB): $(OBJS)
rm -f $@ rm -f $@
$(AR) rc $@ $(OBJS) $(AR) rc $@ $(OBJS)
ifneq ($(CONFIG_OS2),yes)
$(RANLIB) $@ $(RANLIB) $@
endif
$(SLIB): $(OBJS) $(SLIB): $(OBJS)
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS)

View File

@ -12,6 +12,10 @@
#include "avcodec.h" #include "avcodec.h"
#ifdef CONFIG_OS2
#define strcasecmp(s1,s2) stricmp(s1,s2)
#endif
const AVOption avoptions_common[] = { const AVOption avoptions_common[] = {
AVOPTION_CODEC_FLAG("bit_exact", "use only bit-exact stuff", flags, CODEC_FLAG_BITEXACT, 0), AVOPTION_CODEC_FLAG("bit_exact", "use only bit-exact stuff", flags, CODEC_FLAG_BITEXACT, 0),
AVOPTION_CODEC_FLAG("mm_force", "force mm flags", dsp_mask, FF_MM_FORCE, 0), AVOPTION_CODEC_FLAG("mm_force", "force mm flags", dsp_mask, FF_MM_FORCE, 0),

View File

@ -24,6 +24,10 @@
#include "avcodec.h" #include "avcodec.h"
#if defined (CONFIG_OS2)
#define floorf(n) floor(n)
#endif
typedef struct { typedef struct {
/* fractional resampling */ /* fractional resampling */
uint32_t incr; /* fractional increment */ uint32_t incr; /* fractional increment */

View File

@ -67,9 +67,7 @@ all: $(LIB)
$(LIB): $(OBJS) $(PPOBJS) $(LIB): $(OBJS) $(PPOBJS)
rm -f $@ rm -f $@
$(AR) rc $@ $(OBJS) $(PPOBJS) $(AR) rc $@ $(OBJS) $(PPOBJS)
ifneq ($(CONFIG_OS2),yes)
$(RANLIB) $@ $(RANLIB) $@
endif
depend: $(SRCS) depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend $(CC) -MM $(CFLAGS) $^ 1>.depend