[Libreoffice-commits] core.git: external/libgltf

David Ostrovsky david at ostrovsky.org
Fri Jul 11 04:37:26 PDT 2014


 external/libgltf/ExternalProject_libgltf.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 705473c9bd787dff7b63f94a3a577b9510cb62af
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Tue Jul 8 23:45:53 2014 +0200

    VS2013: Adjust libgltf to 12.0 vcproj version
    
    Change-Id: I076c998f5c843b60ac5624381e51271a0924043f
    Reviewed-on: https://gerrit.libreoffice.org/10161
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index 3e390b9..25f57b8 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -43,6 +43,7 @@ $(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 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0) \
 			$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
 				/p:VisualStudioVersion=11.0) \
 			$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \


More information about the Libreoffice-commits mailing list