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.

Sign up for GitHub

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

Jump to bottom

Replace obs-websocket-api copy with CMake target #454

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace obs-websocket-api copy with CMake target #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ target_sources(
cef-headers.hpp
deps/base64/base64.cpp
deps/base64/base64.hpp
deps/obs-websocket-api/obs-websocket-api.h
deps/signal-restore.cpp
deps/signal-restore.hpp
deps/wide-string.cpp
Expand All @@ -44,7 +43,7 @@ target_sources(
target_include_directories(obs-browser PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps")

target_compile_features(obs-browser PRIVATE cxx_std_17)
target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api nlohmann_json::nlohmann_json)
target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api OBS::websocket-api nlohmann_json::nlohmann_json)

if(OS_WINDOWS)
include(cmake/os-windows.cmake)
Expand Down
3 changes: 0 additions & 3 deletions deps/obs-websocket-api/.clang-format
View file
Open in desktop

This file was deleted.

135 changes: 0 additions & 135 deletions deps/obs-websocket-api/obs-websocket-api.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion obs-browser-plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
#include <thread>
#include <mutex>
#include <nlohmann/json.hpp>
#include <obs-websocket-api.h>

#include "obs-browser-source.hpp"
#include "browser-scheme.hpp"
#include "browser-app.hpp"
#include "browser-version.h"

#include "obs-websocket-api/obs-websocket-api.h"
#include "cef-headers.hpp"

#ifdef _WIN32
Expand Down