Please sign in to comment.
build fixes: ffmpeg, xbrz, travis, C++ version
Fix the cmake ffmpeg detection and make it not print the detection messages twice. Add `-D__STDC_FORMAT_MACROS` to compiler flags, some versions of ffmpeg require this. Redefine `static_assert(x)` to the `static_assert(x, msg)` form in `xbrz.cpp`. This is a C++17 feature and some versions of gcc wrongly set `__cpp_static_assert` even though they do not support it. Also we want to stick to C++11 for the time being, until there is consensus to support a newer a version. For that reason, change the MSVC flag `/std:c++latest` to `/std:c++11` as well. Remove `-DENABLE_OPENAL=ON` and `-DENABLE_LINK=ON` from travis config, as these are now automatic. In `installdeps` remove the hacks for supporting the `https://` apt url for mxe and use an `http://` url instead. This works perfectly on Ubuntu 14 (trusty). Signed-off-by: Rafael Kitover <firstname.lastname@example.org>
- Loading branch information
Showing with 21 additions and 45 deletions.