Proper CPU contracts in streamer

[frescor/streamer.git] / Makefile.omk

diff --git a/Makefile.omk b/Makefile.omk
index 595b8128e8553427ae25356e731a649ad017f70c..bfa0b59f65f1c1999cb7f3aa5d8c0768d6046e29 100644 (file)
--- a/Makefile.omk
+++ b/Makefile.omk
@@ -1,10 +1,11 @@
-default_CONFIG += CONFIG_STREAMER_WITH_FRSH=y
+default_CONFIG += CONFIG_FFMPEG_WITH_FRSH=x
 default_CONFIG += CONFIG_AQUOSA=x
+default_CONFIG += CONFIG_OC_ULUT=x
+default_CONFIG += FRSH_CPU_ID_DEFAULT=x
 
 LOCAL_CONFIG_H = streamer_config.h
 
 CFLAGS += -Wall
-CFLAGS += -Wdeclaration-after-statement
 CFLAGS += -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls
 CFLAGS += -Wno-pointer-sign 
 CFLAGS += -I /usr/local/include
@@ -22,7 +23,7 @@ bin_PROGRAMS=streamer
 streamer_SOURCES=streamer.c input.c codec.c output.c
 
 lib_LOADLIBES+= postproc swscale avfilter avdevice avformat avcodec avutil m z pthread
-lib_LOADLIBES+= z bz2 m asound jack dl asound jack asound
-ifeq ($(CONFIG_STREAMER_WITH_FRSH),y)
+lib_LOADLIBES+= z bz2 m asound jack dl asound jack asound ulut
+ifeq ($(CONFIG_FFMPEG_WITH_FRSH),y)
 lib_LOADLIBES+= pthread rt fwp fna frsh
-endif
\ No newline at end of file
+endif