From 08a43cc97ccf88faa9d3a04afc3aacd2c885a2d1 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Sat, 28 Oct 2017 02:28:18 +0200 Subject: related: tdf#103884 remove gltf/collada feature Change-Id: Icd26ad96c0337844ef1463dabfbe791caa00dd2d Reviewed-on: https://gerrit.libreoffice.org/43972 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens --- RepositoryExternal.mk | 105 -------------------------------------------------- 1 file changed, 105 deletions(-) (limited to 'RepositoryExternal.mk') diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 282dc53f6ced..026ab1879cf2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3479,111 +3479,6 @@ endif endif -ifeq ($(ENABLE_GLTF),TRUE) - -ifneq ($(SYSTEM_LIBGLTF),TRUE) - -define gb_LinkTarget__use_libgltf -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \ - $$(INCLUDE) \ -) - -ifeq ($(COM),MSC) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,libgltf)/build/win32/$(wnt_arch_subdir_optional)$(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.1$(gb_StaticLibrary_PLAINEXT) \ -) -endif - -$(call gb_LinkTarget_use_external_project,$(1),libgltf) - -endef - -else # SYSTEM_LIBGLTF - -define gb_LinkTarget__use_libgltf -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(LIBGLTF_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS)) - -endef - -endif # SYSTEM_LIBGLTF - -ifeq ($(ENABLE_COLLADA),TRUE) - -ifeq ($(SYSTEM_OPENCOLLADA),TRUE) - -define gb_LinkTarget__use_opencollada_parser -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(OPENCOLLADA_CFLAGS) \ -) - -$(call gb_LinkTarget_add_libs,$(1),$(OPENCOLLADA_LIBS)) - -endef - -else # !SYSTEM_OPENCOLLADA - -define gb_LinkTarget__use_opencollada_parser -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \ - -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADAFramework/include \ - -I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADASaxFrameworkLoader/include \ - -I$(call gb_UnpackedTarball_get_dir,opencollada)/GeneratedSaxParser/include \ - $$(INCLUDE) \ -) - -$(call gb_LinkTarget_use_static_libraries,$(1),\ - opencollada_parser \ -) -endef - -endif # SYSTEM_OPENCOLLADA - -ifeq ($(SYSTEM_COLLADA2GLTF),TRUE) - -define gb_LinkTarget__use_collada2gltf -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(COLLADA2GLTF_CFLAGS) \ -) - -$(call gb_LinkTarget_add_libs,$(1),$(COLLADA2GLTF_LIBS)) - -endef - -else # !SYSTEM_COLLADA2GLTF - -define gb_LinkTarget__use_collada2gltf -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,collada2gltf) \ - -I$(call gb_UnpackedTarball_get_dir,collada2gltf)/assetModifiers \ - -I$(call gb_UnpackedTarball_get_dir,collada2gltf)/GLTF \ - -I$(call gb_UnpackedTarball_get_dir,collada2gltf)/helpers \ - -I$(call gb_UnpackedTarball_get_dir,collada2gltf)/JSON \ - -I$(call gb_UnpackedTarball_get_dir,collada2gltf)/dependencies/json/include/rapidjson/ \ - $$(INCLUDE) \ -) - -$(call gb_LinkTarget_use_static_libraries,$(1),\ - collada2gltf \ -) -endef - -endif # SYSTEM_COLLADA2GLTF - -endif # ENABLE_COLLADA - -endif # ENABLE_GLTF - define gb_LinkTarget__use_dconf $(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS)) $(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS)) -- cgit