forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-16 04:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed build

Browse Source
This commit is contained in:
Devaev Maxim
2018-09-25 00:06:21 +03:00
parent 0717d2ee6a
commit 8152d35bb3
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -10,16 +10,16 @@ OBJECTS = $(SOURCES:.c=.o)
PROG = ustreamer PROG = ustreamer
ifeq ($(shell ls -d /opt/vc/include 2>/dev/null), /opt/vc/include)
SOURCES += $(shell ls src/omx/*.c)
LIBS += -lbcm_host -lvcos -lopenmaxil -L/opt/vc/lib
CFLAGS += -DOMX_ENCODER -DOMX_SKIP64BIT -I/opt/vc/include
endif
all: $(SOURCES) $(PROG) all: $(SOURCES) $(PROG)
rpi:
make all \
SOURCES="$(SOURCES) $(shell ls src/omx/*.c)" \
LIBS="$(LIBS) -lbcm_host -lvcos -lopenmaxil -L/opt/vc/lib" \
CFLAGS="$(CFLAGS) -DOMX_ENCODER -DOMX_SKIP64BIT -I/opt/vc/include"
install: $(PROG) install: $(PROG)
install -Dm755 $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) install -Dm755 $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)

17
src/encoder.h
View File

@@ -26,20 +26,15 @@
#ifdef OMX_ENCODER #ifdef OMX_ENCODER
# include "omx/encoder.h" # include "omx/encoder.h"
# define ENCODER_TYPES_OMX_HINT ", OMX"
#else
# define ENCODER_TYPES_OMX_HINT ""
#endif #endif
#define ENCODER_TYPES_STR "CPU" #define ENCODER_TYPES_STR \
#define PUSH _Pragma("push_macro(\"ENCODER_TYPES_STR\")") "CPU" \
#define POP _Pragma("pop_macro(\"ENCODER_TYPES_STR\")") ENCODER_TYPES_OMX_HINT
#ifdef OMX_ENCODER
PUSH
# undef ENCODER_TYPES_STR
# define ENCODER_TYPES_STR POP ENCODER_TYPES_STR ", OMX"
#endif
#undef PUSH
#undef POP
enum encoder_type_t { enum encoder_type_t {
ENCODER_TYPE_UNKNOWN, // Only for encoder_parse_type() and main() ENCODER_TYPE_UNKNOWN, // Only for encoder_parse_type() and main()