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 /avmedia/Library_avmediaogl.mk | |
| 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 'avmedia/Library_avmediaogl.mk')
| -rw-r--r-- | avmedia/Library_avmediaogl.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index afa52ca006d4..3bbebe885b97 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -16,11 +16,9 @@ $(eval $(call gb_Library_use_sdk_api,avmediaogl)) $(eval $(call gb_Library_use_externals,avmediaogl, \ boost_headers \ libgltf \ + glew \ glm_headers \ mesa_headers \ - glew \ - zlib \ - freetype \ )) $(eval $(call gb_Library_use_libraries,avmediaogl,\ @@ -50,8 +48,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediaogl,\ ifeq ($(strip $(OS)),WNT) $(eval $(call gb_Library_use_system_win32_libs,avmediaogl,\ opengl32 \ - gdi32 \ - glu32 \ )) else ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\ @@ -59,10 +55,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,avmediaogl,\ )) else ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,avmediaogl,\ - -ldl \ -lGL \ - -lGLU \ - -lX11 \ )) endif |