forked from mia/Aegisub
Adjust boost gil header paths for boost 1.69
boost/gil.hpp was added in 1.68 and boost/gil/gil_all.hpp removed in 1.69.
This commit is contained in:
parent
7853e7abe2
commit
75fc5f38d7
4 changed files with 16 additions and 0 deletions
|
@ -18,7 +18,11 @@
|
|||
|
||||
#include "dialogs.h"
|
||||
|
||||
#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
|
||||
#include <boost/gil/gil_all.hpp>
|
||||
#else
|
||||
#include <boost/gil.hpp>
|
||||
#endif
|
||||
|
||||
AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
|
||||
|
||||
|
|
|
@ -46,7 +46,11 @@
|
|||
#include <libaegisub/util.h>
|
||||
|
||||
#include <atomic>
|
||||
#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
|
||||
#include <boost/gil/gil_all.hpp>
|
||||
#else
|
||||
#include <boost/gil.hpp>
|
||||
#endif
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
|
||||
|
|
|
@ -16,7 +16,11 @@
|
|||
|
||||
#include "video_frame.h"
|
||||
|
||||
#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
|
||||
#include <boost/gil/gil_all.hpp>
|
||||
#else
|
||||
#include <boost/gil.hpp>
|
||||
#endif
|
||||
#include <wx/image.h>
|
||||
|
||||
namespace {
|
||||
|
|
|
@ -45,7 +45,11 @@
|
|||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/filesystem/path.hpp>
|
||||
#include <libaegisub/format.h>
|
||||
#if (BOOST_VERSION / 100000) <= 1 && ((BOOST_VERSION / 100) % 1000) <= 67
|
||||
#include <boost/gil/gil_all.hpp>
|
||||
#else
|
||||
#include <boost/gil.hpp>
|
||||
#endif
|
||||
|
||||
DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
|
||||
: framecount(frames)
|
||||
|
|
Loading…
Reference in a new issue