Merge pull request CatxFish#8 from twz123/fix-build

Set CXX11 standard, add missing import, correct cmake params in README
josephgeis · Oct 13, 2018 · 1ec3c8a · 1ec3c8a
2 parents b38ffb3 + 408a2ac
commit 1ec3c8a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,6 +5,7 @@ project(obs-v4l2sink)
 include(external/FindLibObs.cmake)
 find_package(LibObs REQUIRED)
 
+set (CMAKE_CXX_STANDARD 11)
 set(CMAKE_PREFIX_PATH "${QTDIR}")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)

diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ git clone --recursive https://github.com/obsproject/obs-studio.git
 git clone https://github.com/CatxFish/obs-v4l2sink.git
 cd obs-v4l2sink
 mkdir build && cd build
-cmake -DLIBOBS_INCLUDE_DIR="../obs-studio/libobs" -DCMAKE_INSTALL_PREFIX=/usr ..
+cmake -DLIBOBS_INCLUDE_DIR="../../obs-studio/libobs" -DCMAKE_INSTALL_PREFIX=/usr ..
 make -j4
 sudo make install
 ```
diff --git a/src/v4l2sink.cpp b/src/v4l2sink.cpp
@@ -22,6 +22,7 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdio.h>
 #include "v4l2sink.h"
 #include "v4l2sinkproperties.h"
 
@@ -31,7 +32,7 @@
 #define V4L2SINK_ERROR_OTHER   3
 
 struct v4l2sink_data{
-        obs_output_t *output = nullptr;
+	obs_output_t *output = nullptr;
 	bool active = false;
 	int v4l2_fd = 0;
 	int width = 0;
@@ -375,4 +376,3 @@ signal_handler_t* v4l2sink_get_signal_handler()
 {
 	return obs_output_get_signal_handler(v4l2_out);	
 }
-