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

libgltf: it seems gb_SPACE is not that we need here

Browse Source 
Change-Id: I099f2bb007cdd29db25a99ca84e53115a12379bd
This commit is contained in:
Zolnai Tamás 2014-06-27 13:41:36 +02:00
parent be13df63e0
commit c7d6541f5d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
external/libgltf/ExternalProject_libgltf.mk vendored
View File

@ -39,6 +39,9 @@ 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 \
@ -47,7 +50,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 $(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") \ /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)