52 Commits

Author SHA1 Message Date
Stéphane Lepin
f2a9ff8551 ci(linux): fix Ubuntu package 2019-03-22 01:40:29 +01:00
Stéphane Lepin
16bc68f2f9 server: import websockets++ server from master 2018-12-31 17:05:23 +01:00
Stéphane L
edc64b8336 auth: get rid of mbedtls 2018-11-08 00:52:26 +01:00
Stéphane Lepin
454a68d1b7
Merge pull request #199 from Palakis/4.3-jimtree-studiomode-fix
[not ready] events: fix triggering of PreviewSceneChanged
2018-07-29 17:01:48 +02:00
Stéphane L
45f6f74cbe cmake: remove copy operation 2018-07-21 23:05:38 +02:00
Stéphane L
cb7412a457 events: fix triggering of PreviewSceneChanged 2018-07-08 12:58:06 +02:00
Stéphane L
cd40ccdb9d Merge pull request #211 from wherget/build-fixes
MacOS Build fixes
2018-05-27 18:38:39 +02:00
RytoEX
25210dfa52 CI and CMake improvements (#205)
* CMake: Copy PDB file to OBS build directory on Debug build

All native OBS build objects also bundle the associated PDB file for
debugging and handling crash reports.

* CMake: Add post-build commands for RelWithDebInfo

Add post-build commands for the RelWithDebInfo build config. OBS
official builds use RelWithDebInfo, so we should be able to treat it as
a release config.

* CI: Disable building OBS native plugins

Use the OBS CMake flag DISABLE_PLUGINS to disable building plugins
included with OBS (including submodule plugins like obs-browser). This
should speed up builds on Windows when we have to rebuild OBS and on
Mac.

* CI: Don't clone/update OBS submodules

The only submodules presently in OBS are in its plugins, which we don't
need to build.

* CI: Use obsproject/obs-studio instead of jp9000/obs-studio

The OBS GitHub recently changed from jp9000/obs-studio to
obsproject/obs-studio, so use that instead.

* CI: Build as RelWithDebInfo instead of Release

OBS official builds are produced with RelWithDebInfo. This will produce
a PDB file for the plugin, similar to the native OBS plugins.

* CI(Windows): Build OBS if current build config doesn't exist

If OBS libs for the current build config do not exist, build OBS before
building obs-websocket.
2018-03-26 11:12:39 +02:00
Stéphane Lepin
0a50e2a95c ci(linux): use OBS dev deps from PPA release 2018-03-20 14:11:33 +01:00
Palakis
7e5716185e code: reorder and refactor WSRequestHandlers 2017-11-14 09:14:33 +01:00
Palakis
b764b4d0e5 code: split WSRequestHandler into several code/compile units 2017-11-13 17:56:58 +01:00
Palakis
6a323b9371 code: move code units to src/ 2017-11-13 17:17:34 +01:00
Logan S
9ce2b1983a Protocol: add Replay Buffer Events and Requests (#104) 2017-08-19 15:05:42 +02:00
Stéphane L
7915e3815b CMake on Windows: copy debug binaries to obs dev folder for testing 2017-08-19 11:40:25 +02:00
Palakis
56217e0176 Revert "CMake: work towards more auto-detect on Linux"
This reverts commit 77c5801c4c341b1ea23db073cc1074ffa2206b85.
2017-04-24 13:33:50 +02:00
Palakis
77c5801c4c CMake: work towards more auto-detect on Linux 2017-04-24 13:14:51 +02:00
Stéphane
d4b8a8ff9e OS X: Fix linker issue 2017-04-20 14:25:56 +02:00
Palakis
9ba2e83857 Fixed typos in CMakeLists.txt 2017-04-15 15:52:15 +02:00
Palakis
1a5318ebe0 Travis: Linux packaging 2017-04-15 15:24:46 +02:00
Palakis
f48b31664e Trying with absolute paths 2017-04-15 01:08:48 +02:00
Palakis
d6c0eb1998 Trying something else 2017-04-15 00:50:31 +02:00
Palakis
d3dcfba463 Trying something 2017-04-15 00:42:47 +02:00
Palakis
86c002e318 Okay, rolling back some changes 2017-04-14 23:41:25 +02:00
Palakis
9bfff9539e Meh, not working as expected 2017-04-14 23:27:39 +02:00
Palakis
edf4d919fe Encore a fix for Travis OS X 2017-04-14 23:12:36 +02:00
Palakis
b0fb3d8c61 Fix for Travis OS X 2017-04-14 22:47:37 +02:00
Palakis
5143090142 Work on OS X Travis builds 2017-04-14 22:38:57 +02:00
asquelt
84b3e086e6 try to build osx version 2017-04-12 14:38:12 +02:00
asquelt
5e3c794aec try to build osx version 2017-04-11 14:16:10 +02:00
asquelt
98acbb2b2b try to build osx version 2017-04-11 13:45:07 +02:00
asquelt
318f0753b0 try to build osx version 2017-04-11 13:25:08 +02:00
asquelt
8908adbdee try to build osx version 2017-04-11 13:07:44 +02:00
asquelt
fad7a26550 try to build osx version 2017-04-11 12:49:48 +02:00
asquelt
83d069e4d9 try to build osx version 2017-04-06 17:42:51 +02:00
asquelt
f2db5a8229 try to build osx version 2017-04-06 17:07:14 +02:00
Palakis
5815d2bfce Lower minimum cmake version 2017-03-02 00:49:35 +01:00
Palakis
e7b074991d Fix appveyor CI + fix build script 2017-03-01 20:59:35 +01:00
Palakis
44af896dee Force C++11 on Linux 2017-03-01 17:53:44 +01:00
Palakis
ae6c15158f Bugfix : copy issue in CMakeLists.txt 2017-02-25 16:39:55 +01:00
Palakis
6aa57247f9 Better build instructions (including release packager on Windows) 2017-02-25 16:32:20 +01:00
Palakis
50862ac945 Typo fix 2017-02-25 14:48:09 +01:00
Palakis
01ce6faa20 Add german translation to CMakeLists.txt 2017-02-24 20:33:45 +01:00
Stéphane Lepin
e3a28b640f Update CMakeLists.txt 2016-11-23 21:45:25 +01:00
Stéphane Lepin
94576fae44 Better build process on Windows 2016-11-22 22:02:46 +01:00
Palakis
d091d9c3e4 Better build process on Linux 2016-11-22 19:51:47 +01:00
Stéphane Lepin
5639c18c2f Wth did i do 2016-11-22 18:34:19 +01:00
Stéphane L
73b85ef9df Update CMakeLists.txt 2016-11-22 17:38:04 +01:00
Stéphane Lepin
bf317987c3 Settings dialog (fixes #4) and WIP authentication (Buggy and needs testing) 2016-11-12 03:59:07 +01:00
Stéphane Lepin
1faccf8ee3 Better build process 2016-11-11 18:11:17 +01:00
Stéphane Lepin
f500f0f296 So tired I can't write a decent commit message 2016-10-17 01:14:33 +02:00