iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix compilation with non-bleeding edge boost

This commit is contained in:
Thomas Goyne 2014-03-11 11:28:49 -07:00
parent 843e71331f
commit 1745177b6c
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -221,6 +221,11 @@ AX_BOOST_REGEX
AX_BOOST_SYSTEM
AX_BOOST_THREAD
cppflags_bak="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
AC_CHECK_HEADERS([boost/spirit/home/phoenix/version.hpp])
CPPFLAGS=$cppflags_bak
PKG_CHECK_MODULES(ICU_UC, icu-uc >= icu_required_version)
PKG_CHECK_MODULES(ICU_I18N, icu-i18n >= icu_required_version)

7
libaegisub/common/parser.cpp
View File

@ -27,7 +27,14 @@
#include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/fusion/include/adapt_struct.hpp>
#include <boost/spirit/include/lex_lexertl.hpp>
// We have to use the copy of pheonix within spirit if it exists, as the
// standalone copy has different header guards
#ifdef HAVE_BOOST_PHOENIX_VERSION_HPP
#include <boost/spirit/home/phoenix/statement.hpp>
#else
#include <boost/phoenix/statement.hpp>
#endif
BOOST_FUSION_ADAPT_STRUCT(
agi::Color,

2
vendor/boost vendored

@ -1 +1 @@
Subproject commit db6013d20a28dd0d96a8c21146e33f17788c4881
Subproject commit 614aac8fef2a0551610f72e5c4a61085c8c06e35