diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-04-10 13:33:58 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-05-13 16:34:49 +0200 |
| commit | aa5fe7958d087fbd6e64b29bbf2fa6e4d9ba5ab6 (patch) | |
| tree | 8f5608c42445c6e9cc51f5a6e469cce74d7736e3 /configure.ac | |
| parent | 701f3dcb8d647304c56e7c437cc942b908123bc3 (diff) | |
Introduce OpenCollada external library
Change-Id: I08a806b9319f7cb55be3b38a3bb9370799f6752b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 7f2e48ebe665..28d4291c26f5 100644 --- a/configure.ac +++ b/configure.ac @@ -6281,6 +6281,27 @@ fi AC_SUBST(CXXFLAGS_CXX11) AC_SUBST(HAVE_CXX11) +AC_MSG_CHECKING([for std::shared_ptr]) +if test "$HAVE_CXX11" = "TRUE" -a "$GCC" = "yes"; then + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ + #include <memory> + using std::shared_ptr; + ])], + [ have_std_shared_ptr=yes ], + [ have_std_shared_ptr=no ] + ) + AC_LANG_POP([C++]) + CXXFLAGS=$save_CXXFLAGS +elif test "$COM" = "MSC"; then + have_std_shared_ptr=yes +else + have_std_shared_ptr=no +fi +AC_MSG_RESULT([$have_std_shared_ptr]) + dnl ================================== dnl Check for C++11 "= delete" support dnl ================================== @@ -10454,6 +10475,10 @@ if test "x$enable_gltf" != "xno"; then FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/objs/win32/vc2010/freetype248$FREETYPE_LIB_DEBUGLIB_SUFFIX.lib" fi fi + # otherwise build fails in collada2gltf external because of std::shared_ptr + if test "$have_std_shared_ptr" = "yes"; then + BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" + fi else AC_MSG_RESULT([no]) fi |