From de030cd7a234fd9191364647deb1a4836ca992cb Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 4 Mar 2017 14:36:08 +0100 Subject: gbuild: Remove MSVC 2013 legacy code Uwinapi is discontinued. Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01 Reviewed-on: https://gerrit.libreoffice.org/23198 Reviewed-by: David Ostrovsky Tested-by: David Ostrovsky --- external/coinmp/UnpackedTarball_coinmp.mk | 4 +- external/coinmp/coinmp-vs2013.patch.1 | 352 ------------------------------ 2 files changed, 1 insertion(+), 355 deletions(-) delete mode 100644 external/coinmp/coinmp-vs2013.patch.1 (limited to 'external/coinmp') diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk index 98d544034ff4..0bf3f8cfb60b 100644 --- a/external/coinmp/UnpackedTarball_coinmp.mk +++ b/external/coinmp/UnpackedTarball_coinmp.mk @@ -24,9 +24,7 @@ $(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 120,$(VCVER)),external/coinmp/coinmp-vs2013.patch.1) \ - ) \ + $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \ $(if $(filter MACOSX,$(OS)),external/coinmp/macosx.build.patch.1) \ external/coinmp/werror-format-pedantic.patch.0 \ external/coinmp/ubsan.patch.0 \ diff --git a/external/coinmp/coinmp-vs2013.patch.1 b/external/coinmp/coinmp-vs2013.patch.1 deleted file mode 100644 index 2b06c1519a78..000000000000 --- a/external/coinmp/coinmp-vs2013.patch.1 +++ /dev/null @@ -1,352 +0,0 @@ --*- Mode:Diff -*- ---- coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj -+++ coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj -@@ -1,5 +1,5 @@ -  -- -+ - - - Debug -@@ -25,25 +25,25 @@ - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - ---- coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj -+++ coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj -@@ -1,5 +1,5 @@ -  -- -+ - - - Debug -@@ -26,27 +26,27 @@ - - - StaticLibrary -- v110 -+ v120 - Unicode - false - false - - - StaticLibrary -- v110 -+ v120 - Unicode - false - - - StaticLibrary -- v110 -+ v120 - Unicode - false - false - - - StaticLibrary -- v110 -+ v120 - Unicode - false - ---- coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj -+++ coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj -@@ -1,5 +1,5 @@ -  -- -+ - - - Debug -@@ -25,25 +25,25 @@ - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - ---- coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj -+++ coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj -@@ -1,5 +1,5 @@ -  -- -+ - - - Debug -@@ -25,25 +25,25 @@ - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - ---- coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj -+++ coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj -@@ -1,5 +1,5 @@ -  -- -+ - - - Debug -@@ -25,25 +25,25 @@ - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - ---- coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj -+++ coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj -@@ -1,5 +1,5 @@ -  -- -+ - - - Debug -@@ -26,24 +26,24 @@ - - - DynamicLibrary -- v110 -+ v120 - Unicode - true - - - DynamicLibrary -- v110 -+ v120 - MultiByte - - - DynamicLibrary -- v110 -+ v120 - Unicode - true - - - DynamicLibrary -- v110 -+ v120 - MultiByte - - ---- coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj -+++ coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj -@@ -1,5 +1,5 @@ -  -- -+ - - - Debug -@@ -26,24 +26,24 @@ - - - Application -- v110 -+ v120 - Unicode - true - - - Application -- v110 -+ v120 - Unicode - - - Application -- v110 -+ v120 - Unicode - true - - - Application -- v110 -+ v120 - Unicode - - ---- coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj -+++ coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj -@@ -1,5 +1,5 @@ -  -- -+ - - - Debug -@@ -25,25 +25,25 @@ - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - ---- coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj -+++ coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj -@@ -1,5 +1,5 @@ -  -- -+ - - - Debug -@@ -24,25 +24,25 @@ - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - - - StaticLibrary -- v110 -+ v120 - false - MultiByte - -- cgit