Commit Graph

131 Commits (aaecc7c1d68db0c31f0040a325924e01dc32f30b)

Author SHA1 Message Date
Dan Bryant fc967d829f switch from make to cmake 2019-10-24 20:04:05 +01:00
Dan 080bb15bdd
Merge pull request #12 from xavery/fix-clang-build
Fix build with Clang
2019-10-23 21:51:55 +01:00
Dan 8f80905749
Merge pull request #13 from xavery/translate-comments
Translate comments from Russian to English
2019-10-23 12:30:41 +01:00
Daniel Kamil Kozar f5c9276e64
Translate comments from Russian to English
CVS log messages are left untouched in files which contain them, and those files
have been converted from Windows-1251 to UTF-8.
2019-10-22 00:45:41 +02:00
Daniel Kamil Kozar 6c7dd673bf
Fix build with Clang
Forward declarations are not allowed to have nested namespace declarations, as
they have to appear inside a namespace if the thing they're forwarding appears
in a namespace originally.

This is a warning with GCC, but an error with Clang. Removing the declaration
entirely is the way to go, since psgStreamReader.h includes textSubtitles.h
anyway, which contains a full definition of the TextToPGSConverter class.
2019-10-21 23:21:15 +02:00
Dan 0345711711
Merge pull request #7 from qyot27/cmake
Add rudimentary CMake build system
2019-08-18 18:24:11 +01:00
Dan Bryant fc5addb304 small fixes to Mingw 32/64 bit instructions 2019-08-17 21:48:24 +01:00
Dan Bryant 1d24aedd6f fix up MinGW 64 builds 2019-08-16 20:07:38 +01:00
Dan Bryant aa0a56833c try to resolve some of the warnings in libmediation 2019-08-16 19:36:20 +01:00
Dan Bryant 5f623aae99 try to distinguish between 32-bit and 64-bit MinGW 2019-08-16 19:28:10 +01:00
Dan f2609e1130
Merge pull request #6 from markusfeist/master
update for building on linux arm
2019-08-16 18:52:30 +01:00
Dan 1299e9689d
Merge branch 'master' into master 2019-08-16 18:50:18 +01:00
Stephen Hutchinson 309bdb210d Add rudimentary CMake build system
Currently can build tsmuxer CLI and libmediation in native 64-bit
on Linux.  Windows, Mac, and 32-bit untested (32-bit is mostly
a function of the user's CXX_FLAGS settings anyway).

As a consequence of trying to get it to build the correct files,
the textSubtitleRender{FT|Win32}.* files had to be moved to an
osdep/ subdirectory.  Some #include cases were also fixed to
point to the correct headers and directories in the source
tree or elsewhere.

Install rules need to be fleshed out for static/shared libs and
headers for libmediation, uninstall rules need to be added.

tsMuxerGUI needs to be hooked in as well.
2019-08-11 15:00:42 -04:00
Dan Bryant c6d101b7c1 update for building with Msys2 on Windows 2019-08-11 17:10:03 +01:00
Dan 0023848195
Merge pull request #5 from justdan96/enhancement-qt5
Enhancement qt5
2019-08-10 23:00:08 +01:00
Dan Bryant 8b27c97bb8 update for Qt5 on Windows 2019-08-10 22:52:51 +01:00
Dan Bryant 2a3f1b5976 update build dependencies, update readme 2019-08-10 18:36:52 +01:00
Dan Bryant 0c9f5291d7 apply Selur's patch for Qt5 compatibility 2019-08-10 18:07:43 +01:00
Dan c990396670
Merge pull request #4 from justdan96/enhancement-better-nix-build
update build instructions for Linux, as per issues/3
2019-08-10 11:50:44 +01:00
Dan Bryant b788044ed6 update build instructions for Linux, as per issues/3 2019-08-10 11:47:31 +01:00
Markus Feist b52eeca7a8 update for building on linux arm 2019-08-09 21:26:25 +02:00
Dan Bryant 00a5db41fe update for building on Windows 2019-07-28 22:49:07 +01:00
Dan Bryant 9984797966 add Google Drive link for extra 32-bit Ubuntu libraries 2019-07-23 23:12:53 +01:00
Dan Bryant 1b6abe9a0d add libmediation, update make_pair functions to be usable with C++11, update Makefile for modern systems and bring readme up-to-date 2019-07-23 23:05:20 +01:00
Dan Bryant 1875ee7e6d make sure bullets used for lists in readme 2019-07-15 17:00:06 +01:00
Dan Bryant 625aa048e6 further fix up readme 2019-07-15 16:57:07 +01:00
Dan Bryant 91cebe654f fix up readme 2019-07-15 16:55:33 +01:00
Dan Bryant 71f0f89c93 add source code and changelog 2019-07-15 16:52:40 +01:00
Dan 39d561e59a
Update README.md
update finance section
2019-07-15 16:44:24 +01:00
Dan a2d86bf712
Create README.md
first instance of the readme
2019-07-15 16:43:14 +01:00
Dan c0f7cfefcb
Initial commit 2019-07-15 16:18:54 +01:00