diff options
| author | Robert Antoni Buj i Gelonch <robert.buj@gmail.com> | 2014-10-19 16:27:58 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-19 09:24:28 +0000 |
| commit | b943150fe84a0158546b6a00ee330ea503c02359 (patch) | |
| tree | 439609de0ebadc5c7cbef3a0fc3ab79caecc89bf /external | |
| parent | f857358d83e7c105271eb0e2c43f0b036f14f284 (diff) | |
coinmp: conditional patch
Change-Id: I33927632173d422d04771f550721dba1767cded5
Reviewed-on: https://gerrit.libreoffice.org/12040
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/coinmp/UnpackedTarball_coinmp.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk index ef70c5ca9d1e..95e40e7550a3 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: |