external/libgltf/ExternalProject_libgltf.mk | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit b05b970daaf69b5b491b847375ee07539de9481f
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Fri Jun 27 15:08:43 2014 +0200
libgltf: use WHITESPACE
Change-Id: I47ca82d5f08431c8af8b8a85cfbfd083ebd6fda0
diff --git a/external/libgltf/ExternalProject_libgltf.mk
b/external/libgltf/ExternalProject_libgltf.mk
index 01f0666..3e390b9 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -39,9 +39,6 @@ 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 \
@@ -50,7 +47,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
$(libgltf_space),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes))))' \
+ '/p:AdditionalIncludeDirectories=$(subst
$(WHITESPACE),;,$(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
