Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Mirrored_Repos:5.2.1
Branches Tags
Mirrored_Repos:master Mirrored_Repos:experimental-batch-logic Mirrored_Repos:release/5.2.3 Mirrored_Repos:4.x-compat-new-cmake Mirrored_Repos:4.x-compat Mirrored_Repos:release/5.0.0
Mirrored_Repos:5.5.2 Mirrored_Repos:5.5.1 Mirrored_Repos:5.5.0 Mirrored_Repos:5.4.2 Mirrored_Repos:5.4.1 Mirrored_Repos:5.4.0 Mirrored_Repos:5.3.5 Mirrored_Repos:5.3.4 Mirrored_Repos:5.3.3 Mirrored_Repos:5.3.2 Mirrored_Repos:5.3.1 Mirrored_Repos:5.3.0 Mirrored_Repos:5.2.3 Mirrored_Repos:5.2.2 Mirrored_Repos:5.2.1 Mirrored_Repos:5.2.0 Mirrored_Repos:5.1.0 Mirrored_Repos:5.0.2 Mirrored_Repos:4.9.1-compat Mirrored_Repos:5.0.1 Mirrored_Repos:5.0.0 Mirrored_Repos:5.0.0-beta1 Mirrored_Repos:5.0.0-notarize-test Mirrored_Repos:5.0.0-alpha3 Mirrored_Repos:5.0.0-alpha2 Mirrored_Repos:5.0.0-alpha1 Mirrored_Repos:4.9.1 Mirrored_Repos:4.9.0 Mirrored_Repos:4.8.0 Mirrored_Repos:4.7.0 Mirrored_Repos:4.6.1 Mirrored_Repos:4.6.0 Mirrored_Repos:4.5.1 Mirrored_Repos:4.5.0 Mirrored_Repos:4.4.0 Mirrored_Repos:4.3.3 Mirrored_Repos:4.3.2 Mirrored_Repos:4.3.1 Mirrored_Repos:4.3.0 Mirrored_Repos:4.2.0 Mirrored_Repos:4.1.0 Mirrored_Repos:4.0.0 Mirrored_Repos:0.3.2 Mirrored_Repos:0.3.1 Mirrored_Repos:0.3-alpha
..
compare: Mirrored_Repos:5.2.2
Branches Tags
Mirrored_Repos:master Mirrored_Repos:experimental-batch-logic Mirrored_Repos:release/5.2.3 Mirrored_Repos:4.x-compat-new-cmake Mirrored_Repos:4.x-compat Mirrored_Repos:release/5.0.0
Mirrored_Repos:5.5.2 Mirrored_Repos:5.5.1 Mirrored_Repos:5.5.0 Mirrored_Repos:5.4.2 Mirrored_Repos:5.4.1 Mirrored_Repos:5.4.0 Mirrored_Repos:5.3.5 Mirrored_Repos:5.3.4 Mirrored_Repos:5.3.3 Mirrored_Repos:5.3.2 Mirrored_Repos:5.3.1 Mirrored_Repos:5.3.0 Mirrored_Repos:5.2.3 Mirrored_Repos:5.2.2 Mirrored_Repos:5.2.1 Mirrored_Repos:5.2.0 Mirrored_Repos:5.1.0 Mirrored_Repos:5.0.2 Mirrored_Repos:4.9.1-compat Mirrored_Repos:5.0.1 Mirrored_Repos:5.0.0 Mirrored_Repos:5.0.0-beta1 Mirrored_Repos:5.0.0-notarize-test Mirrored_Repos:5.0.0-alpha3 Mirrored_Repos:5.0.0-alpha2 Mirrored_Repos:5.0.0-alpha1 Mirrored_Repos:4.9.1 Mirrored_Repos:4.9.0 Mirrored_Repos:4.8.0 Mirrored_Repos:4.7.0 Mirrored_Repos:4.6.1 Mirrored_Repos:4.6.0 Mirrored_Repos:4.5.1 Mirrored_Repos:4.5.0 Mirrored_Repos:4.4.0 Mirrored_Repos:4.3.3 Mirrored_Repos:4.3.2 Mirrored_Repos:4.3.1 Mirrored_Repos:4.3.0 Mirrored_Repos:4.2.0 Mirrored_Repos:4.1.0 Mirrored_Repos:4.0.0 Mirrored_Repos:0.3.2 Mirrored_Repos:0.3.1 Mirrored_Repos:0.3-alpha

3 Commits
5.2.1 ... 5.2.2

Author SHA1 Message Date
Ryan Foster
6ef055a369 base: Update version to 5.2.2 
- Various minor build process cleanups
 2023-04-04 15:13:15 -04:00
tytan652
a4ee9c03ea base: Remove unneeded include directories 
Asio and WebSocket++ are no longer added as submodules.
They are now included in obs-deps.
 2023-04-04 12:15:33 -04:00
Norihiro Kamae
9912c9963c base: Remove unnecessary entries in .gitignore 
the commit 21886adb3 moves the destination of the generated files into
the build directory so that it is unnecessary to hide the generated
files by .gitignore.
 2023-04-04 12:14:11 -04:00
3 changed files with 2 additions and 6 deletions
Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,7 +2,6 @@
.DS_Store .DS_Store
.idea .idea
.vscode .vscode
**.generated.h
/build/ /build/
/build32/ /build32/
/build64/ /build64/
@ -10,5 +9,4 @@
/package/ /package/
/installer/Output/ /installer/Output/
/docs/node_modules/ /docs/node_modules/
/installer/installer-windows.generated.iss
/cmake-build-debug/ /cmake-build-debug/

4
CMakeLists.txt
View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16...3.25)
legacy_check() legacy_check()
set(obs-websocket_VERSION 5.2.0) set(obs-websocket_VERSION 5.2.2)
set(OBS_WEBSOCKET_RPC_VERSION 1) set(OBS_WEBSOCKET_RPC_VERSION 1)
option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON) option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
@ -145,8 +145,6 @@ target_compile_options(
$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=null-pointer-subtraction;-Wno-error=deprecated-declarations;-Wno-error=implicit-int-conversion;-Wno-error=shorten-64-to-32> $<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=null-pointer-subtraction;-Wno-error=deprecated-declarations;-Wno-error=implicit-int-conversion;-Wno-error=shorten-64-to-32>
) )
target_include_directories(obs-websocket PRIVATE deps/asio/asio/include deps/websocketpp)
target_link_libraries( target_link_libraries(
obs-websocket obs-websocket
PRIVATE OBS::libobs PRIVATE OBS::libobs

2
cmake/legacy.cmake
View File

@ -1,4 +1,4 @@
project(obs-websocket VERSION 5.2.0) project(obs-websocket VERSION 5.2.2)
set(OBS_WEBSOCKET_RPC_VERSION 1) set(OBS_WEBSOCKET_RPC_VERSION 1)
option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON) option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)