summaryrefslogtreecommitdiff
path: root/external/libgltf
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-06-27 13:41:36 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-06-27 13:41:36 +0200
commitc7d6541f5daa59d04accb30c727a83d936f02150 (patch)
treef37dba16570749d1ff50cd23a50d49b2bad56b91 /external/libgltf
parentbe13df63e08fad9fb23038e09d741457738c24d3 (diff)
libgltf: it seems gb_SPACE is not that we need here
Change-Id: I099f2bb007cdd29db25a99ca84e53115a12379bd
Diffstat (limited to 'external/libgltf')
-rw-r--r--external/libgltf/ExternalProject_libgltf.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index 580c0102889d..5c40aa727ca6 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)