summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-05-24 23:28:53 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-05-24 23:29:35 +0200
commit2d8941eea664031567f4d70f8347dc15befe8880 (patch)
treec6c1b1b30d74bd6c5c24e4161c4c089c29d04cbb /external
parent6540350a710bcd194fda42827878e6eb1b3c45e7 (diff)
kmz3collada: Workaround for missing textures
The write-only-.dae-file-which-we-need.patch makes the converter extract only the *.dae file but textures are stored in seperate image files we need to extract too. On the other hand this patch makes the converter buildable on all platforms, since this only works on Windows originally. So for now disable this patch on Windows so here we won't loose textures but enable it on other platforms for buildability. Later we need to solve kmz conversion properly. Change-Id: Iede9e3bdd5a68a9002f5fa38da8a6459dda8d805
Diffstat (limited to 'external')
-rw-r--r--external/collada2gltf/UnpackedTarball_collada2gltf.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
index a3ba21896886..f37f27440f2c 100644
--- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk
+++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
@@ -15,8 +15,16 @@ $(eval $(call gb_UnpackedTarball_add_file,collada2gltf,.,external/collada2gltf/G
$(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
external/collada2gltf/patches/add-unzip-kmz-files-to-collada-files-module.patch.3 \
- external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0 \
external/collada2gltf/patches/wrong_uri_usage.patch.1 \
))
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\
+ external/collada2gltf/patches/write-only-.dae-file-which-we-need.patch.0 \
+))
+
+endif
+
+
+
# vim: set noet sw=4 ts=4: