summaryrefslogtreecommitdiff
path: root/external/libgltf
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-06-27 15:08:43 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-06-27 15:09:10 +0200
commitb05b970daaf69b5b491b847375ee07539de9481f (patch)
tree24018f8fbc70c7cba44b5a36e9ee1ff7a78a78c5 /external/libgltf
parentaf70a45633b34eaae4eb4577b763dadfc48c74b6 (diff)
libgltf: use WHITESPACE
Change-Id: I47ca82d5f08431c8af8b8a85cfbfd083ebd6fda0
Diffstat (limited to 'external/libgltf')
-rw-r--r--external/libgltf/ExternalProject_libgltf.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index 01f0666f78f0..3e390b91aebc 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)