Commit Graph

156 Commits (107c6322207c3438b3ad4593a652bf4e45053a16)

Author SHA1 Message Date
jp9000 e55a2b4331 cmake: Add FindVulkan module 2020-02-29 00:15:54 -08:00
jp9000 9646fd38b4 cmake: Copy a few missing dependency files 2020-02-24 14:51:38 -08:00
Jim 9bdb21205d
Merge pull request #2085 from ratwithacompiler/macos-python-fix
obs-scripting: Fix Python on MacOS
2019-11-14 20:38:53 -08:00
luz.paz d124e6402c docs/sphinx: Fix various typos
(This modifies UI, libobs, deps/obs-scripting, various cmake files)

Found using:
`codespell -q 3 -S *.ini,./UI/data/locale,./deps/w32-pthreads -L aci,dur,iff,mut,numer,uint`
2019-10-14 17:19:38 -07:00
Rat f6aed7cb72 obs-scripting: Fix script plugin destination path on MacOS
The actual plugin files get copied to obs-scripting/ without the
64bit subdir like everything else on MacOs, fix this path accordingly
otherwise the scripting home dir passed to Python is incorrect
2019-09-26 23:29:05 +02:00
Colin Edwards ef668b239d
Merge pull request #1678 from boxerab/libvlc_pkgconfig
cmake: Fix pkg-config handling of libvlc
2019-03-13 23:10:23 -05:00
derrod 9cc0d459bd cmake: Fix Qt DLL filenames for debug builds 2019-03-10 09:47:16 +01:00
Clayton Groeneveld 80875768ad UI: Redo settings icons 2019-03-05 19:54:12 -06:00
Aaron Boxer c150eabe35 cmake: Fix pkg-config handling of libvlc
Tested against VLC 3
2019-02-28 10:21:59 -05:00
jp9000 85d259e05c cmake: Make directory before copying file
Fixes the install_obs_data_file cmake helper function to be more
consistent across operating systems.
2018-09-07 03:41:36 -07:00
jp9000 1ea4da3f98 cmake: Add install_obs_data_file function
Allows copying an individual file (which may not be in the data dir) to
an specified install location.
2018-09-07 00:20:14 -07:00
bluekirby0 0d25ab6776 cmake: Add luajit 2.1 support to build 2018-08-18 10:38:21 -04:00
Michael Goulet e67e2e12e6 obs-outputs: Add support for and use mbedTLS for SSL
This diff adds mbedTLS support to the obs-outputs plugin.  PolarSSL and
mbedTLS have grown so different between 2015-or-so when libRTMP was
written, and now it's no longer feasible to just use the USE_POLARSSL
flag.

This commit adds a WITH_RTMPS tri-state CMake variable (auto/on/off),
set to "Auto" by default.  "Auto" will use RTMPS if mbedTLS is found,
otherwise will disable RTMPS.  "On" will make it require mbedTLS,
otherwise fails configuration, and "Off" disables RTMPS support
altogether.

Closes obsproject/obs-studio#1360
2018-08-05 18:40:49 -07:00
Colin Edwards 27b5c3be71 OSX: Add NSCamera and NSMicrophone UsageDescription for 10.14 2018-07-27 14:11:55 -05:00
Shaolin 3aaa12aa17 cmake: Add xcb-xinput support
Ubuntu 17.04 updated libxcb1-dev to 1.12 where xinput should be enabled
by default but debian disables it by default atm. Compile libxcb with
--enable-xinput to use this within obs. Arch enables it by default,
debian does not and fedora is untested.
2018-05-07 21:31:16 -03:00
jp9000 a81de7fb61 cmake: Include windows style DLL when copying Qt files 2018-03-18 17:01:01 -07:00
Kurt Kartaltepe 59c3d195e6
cmake: Remove extraneous checks
These don't appear to be necessary and prevent qt binaries from
being found on some systems.
2018-03-14 20:52:14 -05:00
Ben Krueger f374810403 cmake: Fix LuaJIT search 2018-01-30 21:13:10 -08:00
juvester 206c853d00 cmake: Search for Python 3.4
Fixes an issue where Python libraries aren't found on Ubuntu 14.04
because CMake 2.8 only searches up to Python 3.3.
2018-01-21 14:27:55 +02:00
Jim bf6231e122
Merge pull request #1147 from kkartaltepe/swig-cmake-fix
CMake: Fix FindSwigDeps search path
2018-01-16 05:52:16 -08:00
jp9000 db2d4c97e8 deps/obs-scripting: Fix installed files/locations on linux
Uses the 'install' command in cmake to install scripting modules/files
(such as _obspython.so, obslua.so, and obspython.py), and changes the
install location of those files on all operating systems.  If using a
non-unix structure install, those files will be installed in
data/obs-scripting/[32bit/64bit], otherwise with unix structure installs
those files will be installed to [/usr/local/lib]/obs-scripting.
2018-01-16 03:55:38 -08:00
Kurt Kartaltepe 32049bfd43 CMake: Fix FindSwigDeps search path 2018-01-11 21:37:10 -06:00
SuslikV aa2055ea81
cmake: add more LuaJIT lib names
Makes building on Windows easier.
2018-01-08 18:07:08 +02:00
jp9000 96f481294b cmake: Fix copying lua51.dll (luajit) dep on windows 2018-01-07 19:21:35 -08:00
jp9000 2651d076db deps/obs-scripting: Fix swig/python lookup on windows
Fixes swig/python dependencies to search for the pre-compiled deps on
windows.
2018-01-07 17:47:55 -08:00
jp9000 9e8a2e333b cmake: Add helper module for finding Lua
This is mostly for win32-specific files
2018-01-03 17:03:05 -08:00
jp9000 102075847a cmake: Add Lua/Luajit as part of MSVC dependencies 2018-01-03 17:03:05 -08:00
Joel Bethke d9b0c85daf cmake: Enable COPY_DEPENDENCIES by default on Windows
When setting up a build for the first time on windows, makes it so you
no longer have to run cmake twice:  once to build, then once again with
the COPY_DEPENDENCIES box to ensure dependencies are copied.

Closes jp9000/obs-studio#768
2017-01-23 22:21:38 -08:00
jp9000 b6bde7e026 cmake: Remove unnecessary find_package calls
Fixes a bug in cmake that would cause a libavcodec_dir being set to "not
found", confusing new contributors
2017-01-15 09:15:43 -08:00
Serge Paquet 64559a0cb8 cmake: Fix permissions with OSX fixup_bundle.sh
Fixes an issue where the files copied by fixup_bundle.sh will not work
with install_name_tool without proper permissions.

Closes jp9000/obs-studio#618
2016-11-24 07:15:03 -08:00
Serge Paquet ae9158216e cmake: Fix OSX fixup_bundle.sh to copy non-system deps
Without this fix, the fixup script misses any non-system dependencies
that are not in the /Users or /opt directories.

Closes jp9000/obs-studio#618
2016-11-24 07:13:34 -08:00
jp9000 5d332de45c cmake: Add macro to compile .tlb files via midl 2016-11-19 03:04:45 -08:00
jp9000 9f551d11b4 cmake: Add module to find RSSDK 2016-11-19 03:04:44 -08:00
Younes SERRAJ f029ec821e cmake: Fix FFmpeg search path on debian
Although FFmpeg is installed, OBS currently fails to build on debian
(tested on Debian Jessie 8.6).  It looks for libavcodec.a in
/usr/local/lib and not /usr/lib.

Closes jp9000/obs-studio#661
2016-10-16 01:01:34 -07:00
Jim 9cb8ae74e4 Merge pull request #635 from cortexmedia/msi-license
Display license in MSI installer
2016-10-09 17:09:25 -07:00
Colin Edwards f1a9c139b8 Add 256x256 icon to windows ico for HiDPI displays 2016-10-08 19:41:31 -05:00
Serge Paquet a97a9a966c Display license in MSI installer 2016-09-28 12:06:35 -04:00
jp9000 0d294cc049 cmake: Add module to find libspeexdsp 2016-07-25 20:17:13 -07:00
jp9000 670c655d41 cmake/external: Add function to install specific arch data file
Allows installing a single specific file to the data/[arch] directory.
2016-06-23 20:05:57 -07:00
jp9000 d3ece746f2 cmake/external: Fix a few external plugin script bugs
For install_external_plugin_bin_to_data and
install_external_plugin_bin_to_arch_data, they were using the
'plugin_target' variable instead of just 'target' for the plugin
directory output location, and they were using 'target' instead of
'additional_target' for the data/binaries they were supposed to be
installing.
2016-06-23 20:05:57 -07:00
jp9000 d89299fc1a vlc-video: Add VLC video source
Adds the ability to add video playlists via libvlc instead of via the
media source.  This is mostly just being added as a secondary option to
the media source to reduce maintenance costs and save time.  Currently
libff cannot pause/unpause/seek, and isn't programmed to handle
playlists yet.

If VLC is installed on the computer (with the same architecture) it will
allow video playback via libVLC.  In the future, users should be able to
optionally download VLC libraries via the installer as well if they
don't want to necessarily install VLC to get the plugin working.

This plugin performs runtime linking instead of compile-time linking;
compiling VLC is not required, only its headers are required.  To
compile, clone the VLC repository and set the VLCPath cmake variable to
point to the VLC repository directory.
2016-06-06 23:53:59 -07:00
jp9000 6014d4dc6d cmake: Also copy libvpx library for MSVC if available 2016-04-26 15:02:40 -07:00
yogpstop 4b4ddbb33e obs-outputs: Add USE_SSL option (disabled by default)
Closes jp9000/obs-studio#487
2016-02-07 15:47:18 -08:00
jp9000 b9d6c649f5 cmake: Copy ogg and vorbis libs with avcodec 2015-09-20 16:58:14 -07:00
jp9000 88ab25870e cmake: Add helper to find dbus package
The DBus library is a message bus system used to make applications
communicate with each other.  The primary reason for adding it is to
access certain service features to prevent computer sleep/hibernate/etc.

This will also create a HAVE_DBUS variable (set to 1 or 0 if found or
not found)
2015-09-12 19:15:32 -07:00
Palana 5dd030882d cmake: Add zlib support 2015-08-12 15:30:30 +02:00
jp9000 81649eab0d cmake: Add FFmpeg/x264 include header path suffix
This allows people to use the base directory of cross-compiled
dependencies (typically our dependencies.zip file), rather than always
having to specify the actual include directory.
2015-08-12 04:21:26 -07:00
jp9000 4ed1e2f03c cmake: Allow external plugins to share libobs deps
This addition allows external cmake modules to include the same modules
that are commonly distributed with the main obs-studio repo: things like
FFmpeg, curl, etc.
2015-07-18 16:41:03 -07:00
jp9000 c87d3b1f12 cmake: Rename FindFFMpeg to FindFFmpeg
This was sort of driving me crazy: The 'm' in FFmpeg isn't supposed to
be capitalized.
2015-07-18 16:32:26 -07:00
jp9000 fbf771620a cmake: Fix external plugin cmake module comments 2015-07-18 01:29:11 -07:00