Merge branch 'timoore/effects'
Conflicts: simgear/scene/model/model.cxx simgear/scene/sky/newcloud.cxx
This commit is contained in:
+1
-1
@@ -37,7 +37,7 @@ AC_PROG_CXX
|
||||
AC_PROG_RANLIB
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
AX_BOOST_BASE([1.34.0])
|
||||
AX_BOOST_BASE([1.37.0])
|
||||
|
||||
if test "x$BOOST_CPPFLAGS" != "x-I/usr/include" ; then
|
||||
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
|
||||
|
||||
Reference in New Issue
Block a user