diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-25 15:19:41 +0200 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2014-06-25 13:22:29 +0000 |
| commit | 6403f2b59b4c83e0899012e5ca0ddd705784350c (patch) | |
| tree | ccc8080f9b4ba808f2fec310aedd15703c41170b /configure.ac | |
| parent | 076e4afc61b216e34959bd4e3701f1fa19972d5c (diff) | |
Update libgltf: new build system and various fixes
Building:
- The new tarball has reasonable build system so
build libgltf as external package instead of compiling
source files directly.
- Freetype dependancy is removed
Improvements comes with the new libgltf
- Can rotate the models too (orbit mode)
- Two camera handling mode: walkthrough and orbit
(press M to change).
- gltf_animation_set_time() works
- FPS can be displayed without freetype (press F)
Additional notes:
- There were some bugs/regressions which are fixed
during the integration (see patches).
- License files are uddated now.
- libgltf building is enabled only on those platforms
on which gltf support actually works (windows and linux)
Change-Id: Ia6c9c4da53a9b4fedba0d73aa5791489f8ad424b
Reviewed-on: https://gerrit.libreoffice.org/9895
Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 6086b4ca6b20..434972b51fe3 100644 --- a/configure.ac +++ b/configure.ac @@ -10516,25 +10516,12 @@ dnl =================================================================== dnl Check whether to enable glTF support dnl =================================================================== AC_MSG_CHECKING([whether to enable glTF support]) -if test "$ENABLE_RELEASE_BUILD" = "TRUE"; then - if test $_os == iOS -o $_os == Android -o $_os = Darwin; then - enable_gltf=no - fi -fi - ENABLE_GLTF= -if test "x$enable_gltf" != "xno"; then +if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != Android; then ENABLE_GLTF=TRUE AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FEATURE_GLTF,1) BUILD_TYPE="$BUILD_TYPE LIBGLTF" - if test "$test_freetype" = "no"; then - BUILD_TYPE="$BUILD_TYPE FREETYPE" - if test "$COM" = "MSC"; then - test -n "${MSVC_USE_DEBUG_RUNTIME}" && FREETYPE_LIB_DEBUGLIB_SUFFIX="_D" - 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" |