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 /RepositoryExternal.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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fc8c8f70a881..e69f625687ca 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -142,6 +142,7 @@ endif # SYSTEM_MDDS ifneq ($(SYSTEM_GLM),) gb_LinkTarget__use_glm_headers := +gb_ExternalProject__use_glm_headers := else @@ -154,6 +155,11 @@ $(call gb_LinkTarget_set_include,$(1),\ endef +define gb_ExternalProject__use_glm_headers +$(call gb_ExternalProject_get_preparation_target,$(1)) :| $(call gb_UnpackedTarball_get_final_target,glm) + +endef + endif ifeq (SANE,$(filter SANE,$(BUILD_TYPE))) @@ -239,6 +245,8 @@ $(call gb_LinkTarget_add_libs,$(1),$(GLEW_LIBS)) endef +gb_ExternalProject__use_glew := + else # !SYSTEM_GLEW $(eval $(call gb_Helper_register_packages_for_install,ooo,\ @@ -264,6 +272,11 @@ endif endef +define gb_ExternalProject__use_glew +$(call gb_ExternalProject_use_external_project,$(1),glew) + +endef + endif # SYSTEM_GLEW define gb_LinkTarget__use_iconv @@ -1274,7 +1287,7 @@ endef gb_ExternalProject__use_freetype := -else ifneq (,$(or $(findstring ANDROID,$(OS)),$(ENABLE_GLTF))) +else ifeq ($(OS),ANDROID) define gb_LinkTarget__use_freetype_headers $(call gb_LinkTarget_use_external_project,$(1),freetype) @@ -3258,7 +3271,6 @@ endif # SYSTEM_NSS endif # DESKTOP - ifeq ($(ENABLE_GLTF),TRUE) define gb_LinkTarget__use_libgltf @@ -3267,9 +3279,23 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_static_libraries,$(1),\ - libgltf \ +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,libgltf)/build/win32/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/libgltf.lib,Release/libgltf.lib) \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,libgltf)/src/.libs/libgltf-0.0$(gb_StaticLibrary_PLAINEXT) \ +) +endif + +$(call gb_LinkTarget_use_external_project,$(1),libgltf) + +endef + +define gb_ExternalProject__use_libgltf +$(call gb_ExternalProject_use_external_project,$(1),libgltf) + endef define gb_LinkTarget__use_opencollada_parser |