diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-07-18 19:11:14 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-07-23 21:51:42 +0200 |
| commit | 887c088f20fe36b9b15484d0a5ec9416ba6cd310 (patch) | |
| tree | 0c2ad05c3c4e1a35cb438475f0d93152844c3240 | |
| parent | ea5ef0a72e5e608baf2c40700658a4fcba6a3759 (diff) | |
make libgltf compile on OSX
Change-Id: Ie39292137f931bfd557f66c485e104cf5d5089b8
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 2 | ||||
| -rw-r--r-- | external/libgltf/ExternalProject_libgltf.mk | 2 | ||||
| -rw-r--r-- | external/libgltf/UnpackedTarball_libgltf.mk | 1 | ||||
| -rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index d820cfdb7901..45f77edb9361 100644 --- a/configure.ac +++ b/configure.ac @@ -10600,7 +10600,7 @@ dnl Check whether to enable glTF support dnl =================================================================== AC_MSG_CHECKING([whether to enable glTF support]) ENABLE_GLTF= -if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != Android; then +if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android; then ENABLE_GLTF=TRUE AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_FEATURE_GLTF,1) diff --git a/download.lst b/download.lst index ee8cf9ca58ee..c4e1d7d37430 100644 --- a/download.lst +++ b/download.lst @@ -87,7 +87,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 -export LIBGLTF_TARBALL := 3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2 +export LIBGLTF_TARBALL := c1af7fbc6dde8fcbdca4ec22dd78c4c1-libgltf-0.0.0.tar.bz2 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz 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: diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index bf63d0968d69..ee916bb56687 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -475,6 +475,7 @@ bool OpenGLContext::ImplInit() #elif defined( MACOSX ) CGLPixelFormatAttribute pixelFormatAttributes[] = { + kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core, kCGLPFAColorSize, (CGLPixelFormatAttribute) 24, kCGLPFAAlphaSize, (CGLPixelFormatAttribute) 8, kCGLPFADoubleBuffer, |