[Libreoffice-commits] core.git: 2 commits - external/libgltf svtools/source

[Markus Mohrhard]

 external/libgltf/ExternalProject_libgltf.mk   |    2 +-
 svtools/source/contnr/DocumentInfoPreview.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 717f8a87a7f009b821fd512c26cb35b2cac14993
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jul 12 12:59:47 2014 +0200

    enable debug informations for gltf in debug builds
    
    Change-Id: I81fc7ebc77a67d2d64dd74e1dec0ce7ffbb1b19b

diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index 25f57b8..dfbe271 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -59,7 +59,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
 		export PKG_CONFIG="" \
 		&& ./configure \
 			--with-pic \
-			--disable-debug \
+			$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
 			--disable-werror \
 			BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) -I$(BUILDDIR)/config_$(gb_Side)" \
 			GLEW_CFLAGS="$(if $(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glew)/include)" \
commit 6a393f7843bc32b14d007ccdb41922f42afe0f3d
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Sat Jul 12 12:34:56 2014 +0200

    pass by reference
    
    Change-Id: I44e8f40935a19f8023bb23f53c5fb458eb28a3dc

diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 5a4e154..c371f4b 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -54,7 +54,7 @@ ODocumentInfoPreview::ODocumentInfoPreview(Window * pParent, WinBits nBits):
 
 ODocumentInfoPreview::~ODocumentInfoPreview() {}
 
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeODocumentInfoPreview(Window *pParent, VclBuilder::stringmap)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeODocumentInfoPreview(Window *pParent, VclBuilder::stringmap&)
 {
     return new ODocumentInfoPreview(pParent, WB_BORDER | WB_READONLY);
 }