Skip to content
This repository was archived by the owner on Mar 15, 2021. It is now read-only.

Fix build #61

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix build #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66f9b4d
Fix build
aleixpol Aug 9, 2020
d499b3f
Remove unused cmake variable
aleixpol Aug 9, 2020
d15d6bd
LibObsConfig already sets the necessary include directories
aleixpol Aug 9, 2020
42e1bc2
Fix warning
aleixpol Aug 9, 2020
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
11 changes: 0 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 3.5)
project(obs-v4l2sink)


include(external/FindLibObs.cmake)
find_package(LibObs REQUIRED)

set (CMAKE_CXX_STANDARD 11)
Expand All @@ -23,9 +21,6 @@ set(virtualoutput_HEADERS
src/v4l2sink.h
src/v4l2sinkproperties.h)

include_directories(
"${LIBOBS_INCLUDE_DIR}/../UI/obs-frontend-api")

add_library(v4l2sink MODULE
${virtualoutput_SOURCES}
${virtualoutput_HEADERS})
Expand All @@ -35,12 +30,6 @@ target_link_libraries(v4l2sink
Qt5::Core
Qt5::Widgets)

if(ARCH EQUAL 64)
set(ARCH_NAME "x86_64")
else()
set(ARCH_NAME "i686")
endif()

set_target_properties(v4l2sink PROPERTIES PREFIX "")

install(TARGETS v4l2sink
Expand Down
107 changes: 0 additions & 107 deletions external/FindLibObs.cmake
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/v4l2sink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ int v4l2device_open(void *data)



static bool v4l2device_close(void *data)
static void v4l2device_close(void *data)
{
v4l2sink_data *out_data = (v4l2sink_data*)data;
close(out_data->v4l2_fd);
Expand Down