Omkizing streamer without Aquosa support

[frescor/streamer.git] / Makefile.omk

diff --git a/Makefile.omk b/Makefile.omk
index 35be7ae4c18fb4efdaf9a1e4fb457e79fec81337..fa8978adc36f5c8b855bf713a9fd35cec13c1213 100644 (file)
--- a/Makefile.omk
+++ b/Makefile.omk
@@ -1,17 +1,10 @@
-#FFSRC ?= $(FFDIR)
-#CPPFLAGS= -I $(FFSRC)
 CFLAGS = -Wall
 CFLAGS += -Wdeclaration-after-statement
 CFLAGS += -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls
 CFLAGS += -Wno-pointer-sign 
-CFLAGS += -I /usr/include/ffmpeg
-#LDFLAGS= -L $(FFDIR)/libavutil -L $(FFDIR)/libavcodec -L $(FFDIR)/libavformat -L $(FFDIR)/libavdevice
-#LDLIBS = -lavdevice -lavformat -lavcodec -lavutil
+CFLAGS += -I /usr/local/include
 
-LDLIBS += -lm -lz
-#CFLAGS += -g
-
-ifdef AQUOSA
+ifdef CONFIG_AQUOSA
 CPPFLAGS += -I$(AQUOSA)/include
 LDFLAGS += -L$(AQUOSA)/lib
 LDLIBS += -lqreslib -lqmgrlib -lrt
@@ -23,4 +16,4 @@ endif
 bin_PROGRAMS=streamer
 streamer_SOURCES=streamer.c input.c codec.c output.c
 
-lib_LOADLIBES+= avformat avcodec avutil m z
+lib_LOADLIBES+= avformat avdevice swscale avcodec avutil m z