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:4.3.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
...
compare: Mirrored_Repos:4.3.3
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
4.3.2 ... 4.3.3

Author SHA1 Message Date
Stéphane L
6eb49930bf general: version bump to 4.3.3 2018-03-19 01:11:35 +01:00
Stéphane L
3a0d5fb190 CI: let's try with VS2015 instead 2018-03-18 23:25:38 +01:00
Stéphane L
8c2eee2e25 CI: update Windows builds to VS2017 and Qt 5.10.1 2018-03-18 23:25:31 +01:00
6 changed files with 15 additions and 30 deletions
Expand all files Collapse all files

4
CI/install-build-obs.cmd
View File

@ -97,12 +97,12 @@ if defined BuildOBS (
mkdir build64 mkdir build64
echo Running cmake for obs-studio %OBSLatestTag% 32-bit... echo Running cmake for obs-studio %OBSLatestTag% 32-bit...
cd ./build32 cd ./build32
cmake -G "Visual Studio 12 2013" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true .. cmake -G "Visual Studio 14 2015" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true ..
echo: echo:
echo: echo:
echo Running cmake for obs-studio %OBSLatestTag% 64-bit... echo Running cmake for obs-studio %OBSLatestTag% 64-bit...
cd ../build64 cd ../build64
cmake -G "Visual Studio 12 2013 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true .. cmake -G "Visual Studio 14 2015 Win64" -DCOPIED_DEPENDENCIES=false -DCOPY_DEPENDENCIES=true ..
echo: echo:
echo: echo:
echo Building obs-studio %OBSLatestTag% 32-bit ^(Build Config: %build_config%^)... echo Building obs-studio %OBSLatestTag% 32-bit ^(Build Config: %build_config%^)...

20
CI/install-setup-qt.cmd
View File

@ -1,20 +1,6 @@
@echo off @echo off
REM Set default values to use AppVeyor's built-in Qt. REM Set default values to use AppVeyor's built-in Qt.
set QTDIR32=C:\Qt\5.7\msvc2013 set QTDIR32=C:\Qt\5.10.1\msvc2015
set QTDIR64=C:\Qt\5.7\msvc2013_64 set QTDIR64=C:\Qt\5.10.1\msvc2015_64
set QTCompileVersion=5.7.1 set QTCompileVersion=5.10.1
REM If the AppVeyor cache couldn't recover qt570.7z,
REM try to fetch Qt 5.7.0 from slepin.fr.
if not exist qt570.7z (
curl -kLO https://www.slepin.fr/obs-plugins/deps/qt570.7z -f --retry 5 -C -
)
REM If qt570.7z exists now, use that instead of AppVeyor's built-in Qt.
if exist qt570.7z (
7z x qt570.7z -o"Qt5.7.0"
set QTDIR32=%CD%\Qt5.7.0\msvc2013
set QTDIR64=%CD%\Qt5.7.0\msvc2013_64
set QTCompileVersion=5.7.0
)

2
CI/macos/obs-websocket.pkgproj
View File

@ -635,7 +635,7 @@
<key>OVERWRITE_PERMISSIONS</key> <key>OVERWRITE_PERMISSIONS</key>
<false/> <false/>
<key>VERSION</key> <key>VERSION</key>
<string>4.3.2</string> <string>4.3.3</string>
</dict> </dict>
<key>PROJECT_COMMENTS</key> <key>PROJECT_COMMENTS</key>
<dict> <dict>

15
appveyor.yml
View File

@ -4,10 +4,10 @@ environment:
install: install:
- git submodule update --init --recursive - git submodule update --init --recursive
- cd C:\projects\ - cd C:\projects\
- if not exist dependencies2013.zip curl -kLO https://obsproject.com/downloads/dependencies2013.zip -f --retry 5 -C - - if not exist dependencies2015.zip curl -kLO https://obsproject.com/downloads/dependencies2015.zip -f --retry 5 -C -
- 7z x dependencies2013.zip -odependencies2013 - 7z x dependencies2015.zip -odependencies2015
- set DepsPath32=%CD%\dependencies2013\win32 - set DepsPath32=%CD%\dependencies2015\win32
- set DepsPath64=%CD%\dependencies2013\win64 - set DepsPath64=%CD%\dependencies2015\win64
- call C:\projects\obs-websocket\CI\install-setup-qt.cmd - call C:\projects\obs-websocket\CI\install-setup-qt.cmd
- set build_config=Release - set build_config=Release
- call C:\projects\obs-websocket\CI\install-build-obs.cmd - call C:\projects\obs-websocket\CI\install-build-obs.cmd
@ -15,9 +15,9 @@ install:
- mkdir build32 - mkdir build32
- mkdir build64 - mkdir build64
- cd ./build32 - cd ./build32
- cmake -G "Visual Studio 12 2013" -DQTDIR="%QTDIR32%" -DLibObs_DIR="C:\projects\obs-studio\build32\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. - cmake -G "Visual Studio 14 2015" -DQTDIR="%QTDIR32%" -DLibObs_DIR="C:\projects\obs-studio\build32\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build32\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build32\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
- cd ../build64 - cd ../build64
- cmake -G "Visual Studio 12 2013 Win64" -DQTDIR="%QTDIR64%" -DLibObs_DIR="C:\projects\obs-studio\build64\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" .. - cmake -G "Visual Studio 14 2015 Win64" -DQTDIR="%QTDIR64%" -DLibObs_DIR="C:\projects\obs-studio\build64\libobs" -DLIBOBS_INCLUDE_DIR="C:\projects\obs-studio\libobs" -DLIBOBS_LIB="C:\projects\obs-studio\build64\libobs\%build_config%\obs.lib" -DOBS_FRONTEND_LIB="C:\projects\obs-studio\build64\UI\obs-frontend-api\%build_config%\obs-frontend-api.lib" ..
build_script: build_script:
- call msbuild /m /p:Configuration=%build_config% C:\projects\obs-websocket\build32\obs-websocket.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - call msbuild /m /p:Configuration=%build_config% C:\projects\obs-websocket\build32\obs-websocket.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@ -32,7 +32,6 @@ deploy_script:
test: off test: off
cache: cache:
- C:\projects\dependencies2013.zip - C:\projects\dependencies2015.zip
- C:\projects\qt570.7z
- C:\projects\obs-studio-last-tag-built.txt - C:\projects\obs-studio-last-tag-built.txt
- C:\projects\obs-studio\ - C:\projects\obs-studio\

2
installer/installer.iss
View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "obs-websocket" #define MyAppName "obs-websocket"
#define MyAppVersion "4.3.2" #define MyAppVersion "4.3.3"
#define MyAppPublisher "Stephane Lepin" #define MyAppPublisher "Stephane Lepin"
#define MyAppURL "http://github.com/Palakis/obs-websocket" #define MyAppURL "http://github.com/Palakis/obs-websocket"

2
src/obs-websocket.h
View File

@ -39,7 +39,7 @@ using OBSOutputAutoRelease =
OBSRef<obs_output_t*, ___output_dummy_addref, obs_output_release>; OBSRef<obs_output_t*, ___output_dummy_addref, obs_output_release>;
#define PROP_AUTHENTICATED "wsclient_authenticated" #define PROP_AUTHENTICATED "wsclient_authenticated"
#define OBS_WEBSOCKET_VERSION "4.3.2" #define OBS_WEBSOCKET_VERSION "4.3.3"
#define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__) #define blog(level, msg, ...) blog(level, "[obs-websocket] " msg, ##__VA_ARGS__)