diff options
| author | Slavik Gnatenko <miracle9@newmail.ru> | 2003-01-11 20:34:38 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-01-11 20:34:38 +0000 |
| commit | f3ec2d46bae60984cb9d0a26e94a2cc298b4f06d (patch) | |
| tree | 3f59e4e94680c16859794b5ead5ce03eb51d0c31 /libavcodec | |
| parent | 143cc725273c130220e42b7281318ae80083cda3 (diff) | |
| download | ffmpeg-f3ec2d46bae60984cb9d0a26e94a2cc298b4f06d.tar.gz | |
os2 support patch by ("Slavik Gnatenko" <miracle9 at newmail dot ru>)
Originally committed as revision 1447 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 6 | ||||
| -rw-r--r-- | libavcodec/common.h | 35 |
2 files changed, 37 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8d0e8384ce..11e9603d92 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -91,9 +91,9 @@ endif SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) OBJS := $(OBJS) $(ASM_OBJS) -LIB= libavcodec.a +LIB= $(LIBPREF)avcodec$(LIBSUF) ifeq ($(BUILD_SHARED),yes) -SLIB= libavcodec.so +SLIB= $(SLIBPREF)avcodec$(SLIBSUF) endif TESTS= imgresample-test dct-test motion-test fft-test @@ -104,7 +104,9 @@ tests: apiexample cpuid_test $(TESTS) $(LIB): $(OBJS) rm -f $@ $(AR) rc $@ $(OBJS) +ifneq ($(CONFIG_OS2),yes) $(RANLIB) $@ +endif $(SLIB): $(OBJS) $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) diff --git a/libavcodec/common.h b/libavcodec/common.h index b8cf9f6739..afa085bc2b 100644 --- a/libavcodec/common.h +++ b/libavcodec/common.h @@ -89,7 +89,38 @@ typedef INT64 int64_t; # define snprintf _snprintf -#else /* CONFIG_WIN32 */ +/* CONFIG_WIN32 end */ +#elif defined (CONFIG_OS2) +/* OS/2 EMX */ + +#include <inttypes.h> + +typedef unsigned char UINT8; +typedef unsigned short UINT16; +typedef unsigned int UINT32; +typedef unsigned long long UINT64; +typedef signed char INT8; +typedef signed short INT16; +typedef signed int INT32; +typedef signed long long INT64; + +#ifdef HAVE_AV_CONFIG_H + +#ifndef INT64_C +#define INT64_C(c) (c ## LL) +#define UINT64_C(c) (c ## ULL) +#endif + +#ifdef USE_FASTMEMCPY +#include "fastmemcpy.h" +#endif + +#include <float.h> + +#endif /* HAVE_AV_CONFIG_H */ + +/* CONFIG_OS2 end */ +#else /* unix */ @@ -119,7 +150,7 @@ typedef signed long long INT64; # endif # endif /* HAVE_AV_CONFIG_H */ -#endif /* !CONFIG_WIN32 */ +#endif /* !CONFIG_WIN32 && !CONFIG_OS2 */ #ifdef HAVE_AV_CONFIG_H |