Merge branch 'master' of rtime.felk.cvut.cz:frescor/demo

[frescor/demo.git] / build / Makefile.omk.ffmpeg

diff --git a/build/Makefile.omk.ffmpeg b/build/Makefile.omk.ffmpeg
index 004755ec390c4171e818dbd59147aab05126549e..dd600af0d70d15dd1f0f49b82f0f217d7a40012e 100644 (file)
--- a/build/Makefile.omk.ffmpeg
+++ b/build/Makefile.omk.ffmpeg
@@ -1,6 +1,11 @@
+# -*- makefile-gmake -*-
+CFLAGS_SAVED:=$(CFLAGS)
+include $(OUTPUT_DIR)/_build/user/$(RELATIVE_DIR)/Makefile.inc.ffmpeg
+CFLAGS:=$(CFLAGS) $(CFLAGS_SAVED)
+
 lib_LIBRARIES:=$(NAME)
 $(NAME)_SOURCES:=$(OBJS:%.o=%.c) $(OBJS-y:%.o=%.c) $(OBJS-yes:%.o=%.c)
-renamed_include_HEADERS:=$(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
+renamed_include_HEADERS = $(foreach h,$(HEADERS),$(h)->lib$(NAME)/$(h) )
 INCLUDES += -I $(dir $(srcdir:%/=%)) # this should point to ffmpeg sources
 
 ifeq ($(FFMPEG_SUBDIR),ffmpeg)
@@ -8,16 +13,22 @@ SUBDIRS = tools libavcodec libavdevice libavfilter libavformat       \
          libavutil libpostproc libswscale
 renamed_include_HEADERS=
 
-# bin_PROGRAMS = ffmpeg pktdumper
-# pktdumper_SOURCES = tools/pktdumper.c
-# pktdumper_LIBS = avformat
+renamed_include_GEN_HEADERS=config.h->ffmpeg-config.h
+
+bin_PROGRAMS = ffmpeg #pktdumper
+pktdumper_SOURCES = tools/pktdumper.c
+pktdumper_LIBS = avformat
 
 ffmpeg_SOURCES = ffmpeg.c cmdutils.c
 lib_LOADLIBES = $(ALLFFLIBS) $(FFEXTRALIBS:-l%=%)
+ifeq ($(CONFIG_FFMPEG_WITH_FRSH),y)
+lib_LOADLIBES+= pthread rt fwp fna frsh
+endif
 endif
 
 ifeq ($(FFMPEG_SUBDIR),libavcodec)
 SUBDIRS=x86
+HEADERS += audioconvert.h
 endif
 
 ifeq ($(FFMPEG_SUBDIR),libavutil)
@@ -27,7 +38,7 @@ renamed_include_HEADERS += x86/timer.h->libavutil/x86/timer.h
 endif
 
 ifeq ($(FFMPEG_SUBDIR),libavformat)
-ifeq ($(CONFIG_FFMPEG_WITH_FRSH),y)
-$(NAME)_SOURCES := $(filter-out udp.c,$(NAME)_SOURCES) frsh.c
-endif
+HEADERS += os_support.h network.h
+default_CONFIG += CONFIG_FFMPEG_WITH_FRSH=x
+LOCAL_CONFIG_H = libavformat_config.h
 endif