external/libgltf/ExternalProject_libgltf.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit c7d6541f5daa59d04accb30c727a83d936f02150
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Fri Jun 27 13:41:36 2014 +0200
libgltf: it seems gb_SPACE is not that we need here
Change-Id: I099f2bb007cdd29db25a99ca84e53115a12379bd
diff --git a/external/libgltf/ExternalProject_libgltf.mk
b/external/libgltf/ExternalProject_libgltf.mk
index 580c010..5c40aa7 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -39,6 +39,9 @@ ifeq ($(SYSTEM_GLM),)
libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,glm)"
endif
+libgltf_empty :=
+libgltf_space := $(libgltf_empty) $(libgltf_empty)
+
$(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \
@@ -47,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
/p:VisualStudioVersion=10.0) \
- '/p:AdditionalIncludeDirectories=$(subst
$(gb_SPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes))))' \
+ '/p:AdditionalIncludeDirectories=$(subst
$(libgltf_space),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes))))' \
/p:AdditionalLibraryDirectories=$(if
$(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
,build/win32)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
