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 /Makefile | |
| parent | 143cc725273c130220e42b7281318ae80083cda3 (diff) | |
| download | ffmpeg-streaming-f3ec2d46bae60984cb9d0a26e94a2cc298b4f06d.zip ffmpeg-streaming-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 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -18,21 +18,26 @@ ifeq ($(CONFIG_WIN32),yes) EXE=.exe PROG=ffmpeg$(EXE) else -EXT= +ifeq ($(CONFIG_OS2),yes) +EXE=.exe +PROG=ffmpeg$(EXE) +else +EXE= PROG=ffmpeg ffplay ifeq ($(CONFIG_FFSERVER),yes) PROG+=ffserver endif endif +endif ifeq ($(CONFIG_AUDIO_BEOS),yes) EXTRALIBS+=-lmedia -lbe endif ifeq ($(BUILD_SHARED),yes) -DEP_LIBS=libavcodec/libavcodec.so libavformat/libavformat.a +DEP_LIBS=libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) else -DEP_LIBS=libavcodec/libavcodec.a libavformat/libavformat.a +DEP_LIBS=libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) ifeq ($(CONFIG_MP3LAME),yes) EXTRALIBS+=-lmp3lame endif @@ -61,7 +66,8 @@ ffmpeg_g$(EXE): ffmpeg.o $(DEP_LIBS) -lavformat -lavcodec $(EXTRALIBS) ffmpeg$(EXE): ffmpeg_g$(EXE) - cp -p $< $@ ; $(STRIP) $@ + cp -p $< $@ + $(STRIP) $@ ffserver$(EXE): ffserver.o $(DEP_LIBS) $(CC) $(LDFLAGS) $(FFSLDFLAGS) \ |
