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 e6f1084a6b7cbc7fb30f60670b565b93b424ea43..dd600af0d70d15dd1f0f49b82f0f217d7a40012e 100644 (file)
--- a/build/Makefile.omk.ffmpeg
+++ b/build/Makefile.omk.ffmpeg
@@ -1,4 +1,7 @@
 # -*- 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)