663 Commits

Author SHA1 Message Date
Dan Bryant
0059da299d fix another syntax error 2019-11-16 15:46:27 +00:00
Dan Bryant
a91ad2655f fixing code errors 2019-11-16 13:36:45 +00:00
Dan
ae67012063
create first test action 2019-11-16 13:32:43 +00:00
Dan
9203e86242
Merge pull request #24 from justdan96/enhancement-docker-build
The Docker container is complete, list of changes:

* Updated instructions in README for building tsMuxer in the Docker container.
* Updated build scripts accordingly.
* Added small section on testing to the README
2019-11-16 12:44:41 +00:00
Dan Bryant
05cde30842 static linking for Linux in docker, update readme 2019-11-16 12:37:55 +00:00
Dan Bryant
ce5597b0fd update build instructions to include steps for Docker 2019-11-09 22:27:11 +00:00
Dan Bryant
3fe79cc41a add bin folder to repo 2019-11-08 12:17:57 +00:00
Dan Bryant
624a283c34 update build scripts for use with docker container 2019-11-08 12:06:27 +00:00
Dan Bryant
810a885ff7 update build instructions for all platforms, add MacOS target and fix small issue in subtitles rendering includes 2019-10-30 09:13:51 +00:00
Dan
1d4f304cd8
Merge pull request #23 from xavery/fix-msys2
Fix MSYS2 build
2019-10-27 06:50:20 +00:00
Daniel Kamil Kozar
248387eec0
Update build instructions for MSYS2
qmake doesn't exist anymore : it is now only necessary to generate and build
via CMake, and then copy the application executable to the GUI folder so it
can be used.
2019-10-27 02:12:28 +01:00
Daniel Kamil Kozar
f9a3641620
Fix PkgConfig detection on MSYS2
MSYS2 defines WIN32 and has a working pkg-config installation, but the
CMakeLists.txt wrongly skipped using pkg-config if WIN32 was defined. This
commit fixes this.
2019-10-27 02:11:00 +01:00
Daniel Kamil Kozar
d7994f1193
Fix MSYS2 build 2019-10-27 02:22:26 +02:00
Dan
8615976b6c
Merge pull request #22 from xavery/remove-stdafx
Remove stdafx.{cpp,h}
2019-10-26 22:52:15 +01:00
Dan
0d0895986e
Merge pull request #21 from xavery/libmediation-std-thread
Use std::thread in libmediation's TerminatableThread
2019-10-26 22:48:27 +01:00
Daniel Kamil Kozar
721d5c12d9
Use std::thread in libmediation's TerminatableThread
TerminatableThread is now implemented by using std::thread. The terminate()
function provided by the base class was actually not used anywhere, and was
removed along with the base class itself.
As a bonus, the completely unused files common_win32.{cpp,h} are also removed.
2019-10-26 21:31:06 +02:00
Daniel Kamil Kozar
0fd3b37746
Remove stdafx.{cpp,h}
Precompiled headers aren't actually used by any of the compilers, so leaving
this header in the repo doesn't make much sense.
However, removing it revealed some places in the code which rely on windows.h
being included on WIN32, which was probably included via the tchar.h include.
These places have been fixed to explicitly include windows.h.
2019-10-26 21:15:03 +02:00
Dan
fc3d2b2410
Merge pull request #20 from xavery/remove-fpermissive
Fix code which needed -fpermissive on LLP64 platforms
2019-10-26 09:56:17 +01:00
Daniel Kamil Kozar
6b7fddfdab
Fix code which needed -fpermissive on LLP64 platforms 2019-10-26 09:34:18 +02:00
Dan
297718f2ac
Merge pull request #17 from justdan96/enhancement-crossbuild
update to allow MXE builds to work successfully and update documentation
2019-10-25 17:17:19 +01:00
Dan Bryant
fb8147a034 reset CMakeLists to xavery's reworked version 2019-10-25 17:13:57 +01:00
Dan Bryant
7550335ba3 Merge branch 'master' into enhancement-crossbuild 2019-10-25 17:08:50 +01:00
Dan
e5d199abaf
Merge pull request #18 from xavery/cmake
Completely rework the CMake build system
2019-10-25 16:45:34 +01:00
Daniel Kamil Kozar
9994ee5f44
Completely rework the CMake build system 2019-10-25 17:28:31 +02:00
Dan Bryant
4353e6a8f4 add initial MXE instructions, fix up some small issues when building on MXE 2019-10-25 13:06:29 +01:00
Dan Bryant
c411ba8510 add script for building with MXE 2019-10-25 11:57:43 +01:00
Dan Bryant
e909c7e028 work around exception specifier error on Windows, clean up readme 2019-10-25 11:56:08 +01:00
Dan Bryant
494a9ebf26 fix for Windows build in Docker, update CMake config to find zlib and libpng 2019-10-25 10:19:38 +01:00
Dan
6499f47ca2
Merge pull request #16 from xavery/condvar-mutex-time-libmediation-removal
Remove condvar, mutex and time from libmediation
2019-10-24 23:04:48 +01:00
Daniel Kamil Kozar
b098a6de41
Remove condvar, mutex and time from libmediation 2019-10-24 23:54:56 +02:00
Dan
a49263716f
Merge pull request #15 from justdan96/enhancement-crossbuild
Enhancement crossbuild
2019-10-24 20:13:07 +01:00
Dan Bryant
7cf23b0c4b add ninja as build dependency 2019-10-24 20:05:33 +01:00
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