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

[Robert Antoni Buj i Gelonch]

 external/coinmp/UnpackedTarball_coinmp.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b943150fe84a0158546b6a00ee330ea503c02359
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Sun Oct 19 16:27:58 2014 +0200

    coinmp: conditional patch
    
    Change-Id: I33927632173d422d04771f550721dba1767cded5
    Reviewed-on: https://gerrit.libreoffice.org/12040
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index ef70c5c..95e40e7 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -21,9 +21,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
 	external/coinmp/werror-format-security.patch.0 \
 	external/coinmp/werror-undef.patch.0 \
 	external/coinmp/coinmp-msvc-disable-sse2.patch.1 \
-	$(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \
+	$(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1 \
+		$(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1) \
+	) \
 	$(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \
-	$(if $(filter MSC,$(COM)),$(if $(filter 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1)) \
 ))
 
 # vim: set noet sw=4 ts=4: