From 23dc1a1471176f132fa0d8f66310de2b557e8654 Mon Sep 17 00:00:00 2001 From: Stefan Jahn Date: Tue, 19 Oct 2021 22:46:15 +0200 Subject: [PATCH] kompiliert jetzt auch auf ubuntu 16.04 lts --- Makefile.rules.linux | 2 +- video.cc | 1 + video.h | 1 + videodev.cc | 3 +++ videoframe.cc | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.rules.linux b/Makefile.rules.linux index 3c2cb03..3857cad 100644 --- a/Makefile.rules.linux +++ b/Makefile.rules.linux @@ -2,7 +2,7 @@ TARGET = $(APP) CPP = c++ -CPPFLAGS = -ggdb -Wall -O0 `pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -I/usr/include -DBUILD_LINUX=1 +CPPFLAGS = -std=c++11 -ggdb -Wall -O0 `pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -I/usr/include -DBUILD_LINUX=1 INCLUDES = LDFLAGS = LIBS = `pkg-config --libs gtk+-3.0 gmodule-export-2.0` -L/usr/lib -ljpeg diff --git a/video.cc b/video.cc index 280eac0..ba9f46c 100644 --- a/video.cc +++ b/video.cc @@ -7,6 +7,7 @@ #include #include #include +#include #include "gui.h" #include "video.h" #include "filter.h" diff --git a/video.h b/video.h index 16a3619..f47b022 100644 --- a/video.h +++ b/video.h @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/videodev.cc b/videodev.cc index 8bcf952..fd6f946 100644 --- a/videodev.cc +++ b/videodev.cc @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -306,7 +307,9 @@ void VideoDev::PrintCaps(uint32_t caps) { if (caps & V4L2_CAP_VIDEO_CAPTURE) printf (" V4L2_CAP_VIDEO_CAPTURE\n"); if (caps & V4L2_CAP_EXT_PIX_FORMAT) printf (" V4L2_CAP_EXT_PIX_FORMAT\n"); +#ifdef V4L2_CAP_META_CAPTURE if (caps & V4L2_CAP_META_CAPTURE) printf (" V4L2_CAP_META_CAPTURE\n"); +#endif if (caps & V4L2_CAP_STREAMING) printf (" V4L2_CAP_STREAMING\n"); if (caps & V4L2_CAP_DEVICE_CAPS) printf (" V4L2_CAP_DEVICE_CAPS\n"); if (caps & V4L2_CAP_TUNER) printf (" V4L2_CAP_TUNER\n"); diff --git a/videoframe.cc b/videoframe.cc index c7acd9f..21e57e5 100644 --- a/videoframe.cc +++ b/videoframe.cc @@ -1,4 +1,5 @@ +#include #include "video.h" #include "config.h" #include "gui.h"