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

fixed build

Browse Source
This commit is contained in:
Devaev Maxim
2021-01-21 12:47:05 +03:00
parent 1b08857534
commit d9f4aba953
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile
View File

@@ -8,7 +8,7 @@ MANPREFIX ?= $(PREFIX)/share/man
CC ?= gcc CC ?= gcc
PY ?= python3 PY ?= python3
CFLAGS ?= -O3 -MD CFLAGS ?= -O3
LDFLAGS ?= LDFLAGS ?=
RPI_VC_HEADERS ?= /opt/vc/include RPI_VC_HEADERS ?= /opt/vc/include
@@ -20,7 +20,8 @@ LINTERS_IMAGE ?= $(USTR)-linters
# ===== # =====
override CFLAGS += -c -std=c11 -Wall -Wextra -D_GNU_SOURCE _CFLAGS = -MD -c -std=c11 -Wall -Wextra -D_GNU_SOURCE $(CFLAGS)
_LDFLAGS = $(LDFLAGS)
_COMMON_LIBS = -lm -ljpeg -pthread -lrt _COMMON_LIBS = -lm -ljpeg -pthread -lrt
@@ -48,7 +49,7 @@ endef
ifneq ($(call optbool,$(WITH_OMX)),) ifneq ($(call optbool,$(WITH_OMX)),)
_USTR_LIBS += -lbcm_host -lvcos -lvcsm -lopenmaxil -lmmal -lmmal_core -lmmal_util -lmmal_vc_client -lmmal_components -L$(RPI_VC_LIBS) _USTR_LIBS += -lbcm_host -lvcos -lvcsm -lopenmaxil -lmmal -lmmal_core -lmmal_util -lmmal_vc_client -lmmal_components -L$(RPI_VC_LIBS)
override CFLAGS += -DWITH_OMX -DOMX_SKIP64BIT -I$(RPI_VC_HEADERS) override _CFLAGS += -DWITH_OMX -DOMX_SKIP64BIT -I$(RPI_VC_HEADERS)
_USTR_SRCS += $(shell ls \ _USTR_SRCS += $(shell ls \
src/ustreamer/encoders/omx/*.c \ src/ustreamer/encoders/omx/*.c \
src/ustreamer/h264/*.c \ src/ustreamer/h264/*.c \
@@ -58,14 +59,14 @@ endif
ifneq ($(call optbool,$(WITH_GPIO)),) ifneq ($(call optbool,$(WITH_GPIO)),)
_USTR_LIBS += -lgpiod _USTR_LIBS += -lgpiod
override CFLAGS += -DWITH_GPIO override _CFLAGS += -DWITH_GPIO
_USTR_SRCS += $(shell ls src/ustreamer/gpio/*.c) _USTR_SRCS += $(shell ls src/ustreamer/gpio/*.c)
endif endif
WITH_PTHREAD_NP ?= 1 WITH_PTHREAD_NP ?= 1
ifneq ($(call optbool,$(WITH_PTHREAD_NP)),) ifneq ($(call optbool,$(WITH_PTHREAD_NP)),)
override CFLAGS += -DWITH_PTHREAD_NP override _CFLAGS += -DWITH_PTHREAD_NP
endif endif
@@ -74,7 +75,7 @@ ifneq ($(call optbool,$(WITH_SETPROCTITLE)),)
ifeq ($(shell uname -s | tr A-Z a-z),linux) ifeq ($(shell uname -s | tr A-Z a-z),linux)
_USTR_LIBS += -lbsd _USTR_LIBS += -lbsd
endif endif
override CFLAGS += -DWITH_SETPROCTITLE override _CFLAGS += -DWITH_SETPROCTITLE
endif endif
@@ -108,27 +109,27 @@ regen:
$(USTR): $(_USTR_SRCS:%.c=$(BUILD)/%.o) $(USTR): $(_USTR_SRCS:%.c=$(BUILD)/%.o)
# $(info ========================================) # $(info ========================================)
$(info == LD $@) $(info == LD $@)
@ $(CC) $^ -o $@ $(LDFLAGS) $(_USTR_LIBS) @ $(CC) $^ -o $@ $(_LDFLAGS) $(_USTR_LIBS)
# $(info :: CC = $(CC)) # $(info :: CC = $(CC))
# $(info :: LIBS = $(_USTR_LIBS)) # $(info :: LIBS = $(_USTR_LIBS))
# $(info :: CFLAGS = $(CFLAGS)) # $(info :: CFLAGS = $(_CFLAGS))
# $(info :: LDFLAGS = $(LDFLAGS)) # $(info :: LDFLAGS = $(_LDFLAGS))
$(DUMP): $(_DUMP_SRCS:%.c=$(BUILD)/%.o) $(DUMP): $(_DUMP_SRCS:%.c=$(BUILD)/%.o)
# $(info ========================================) # $(info ========================================)
$(info == LD $@) $(info == LD $@)
@ $(CC) $^ -o $@ $(LDFLAGS) $(_DUMP_LIBS) @ $(CC) $^ -o $@ $(_LDFLAGS) $(_DUMP_LIBS)
# $(info :: CC = $(CC)) # $(info :: CC = $(CC))
# $(info :: LIBS = $(_DUMP_LIBS)) # $(info :: LIBS = $(_DUMP_LIBS))
# $(info :: CFLAGS = $(CFLAGS)) # $(info :: CFLAGS = $(_CFLAGS))
# $(info :: LDFLAGS = $(LDFLAGS)) # $(info :: LDFLAGS = $(_LDFLAGS))
$(BUILD)/%.o: %.c $(BUILD)/%.o: %.c
$(info -- CC $<) $(info -- CC $<)
@ mkdir -p $(dir $@) || true @ mkdir -p $(dir $@) || true
@ $(CC) $< -o $@ $(CFLAGS) @ $(CC) $< -o $@ $(_CFLAGS)
python: python:

2
pkg/arch/PKGBUILD
View File

@@ -43,5 +43,5 @@ build() {
package() { package() {
cd "$srcdir/$pkgname-build" cd "$srcdir/$pkgname-build"
make DESTDIR="$pkgdir" PREFIX=/usr install make $_options DESTDIR="$pkgdir" PREFIX=/usr install
} }