Commit Graph

61 Commits

Author SHA1 Message Date
FeRD (Frank Dana)
128bacce70 Support older CMake
add_compile_definitions() is CMake 3.12+ only.
2020-05-19 07:37:25 -04:00
FeRD (Frank Dana)
216184dbb9 Work around Ruby/JUCE isfinite() conflict properly 2020-05-19 06:30:54 -04:00
Frank Dana
6336f30ee3 Various: Remove unused variables (#467)
Several data members and local variables were flagged by static
analysis tools as never being used anywhere in the code.
2020-04-22 02:02:55 -04:00
Frank Dana
5e899bf207 Add SWIG/Ruby compatibility check & warning (#480) 2020-03-25 23:07:03 -04:00
Frank Dana
94e9ad3ead bindings: Remove relative header paths (#469)
* bindings: Remove relative header paths
  Use the include paths set on the command line the way
  they're supposed to be used.
* Also remove some redundant include paths
* Fix SWIG include dirs
2020-03-23 08:13:46 -04:00
Frank Dana
bb20a9b369 ruby/CMakeLists: Lowercase commands 2020-03-23 05:26:12 -04:00
FeRD (Frank Dana)
20fffc404c bindings: Relative paths, overridable 2020-03-09 09:10:55 -04:00
Jonathan Thomas
23ee6eb36f Merge pull request #360 from OpenShot/qt-targets
CMake: Use targets for QT, AUTOMOC sources, eliminate source globbing
2019-11-17 16:22:11 -06:00
FeRD (Frank Dana)
750677c0c5 CMake: Manage sources and includes better
- Switch to AUTOMOC for Qt classes
- Eliminate globbing of source subdirs
- Call `include_directories()` in top-level CMakeLists
- Make header files PUBLIC library sources
- Make other sources PRIVATE
2019-11-04 03:59:34 -05:00
Frank Dana
cbdd02fe7a Merge branch 'develop' into std-prefixes 2019-10-29 20:45:08 -04:00
Frank Dana
76725d9d2e Merge pull request #305 from jeffski/qt-text-html-readers
QtTextReader and QtHtmlReader
2019-10-29 20:40:51 -04:00
Frank Dana
969e8320e6 Merge branch 'develop' into std-prefixes 2019-10-29 16:06:55 -04:00
Frank Dana
196d56b5d1 Merge branch 'develop' into qt-text-html-readers 2019-10-25 13:49:12 -04:00
Frank Dana
13e68c368e Merge branch 'develop' into ffmpeg-targets 2019-10-25 02:03:10 -04:00
Frank Dana
8bde07682c Merge branch 'develop' into std-prefixes 2019-10-22 21:00:27 -04:00
Jonathan Thomas
ae81e56de6 Merge pull request #306 from ferdnyc/bindings-magick
Bindings: Apply #defines for optional libs
2019-10-22 18:28:37 -05:00
FeRD (Frank Dana)
655b137ee2 Bindings: Pick up include dirs from targets 2019-10-02 09:30:06 -04:00
FeRD (Frank Dana)
1af92afc59 SWIG: Use compactdefaultargs in bindings 2019-09-28 21:43:59 -04:00
FeRD (Frank Dana)
74c9869c96 Python & Ruby bindings for new Readers 2019-08-14 10:21:57 -04:00
FeRD (Frank Dana)
c4126aef2c Bindings: Apply #defines for optional libs
The resetting of `CMAKE_SWIG_FLAGS` to the empty string in the bindings'
CMakeLists.txt files was clearing away the definitions for things like
`USE_IMAGEMAGICK` and `USE_BLACKMAGIC`, causing the bindings to be built
_without_ those classes even if they're available in the library.
2019-08-11 12:49:42 -04:00
FeRD (Frank Dana)
dd74fa3af8 ruby openshot.i: namespace fixes
- Remove `std::shared_ptr<Frame>` wrapper
- Don't place templates in std:: namespace
2019-08-05 02:19:52 -04:00
FeRD (Frank Dana)
e94436b71d Raise SWIG version requirement to 3.0 2019-07-30 04:06:36 -04:00
FeRD (Frank Dana)
0ac3720023 SWIG: Warnings cleanup
* Remove a SWIG pragma from Frame.h (gcc warns on it)
* Place the equivalent %warnfilter in the openshot.i files
* Set openshot.i PROPERTY GENERATED_COMPILE_OPTIONS with flags to
  disable warning spew in generated SWIG code, if -Wall is used

(Also, remove 'using namespace std' from Frame.h, and add std::
prefixes to necessary variables.)
2019-07-12 13:28:47 -04:00
Jonathan Thomas
376170d7dd Merging work from @ferdnyc, to move version info to CMake, and other misc Cmake improvements. This was the easiest way to resolve the merge conflict for me (to apply it locally and commit it). 2019-07-01 12:24:50 -05:00
FeRD (Frank Dana)
f170fdd009 Update copyright range to current year 2019-06-11 06:48:32 -04:00