diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-25 16:05:48 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-25 16:58:41 +0200 |
| commit | d83e66da94d9c789190c4729c8f0c8464e99ba88 (patch) | |
| tree | 9fa4e9030b8e77cc6cd754dfb9eb3af6b721283b | |
| parent | 5aadf3ce06f76b07290a8ae2fedb54386c825935 (diff) | |
libgltf: variable names need module prefix
Change-Id: Id144a483fe5576cdd546ac5da87890dc61f964b3
| -rw-r--r-- | external/libgltf/ExternalProject_libgltf.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk index d20616b47597..7ef30c801fa8 100644 --- a/external/libgltf/ExternalProject_libgltf.mk +++ b/external/libgltf/ExternalProject_libgltf.mk @@ -24,31 +24,28 @@ $(eval $(call gb_ExternalProject_use_externals,libgltf,\ ifeq ($(COM),MSC) -AdditionalIncludes := +libgltf_AdditionalIncludes := ifeq ($(SYSTEM_BOOST),) -AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,boost)" -AdditionalIncludes += "$(SRCDIR)/config_host" +libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,boost)" +libgltf_AdditionalIncludes += "$(SRCDIR)/config_host" endif ifeq ($(SYSTEM_GLEW),) -AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,glew)/include" +libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,glew)/include" endif ifeq ($(SYSTEM_GLM),) -AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,glm)" +libgltf_AdditionalIncludes += "$(call gb_UnpackedTarball_get_dir,glm)" endif -empty := -space := $(empty) $(empty) - $(call gb_ExternalProject_get_state_target,libgltf,build) : $(call gb_ExternalProject_run,build,\ msbuild.exe libgltf.vcxproj \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ /p:VisualStudioVersion=11.0) \ - '/p:AdditionalIncludeDirectories=$(subst $(space),;,$(subst /,\,$(strip $(AdditionalIncludes))))' \ + '/p:AdditionalIncludeDirectories=$(subst $(gb_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) |