Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relay flags to libv4l2rtspserver target #13

Merged
merged 1 commit into from
Dec 5, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GSOAP_BIN?=$(GSOAP_PREFIX)/bin
GSOAP_BASE=$(GSOAP_PREFIX)/share/gsoap
GSOAP_PLUGINS=$(GSOAP_BASE)/plugin

CMAKE_CXX_FLAGS:=$(CXXFLAGS)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To use it on libv4l2rtspserver cmake, the flags need to be copied before the hard coded values below are added to it.

CXXFLAGS+=-std=c++11 -g2 -I inc -I ws-discovery/gsoap/
CXXFLAGS+=-I gen -I $(GSOAP_PREFIX)/include -I $(GSOAP_PLUGINS)
CXXFLAGS+=-DWITH_DOM -DWITH_OPENSSL -DSOAP_PURE_VIRTUAL -fpermissive -pthread -DVERSION=\"$(VERSION)\"
Expand Down Expand Up @@ -64,7 +65,7 @@ libwsdd.a:
# v4l2rtsp
liblibv4l2rtspserver.a:
git submodule update --recursive --init v4l2rtspserver
cd v4l2rtspserver && cmake -DALSA=OFF . && make libv4l2rtspserver
cd v4l2rtspserver && cmake -DALSA=OFF -DCMAKE_CXX_COMPILER=$(CXX) -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_FLAGS=$(CMAKE_CXX_FLAGS) . && make libv4l2rtspserver
cp v4l2rtspserver/$@ .


Expand Down