summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-07-18 19:11:14 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-07-23 21:51:42 +0200
commit887c088f20fe36b9b15484d0a5ec9416ba6cd310 (patch)
tree0c2ad05c3c4e1a35cb438475f0d93152844c3240 /external
parentea5ef0a72e5e608baf2c40700658a4fcba6a3759 (diff)
make libgltf compile on OSX
Change-Id: Ie39292137f931bfd557f66c485e104cf5d5089b8
Diffstat (limited to 'external')
-rw-r--r--external/libgltf/ExternalProject_libgltf.mk2
-rw-r--r--external/libgltf/UnpackedTarball_libgltf.mk1
2 files changed, 2 insertions, 1 deletions
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index dfbe2710dd5d..d68582f9d83a 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -58,6 +58,8 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
&& ./configure \
+ --disable-shared \
+ --enable-static \
--with-pic \
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index a7565ea09efc..176c1d15246b 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
$(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
- external/libgltf/pathces/fix_rendering_of_resized_model.patch \
))
# vim: set noet sw=4 ts=4: