mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
v4l2rtspserver: simplify build using release 0.1.6
Signed-off-by: Michel Promonet <michel.promonet@free.fr>
This commit is contained in:
@@ -1,51 +0,0 @@
|
||||
From f732d44c2bc47e6eccf65e5eb3160734f11e5d3e Mon Sep 17 00:00:00 2001
|
||||
From: Rosen Penev <rosenp@gmail.com>
|
||||
Date: Thu, 27 Dec 2018 20:16:59 -0800
|
||||
Subject: [PATCH] Switch Makefile to compile with g++
|
||||
|
||||
With this change I managed to get OpenWrt to compile with uclibcxx
|
||||
instead of libstdcpp.
|
||||
|
||||
Made CXX adjustable by the shell as OpenWrt needs to override this.
|
||||
It also has its own ar.
|
||||
|
||||
EXTRA_CXXFLAGS seems to be the proper variable based on usage in the
|
||||
OpenWrt tree.
|
||||
---
|
||||
Makefile | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 51aaa37..f05bf0d 100644
|
||||
--- a/v4l2wrapper/Makefile
|
||||
+++ b/v4l2wrapper/Makefile
|
||||
@@ -1,12 +1,12 @@
|
||||
-CFLAGS = -W -Wall -pthread -g -pipe $(CFLAGS_EXTRA)
|
||||
-CFLAGS += -I inc
|
||||
+CXXFLAGS ?= -W -Wall -pthread -g -pipe $(EXTRA_CXXFLAGS)
|
||||
+CXXFLAGS += -I inc
|
||||
RM = rm -rf
|
||||
-CC = $(CROSS)gcc
|
||||
-AR = $(CROSS)ar
|
||||
+CXX ?= $(CROSS)g++
|
||||
+AR ?= $(CROSS)ar
|
||||
PREFIX?=/usr
|
||||
|
||||
ifneq ($(wildcard $(SYSROOT)$(PREFIX)/include/log4cpp/Category.hh),)
|
||||
-CFLAGS += -DHAVE_LOG4CPP -I $(SYSROOT)$(PREFIX)/include
|
||||
+CXXFLAGS += -DHAVE_LOG4CPP -I $(SYSROOT)$(PREFIX)/include
|
||||
endif
|
||||
|
||||
V4L2WRAPPER_CPP:=$(wildcard src/*.cpp)
|
||||
@@ -17,7 +17,7 @@ V4L2WRAPPER_OBJ:=$(V4L2WRAPPER_CPP:%.cpp=%.o)
|
||||
all: libv4l2wrapper.a
|
||||
|
||||
%.o: %.cpp
|
||||
- $(CC) -c -o $@ $< $(CFLAGS)
|
||||
+ $(CXX) -c -o $@ $< $(CXXFLAGS)
|
||||
|
||||
libv4l2wrapper.a: $(V4L2WRAPPER_OBJ)
|
||||
$(AR) rcs $@ $^
|
||||
--
|
||||
2.20.1
|
||||
|
||||
Reference in New Issue
Block a user