mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgltf: use WHITESPACE

Browse Source 
Change-Id: I47ca82d5f08431c8af8b8a85cfbfd083ebd6fda0
This commit is contained in:
Zolnai Tamás
2014-06-27 15:08:43 +02:00
parent af70a45633
commit b05b970daa
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
external/libgltf/ExternalProject_libgltf.mk vendored
View File

@@ -39,9 +39,6 @@ ifeq ($(SYSTEM_GLM),)
libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,glm)" libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,glm)"
endif endif
libgltf_empty :=
libgltf_space := $(libgltf_empty) $(libgltf_empty)
$(call gb_ExternalProject_get_state_target,libgltf,build) : $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\ $(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \ msbuild.exe libgltf.vcxproj \
@@ -50,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
/p:VisualStudioVersion=11.0) \ /p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \ $(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
/p:VisualStudioVersion=10.0) \ /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") \ /p:AdditionalLibraryDirectories=$(if $(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
,build/win32) ,build/win32)