[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 5 commits - coinmp/ExternalPackage_coinmp.mk coinmp/ExternalProject_coinmp.mk coinmp/Makefile coinmp/Module_coinmp.mk coinmp/README coinmp/UnpackedTarball_coinmp.mk coinmp/windows.build.patch.1 config_host.mk.in configure.ac download.lst Makefile.fetch postprocess/Rdb_services.mk RepositoryExternal.mk Repository.mk RepositoryModule_host.mk sccomp/CppunitTest_sccomp_lpsolver.mk sccomp/Library_coinmpsolver.mk sccomp/Library_solver.mk sccomp/Module_sccomp.mk sccomp/qa sccomp/source scp2/inc scp2/InstallModule_calc.mk scp2/InstallModule_ooo.mk scp2/source

[Matúš Kukan]

 Makefile.fetch                              |    1 
 Repository.mk                               |    3 
 RepositoryExternal.mk                       |   31 
 RepositoryModule_host.mk                    |    1 
 coinmp/ExternalPackage_coinmp.mk            |   36 
 coinmp/ExternalProject_coinmp.mk            |   35 
 coinmp/Makefile                             |    7 
 coinmp/Module_coinmp.mk                     |   18 
 coinmp/README                               |    5 
 coinmp/UnpackedTarball_coinmp.mk            |   22 
 coinmp/windows.build.patch.1                | 3225 ++++++++++++++++++++++++++++
 config_host.mk.in                           |    1 
 configure.ac                                |   15 
 download.lst                                |    2 
 postprocess/Rdb_services.mk                 |    3 
 sccomp/CppunitTest_sccomp_lpsolver.mk       |   50 
 sccomp/Library_coinmpsolver.mk              |   34 
 sccomp/Library_solver.mk                    |    2 
 sccomp/Module_sccomp.mk                     |   12 
 sccomp/qa/unit/lpsolver.cxx                 |  128 +
 sccomp/source/solver/coinmpsolver.component |   15 
 sccomp/source/solver/solver-lpsolve.cxx     |  639 +++++
 sccomp/source/solver/solver.cxx             |  253 +-
 sccomp/source/solver/solver.hrc             |    1 
 sccomp/source/solver/solver.src             |    5 
 scp2/InstallModule_calc.mk                  |    9 
 scp2/InstallModule_ooo.mk                   |    2 
 scp2/inc/macros.inc                         |    1 
 scp2/source/calc/file_calc.scp              |   49 
 scp2/source/calc/module_calc.scp            |    1 
 30 files changed, 4467 insertions(+), 139 deletions(-)

New commits:
commit d3fbac91cf8b70683fd305ec2366a50197821d04
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Apr 1 21:00:47 2014 +0200

    sccomp: Add very simple unit test for lp solvers.
    
    (cherry picked from commit d059866a38ca555050abea1554ceaf7da98edfac)
    
    Conflicts:
    	sccomp/Module_sccomp.mk
    
    Change-Id: I359737ad57decf2b1988afbceab85645fbbf1f33

diff --git a/sccomp/CppunitTest_sccomp_lpsolver.mk b/sccomp/CppunitTest_sccomp_lpsolver.mk
new file mode 100644
index 0000000..4cb71fd
--- /dev/null
+++ b/sccomp/CppunitTest_sccomp_lpsolver.mk
@@ -0,0 +1,50 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sccomp_lpsolver))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sccomp_lpsolver,\
+	sccomp/qa/unit/lpsolver \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sccomp_lpsolver,\
+	boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_defs,sccomp_lpsolver,\
+	$(if $(ENABLE_COINMP), -DENABLE_COINMP) \
+	$(if $(ENABLE_LPSOLVE), -DENABLE_LPSOLVE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sccomp_lpsolver,\
+	cppu \
+	sal \
+	sc \
+	test \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sccomp_lpsolver,\
+	-I$(SRCDIR)/sc/inc \
+	$$(INCLUDE) \
+))
+
+
+$(eval $(call gb_CppunitTest_use_api,sccomp_lpsolver,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sccomp_lpsolver))
+
+$(eval $(call gb_CppunitTest_use_rdb,sccomp_lpsolver,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sccomp_lpsolver))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk
index 7d10ecd..75af86c 100644
--- a/sccomp/Module_sccomp.mk
+++ b/sccomp/Module_sccomp.mk
@@ -25,4 +25,9 @@ $(eval $(call gb_Module_add_targets,sccomp,\
 	$(if $(ENABLE_LPSOLVE), Library_solver) \
 ))
 
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,sccomp,\
+	CppunitTest_sccomp_lpsolver \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sccomp/qa/unit/lpsolver.cxx b/sccomp/qa/unit/lpsolver.cxx
new file mode 100644
index 0000000..75c091b
--- /dev/null
+++ b/sccomp/qa/unit/lpsolver.cxx
@@ -0,0 +1,128 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <sal/config.h>
+
+#include <com/sun/star/container/XContentEnumerationAccess.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/sheet/XSolver.hpp>
+#include <com/sun/star/sheet/XSolverDescription.hpp>
+#include <test/bootstrapfixture.hxx>
+
+#include <address.hxx>
+
+using namespace css;
+
+namespace {
+
+class LpSolverTest: public test::BootstrapFixture
+{
+    uno::Reference<sheet::XSpreadsheetDocument> m_xDocument;
+
+    void test();
+    void testSolver(const uno::Reference<sheet::XSolver>& xSolver);
+
+public:
+    virtual void setUp() SAL_OVERRIDE;
+    virtual void tearDown() SAL_OVERRIDE;
+
+    CPPUNIT_TEST_SUITE(LpSolverTest);
+    CPPUNIT_TEST(test);
+    CPPUNIT_TEST_SUITE_END();
+};
+
+void LpSolverTest::setUp()
+{
+    test::BootstrapFixture::setUp();
+    uno::Reference<frame::XDesktop2> xComponentLoader = frame::Desktop::create(m_xContext);
+    uno::Reference<lang::XComponent> xComponent(xComponentLoader->loadComponentFromURL(
+            "private:factory/scalc", "_blank", 0,
+            uno::Sequence < ::com::sun::star::beans::PropertyValue >()));
+    m_xDocument.set(xComponent, uno::UNO_QUERY_THROW);
+}
+
+void LpSolverTest::tearDown()
+{
+    uno::Reference<lang::XComponent>(m_xDocument, uno::UNO_QUERY_THROW)->dispose();
+    test::BootstrapFixture::tearDown();
+}
+
+void LpSolverTest::test()
+{
+    uno::Reference<container::XContentEnumerationAccess> xEnAc(
+            m_xContext->getServiceManager(), uno::UNO_QUERY_THROW);
+    uno::Reference<container::XEnumeration> xEnum = xEnAc->
+        createContentEnumeration( "com.sun.star.sheet.Solver" );
+    CPPUNIT_ASSERT(xEnum.is());
+
+    sal_Int32 nCount = 0;
+    while (xEnum->hasMoreElements())
+    {
+        uno::Reference<uno::XInterface> xIntFac;
+        xEnum->nextElement() >>= xIntFac;
+        CPPUNIT_ASSERT(xIntFac.is());
+        uno::Reference<lang::XServiceInfo> xInfo(xIntFac, uno::UNO_QUERY_THROW);
+        const OUString sName(xInfo->getImplementationName());
+        uno::Reference<sheet::XSolver> xSolver(m_xContext->getServiceManager()->
+                createInstanceWithContext(sName, m_xContext), uno::UNO_QUERY_THROW);
+        testSolver(xSolver);
+
+        uno::Reference<sheet::XSolverDescription> xDesc(xSolver, uno::UNO_QUERY_THROW);
+        const OString sMessage("Empty description for " +
+                OUStringToOString(sName, RTL_TEXTENCODING_UTF8));
+        CPPUNIT_ASSERT_MESSAGE(sMessage.getStr(), !xDesc->getComponentDescription().isEmpty());
+        ++nCount;
+    }
+    sal_Int32 nExpected = 0;
+#ifdef ENABLE_COINMP
+    ++nExpected;
+#endif
+#ifdef ENABLE_LPSOLVE
+    ++nExpected;
+#endif
+    CPPUNIT_ASSERT_EQUAL(nExpected, nCount);
+}
+
+void LpSolverTest::testSolver(const uno::Reference<sheet::XSolver>& xSolver)
+{
+    table::CellAddress aObjective(0, 0, 0);
+
+    // "changing cells" - unknown variables
+    uno::Sequence<table::CellAddress> aVariables(1);
+    aVariables[0] = table::CellAddress(0, 0, 0);
+
+    // constraints
+    uno::Sequence<sheet::SolverConstraint> aConstraints(1);
+    aConstraints[0].Left = table::CellAddress(0, 0, 0);
+    aConstraints[0].Operator = sheet::SolverConstraintOperator_LESS_EQUAL;
+    aConstraints[0].Right <<= 5.0;
+
+    // initialize solver
+    xSolver->setDocument( m_xDocument );
+    xSolver->setObjective( aObjective );
+    xSolver->setVariables( aVariables );
+    xSolver->setConstraints( aConstraints );
+    xSolver->setMaximize( true );
+
+    // test results
+    xSolver->solve();
+    CPPUNIT_ASSERT(xSolver->getSuccess());
+    uno::Sequence<double> aSolution = xSolver->getSolution();
+    CPPUNIT_ASSERT_EQUAL(aSolution.getLength(), aVariables.getLength());
+    CPPUNIT_ASSERT_EQUAL(aSolution[0], (double)5.0);
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(LpSolverTest);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ebb5648642e6598801b490944d8897b50ac093bf
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Mon Mar 31 19:18:41 2014 +0200

    Install coinmp and lpsolve linear solvers in parallel.
    
    (cherry picked from commit de7cdbc5840fd7d958d486901e405890eff224b9)
    + some amending
    
    Conflicts:
    	Repository.mk
    	sccomp/Module_sccomp.mk
    	scp2/InstallModule_calc.mk
    	scp2/InstallModule_ooo.mk
    	scp2/source/calc/module_calc.scp
    
    Change-Id: I2358ae0fa22b097176446f8aea0a61cdd4e06adf

diff --git a/Repository.mk b/Repository.mk
index e0d4d7c..072d8b7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -408,7 +408,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     simplecm \
     sm \
     smd \
-    solver \
+	$(if $(ENABLE_COINMP),coinmpsolver) \
+	$(if $(ENABLE_LPSOLVE),solver) \
     spa \
     spell \
     sts \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2f25029..964f2e1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1655,6 +1655,7 @@ endef
 endif # ANDROID
 endif # SYSTEM_LCMS2
 
+ifneq ($(ENABLE_LPSOLVE),)
 
 ifeq ($(SYSTEM_LPSOLVE),YES)
 
@@ -1686,6 +1687,36 @@ endef
 
 endif # SYSTEM_LPSOLVE
 
+endif # ENABLE_LPSOLVE
+
+ifneq ($(ENABLE_COINMP),)
+
+define gb_LinkTarget__use_coinmp
+$(call gb_LinkTarget_use_package,$(1),coinmp)
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/release/CoinMP.lib \
+)
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+	-L$(call gb_UnpackedTarball_get_dir,coinmp)/Cbc/src/.libs -lCbc -lCbcSolver \
+	-L$(call gb_UnpackedTarball_get_dir,coinmp)/Cgl/src/.libs -lCgl \
+	-L$(call gb_UnpackedTarball_get_dir,coinmp)/Clp/src/.libs -lClp \
+	-L$(call gb_UnpackedTarball_get_dir,coinmp)/Clp/src/OsiClp/.libs -lOsiClp \
+	-L$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/src/.libs -lCoinMP \
+	-L$(call gb_UnpackedTarball_get_dir,coinmp)/CoinUtils/src/.libs -lCoinUtils \
+	-L$(call gb_UnpackedTarball_get_dir,coinmp)/Osi/src/Osi/.libs -lOsi \
+)
+endif
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/src \
+   $$(INCLUDE) \
+)
+
+endef
+
+endif # ENABLE_COINMP
+
 ifeq ($(ENABLE_GIO),TRUE)
 
 define gb_LinkTarget__use_gio
diff --git a/config_host.mk.in b/config_host.mk.in
index d96eec9..d69eca7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -104,6 +104,7 @@ export DOXYGEN=@DOXYGEN@
 export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
 export DPKG=@DPKG@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
+export ENABLE_COINMP=@ENABLE_COINMP@
 export ENABLE_CORETEXT=@ENABLE_CORETEXT@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@
diff --git a/configure.ac b/configure.ac
index 94622b2..970f198 100644
--- a/configure.ac
+++ b/configure.ac
@@ -573,6 +573,7 @@ linux-android*)
     enable_neon=no
     enable_mpl_subset=yes
     enable_opengl=no
+    enable_coinmp=no
     enable_lpsolve=no
     with_theme="tango"
     test_cups=no
@@ -7033,6 +7034,7 @@ if test $_os = iOS; then
     enable_mpl_subset=yes
     enable_opengl=no
     enable_lotuswordpro=no
+    enable_coinmp=no
     enable_lpsolve=no
     enable_postgresql_sdbc=no
     enable_lotuswordpro=no
@@ -8895,8 +8897,17 @@ dnl ===================================================================
 dnl How should we build the linear programming solver ?
 dnl ===================================================================
 
-# Should we check for system CoinMP ? How to do that ?
-BUILD_TYPE="$BUILD_TYPE COINMP"
+ENABLE_COINMP=
+AC_MSG_CHECKING([whether to build with CoinMP])
+if test "$enable_coinmp" != "no"; then
+    ENABLE_COINMP=TRUE
+    AC_MSG_RESULT([yes])
+    # Should we check for system CoinMP ? How to do that ?
+    BUILD_TYPE="$BUILD_TYPE COINMP"
+else
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_COINMP)
 
 ENABLE_LPSOLVE=
 AC_MSG_CHECKING([whether to build with lpsolve])
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 936aac2..3215d5f 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -112,6 +112,9 @@ $(eval $(call gb_Rdb_add_components,services,\
 	xmlscript/util/xmlscript \
 	xmlsecurity/util/xmlsecurity \
 	xmlsecurity/util/xsec_fw \
+	$(if $(ENABLE_COINMP), \
+		sccomp/source/solver/coinmpsolver \
+	) \
 	$(if $(ENABLE_LPSOLVE), \
 		sccomp/source/solver/solver \
 	) \
diff --git a/sccomp/Library_coinmpsolver.mk b/sccomp/Library_coinmpsolver.mk
new file mode 100644
index 0000000..849ce0f
--- /dev/null
+++ b/sccomp/Library_coinmpsolver.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+$(eval $(call gb_Library_Library,coinmpsolver))
+
+$(eval $(call gb_Library_set_componentfile,coinmpsolver,sccomp/source/solver/coinmpsolver))
+
+$(eval $(call gb_Library_use_sdk_api,coinmpsolver))
+
+$(eval $(call gb_Library_use_libraries,coinmpsolver,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	tl \
+	i18nlangtag \
+	$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_Library_use_externals,coinmpsolver,\
+	boost_headers \
+	coinmp \
+))
+
+$(eval $(call gb_Library_add_exception_objects,coinmpsolver,\
+	sccomp/source/solver/solver \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk
index 15d9a6c..7d10ecd 100644
--- a/sccomp/Module_sccomp.mk
+++ b/sccomp/Module_sccomp.mk
@@ -19,13 +19,10 @@
 
 $(eval $(call gb_Module_Module,sccomp))
 
-ifeq ($(ENABLE_LPSOLVE),TRUE)
-
 $(eval $(call gb_Module_add_targets,sccomp,\
-	AllLangResTarget_solver \
-	Library_solver \
+	$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE), AllLangResTarget_solver) \
+	$(if $(ENABLE_COINMP), Library_coinmpsolver) \
+	$(if $(ENABLE_LPSOLVE), Library_solver) \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/sccomp/source/solver/coinmpsolver.component b/sccomp/source/solver/coinmpsolver.component
new file mode 100644
index 0000000..0feb3d0
--- /dev/null
+++ b/sccomp/source/solver/coinmpsolver.component
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ -->
+
+<component loader="com.sun.star.loader.SharedLibrary" prefix="coinmp"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.Calc.CoinMPSolver">
+    <service name="com.sun.star.sheet.Solver"/>
+  </implementation>
+</component>
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index a44512a..acc321b 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -36,7 +36,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <cppuhelper/factory.hxx>
 #include <vector>
-#include <unordered_map>
+#include <boost/unordered_map.hpp>
 
 #include <tools/resmgr.hxx>
 
@@ -103,7 +103,7 @@ struct ScSolverCellEqual
     }
 };
 
-typedef std::unordered_map< table::CellAddress, std::vector<double>, ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
+typedef boost::unordered_map< table::CellAddress, std::vector<double>, ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
 
 // -----------------------------------------------------------------------
 
@@ -176,7 +176,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL SolverComponent::getPropertySet
 
 OUString SAL_CALL SolverComponent::getComponentDescription() throw (uno::RuntimeException)
 {
-    return lcl_GetResourceString( RID_SOLVER_COMPONENT );
+    return lcl_GetResourceString( RID_COINMP_SOLVER_COMPONENT );
 }
 
 OUString SAL_CALL SolverComponent::getStatusDescription() throw (uno::RuntimeException)
@@ -590,7 +590,7 @@ uno::Sequence< OUString > SolverComponent_getSupportedServiceNames()
 
 OUString SolverComponent_getImplementationName()
 {
-    return OUString::createFromAscii( "com.sun.star.comp.Calc.Solver" );
+    return OUString::createFromAscii( "com.sun.star.comp.Calc.CoinMPSolver" );
 }
 
 OUString SAL_CALL SolverComponent::getImplementationName() throw(uno::RuntimeException)
@@ -621,7 +621,7 @@ uno::Reference<uno::XInterface> SolverComponent_createInstance( const uno::Refer
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void* SAL_CALL solver_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL coinmp_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
     {
         OUString    aImplName( OUString::createFromAscii( pImplName ) );
         void*       pRet = 0;
diff --git a/sccomp/source/solver/solver.hrc b/sccomp/source/solver/solver.hrc
index bf017af..8887398 100644
--- a/sccomp/source/solver/solver.hrc
+++ b/sccomp/source/solver/solver.hrc
@@ -32,6 +32,7 @@
 #define RID_ERROR_INFEASIBLE        (SOLVER_RESOURCE_START + 8)
 #define RID_ERROR_UNBOUNDED         (SOLVER_RESOURCE_START + 9)
 #define RID_ERROR_TIMEOUT           (SOLVER_RESOURCE_START + 10)
+#define RID_COINMP_SOLVER_COMPONENT (SOLVER_RESOURCE_START + 11)
 
 #endif
 
diff --git a/sccomp/source/solver/solver.src b/sccomp/source/solver/solver.src
index 52a9b9e..0504400 100644
--- a/sccomp/source/solver/solver.src
+++ b/sccomp/source/solver/solver.src
@@ -24,6 +24,11 @@ String RID_SOLVER_COMPONENT
     Text [ en-US ] = "%PRODUCTNAME Linear Solver";
 };
 
+String RID_COINMP_SOLVER_COMPONENT
+{
+    Text [ en-US ] = "%PRODUCTNAME CoinMP Linear Solver";
+};
+
 String RID_PROPERTY_NONNEGATIVE
 {
     Text [ en-US ] = "Assume variables as non-negative";
diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk
index dba5960..8b55bf4 100644
--- a/scp2/InstallModule_calc.mk
+++ b/scp2/InstallModule_calc.mk
@@ -9,10 +9,13 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/calc))
 
-$(eval $(call gb_InstallModule_define_if_set,scp2/calc,\
-	ENABLE_LPSOLVE \
-	SYSTEM_LPSOLVE \
+ifneq (,$(ENABLE_COINMP)$(ENABLE_LPSOLVE))
+$(eval $(call gb_InstallModule_add_defs,scp2/calc,\
+	-DWITH_LPSOLVER \
+	$(if $(filter TRUE,$(ENABLE_COINMP)),-DCOINMP_LPSOLVER) \
+	$(if $(filter TRUE-NO,$(ENABLE_LPSOLVE)-$(SYSTEM_LPSOLVE)),-DLPSOLVE_LPSOLVER) \
 ))
+endif
 
 $(eval $(call gb_InstallModule_add_templates,scp2/calc,\
     scp2/source/templates/module_langpack_calc \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index b8c6130..573ee85 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_KDE \
 	ENABLE_KDE4 \
 	ENABLE_LIBLANGTAG \
-	ENABLE_LPSOLVE \
 	ENABLE_NPAPI_FROM_BROWSER \
 	ENABLE_NPAPI_INTO_BROWSER \
 	ENABLE_ONLINE_UPDATE \
@@ -58,7 +57,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_LIBLANGTAG \
 	SYSTEM_LIBXML \
 	SYSTEM_LIBXSLT \
-	SYSTEM_LPSOLVE \
 	SYSTEM_LUCENE \
 	SYSTEM_MYTHES \
 	SYSTEM_NEON \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index f0ed12a2..d582c19 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -72,6 +72,7 @@
     #define EXENAME(name)                     STRING(CONCAT2(name,.exe))
     #define PROFILENAME(name)                 STRING(CONCAT2(name,.ini))
     #define SPECIAL_NAME(name)                STRING(CONCAT2(name,.dll))
+    #define SPECIAL_NAME_VER(name,version)    SPECIAL_NAME(name)
     #define SPECIAL_COMPONENT_LIB_NAME(name)  STRING(CONCAT2(name,.dll))
 #endif
 
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 115681b..1c26765 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -18,8 +18,6 @@
 
 #include "macros.inc"
 
-STD_LIB_FILE( gid_File_Lib_Solver, solver)
-
 STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
 
 STD_LIB_FILE( gid_File_Lib_Pricing, pricing)
@@ -68,15 +66,56 @@ File gid_File_Exe_Scalc
 End
 #endif
 
-#if defined(ENABLE_LPSOLVE)
-
+#if defined(WITH_LPSOLVER)
 STD_RES_FILE( gid_File_Res_Solver, solver)
+#endif
+
+#if defined(LPSOLVE_LPSOLVER)
+STD_LIB_FILE( gid_File_Lib_Solver, solver)
 
-#if ! defined (SYSTEM_LPSOLVE)
 File gid_File_Lib_Lpsolve
     PACKED_LIB_FILE_BODY;
     Name = SPECIAL_NAME(lpsolve55);
 End
 #endif
 
+#if defined(COINMP_LPSOLVER)
+STD_LIB_FILE( gid_File_Lib_CoinMPSolver, coinmpsolver)
+
+File gid_File_Lib_CoinMP
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(CoinMP,1);
+End
+
+#if !defined WNT
+File gid_File_Lib_Cbc
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(Cbc,3);
+End
+File gid_File_Lib_CbcSolver
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(CbcSolver,3);
+End
+File gid_File_Lib_Cgl
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(Cgl,1);
+End
+File gid_File_Lib_Clp
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(Clp,1);
+End
+File gid_File_Lib_OsiClp
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(OsiClp,1);
+End
+File gid_File_Lib_CoinUtils
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(CoinUtils,3);
+End
+File gid_File_Lib_Osi
+    PACKED_LIB_FILE_BODY;
+    Name = SPECIAL_NAME_VER(Osi,1);
+End
+#endif
+
 #endif
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 46b4271..3a74d0d 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -35,6 +35,7 @@ Module gid_Module_Prg_Calc_Bin
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Share_Registry_Calc_Xcd,gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,
     gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
+    gid_File_Lib_CoinMPSolver,gid_File_Lib_Cbc,gid_File_Lib_CbcSolver,gid_File_Lib_Cgl,gid_File_Lib_Clp,gid_File_Lib_OsiClp,gid_File_Lib_CoinMP,gid_File_Lib_CoinUtils,gid_File_Lib_Osi,
     gid_File_Lib_Vbaobj,
     gid_File_Tmp_Userinstall_Calc_Inf);
 End
commit a1778595ac41255da22a4dd0b7c204d054cc5367
Author: Andre Fischer <af at apache.org>
Date:   Fri Jan 20 12:46:50 2012 +0000

    118160: Use CoinMP as replacement for lp_solve.
    
    Original author: Niklas Nebel
    
    (cherry picked from commit 6d492447a37ec268fb5924e7fc5631c29c67325d)
    
    Conflicts:
    	sccomp/source/solver/makefile.mk
    	sccomp/source/solver/solver.cxx
    
    Change-Id: I84f9acb13a65cdfc9d173434ef630cbeb635db05
    (cherry picked from commit 230309c541ff9a8683e5ef749cf2f6512ad0d9df)

diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
new file mode 100644
index 0000000..a44512a
--- /dev/null
+++ b/sccomp/source/solver/solver.cxx
@@ -0,0 +1,648 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <CoinMP.h>
+
+#include "solver.hxx"
+#include "solver.hrc"
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/text/XTextRange.hpp>
+
+#include <rtl/math.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <cppuhelper/factory.hxx>
+#include <vector>
+#include <unordered_map>
+
+#include <tools/resmgr.hxx>
+
+using namespace com::sun::star;
+
+#define C2U(constAsciiStr) (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( constAsciiStr ) ))
+
+#define STR_NONNEGATIVE   "NonNegative"
+#define STR_INTEGER       "Integer"
+#define STR_TIMEOUT       "Timeout"
+#define STR_EPSILONLEVEL  "EpsilonLevel"
+#define STR_LIMITBBDEPTH  "LimitBBDepth"
+
+// -----------------------------------------------------------------------
+//  Resources from tools are used for translated strings
+
+static ResMgr* pSolverResMgr = NULL;
+
+OUString lcl_GetResourceString( sal_uInt32 nId )
+{
+    if (!pSolverResMgr)
+        pSolverResMgr = ResMgr::CreateResMgr( "solver" );
+
+    return ResId( nId, *pSolverResMgr );
+}
+
+// -----------------------------------------------------------------------
+
+namespace
+{
+    enum
+    {
+        PROP_NONNEGATIVE,
+        PROP_INTEGER,
+        PROP_TIMEOUT,
+        PROP_EPSILONLEVEL,
+        PROP_LIMITBBDEPTH
+    };
+}
+
+// -----------------------------------------------------------------------
+
+// hash map for the coefficients of a dependent cell (objective or constraint)
+// The size of each vector is the number of columns (variable cells) plus one, first entry is initial value.
+
+struct ScSolverCellHash
+{
+    size_t operator()( const table::CellAddress& rAddress ) const
+    {
+        return ( rAddress.Sheet << 24 ) | ( rAddress.Column << 16 ) | rAddress.Row;
+    }
+};
+
+inline bool AddressEqual( const table::CellAddress& rAddr1, const table::CellAddress& rAddr2 )
+{
+    return rAddr1.Sheet == rAddr2.Sheet && rAddr1.Column == rAddr2.Column && rAddr1.Row == rAddr2.Row;
+}
+
+struct ScSolverCellEqual
+{
+    bool operator()( const table::CellAddress& rAddr1, const table::CellAddress& rAddr2 ) const
+    {
+        return AddressEqual( rAddr1, rAddr2 );
+    }
+};
+
+typedef std::unordered_map< table::CellAddress, std::vector<double>, ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
+
+// -----------------------------------------------------------------------
+
+uno::Reference<table::XCell> lcl_GetCell( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
+                                          const table::CellAddress& rPos )
+{
+    uno::Reference<container::XIndexAccess> xSheets( xDoc->getSheets(), uno::UNO_QUERY );
+    uno::Reference<sheet::XSpreadsheet> xSheet( xSheets->getByIndex( rPos.Sheet ), uno::UNO_QUERY );
+    return xSheet->getCellByPosition( rPos.Column, rPos.Row );
+}
+
+void lcl_SetValue( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
+                   const table::CellAddress& rPos, double fValue )
+{
+    lcl_GetCell( xDoc, rPos )->setValue( fValue );
+}
+
+double lcl_GetValue( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
+                     const table::CellAddress& rPos )
+{
+    return lcl_GetCell( xDoc, rPos )->getValue();
+}
+
+// -------------------------------------------------------------------------
+
+SolverComponent::SolverComponent( const uno::Reference<uno::XComponentContext>& /* rSMgr */ ) :
+    OPropertyContainer( GetBroadcastHelper() ),
+    mbMaximize( sal_True ),
+    mbNonNegative( sal_False ),
+    mbInteger( sal_False ),
+    mnTimeout( 100 ),
+    mnEpsilonLevel( 0 ),
+    mbLimitBBDepth( sal_True ),
+    mbSuccess( sal_False ),
+    mfResultValue( 0.0 )
+{
+    // for XPropertySet implementation:
+    registerProperty( C2U(STR_NONNEGATIVE),  PROP_NONNEGATIVE,  0, &mbNonNegative,  getCppuType( &mbNonNegative )  );
+    registerProperty( C2U(STR_INTEGER),      PROP_INTEGER,      0, &mbInteger,      getCppuType( &mbInteger )      );
+    registerProperty( C2U(STR_TIMEOUT),      PROP_TIMEOUT,      0, &mnTimeout,      getCppuType( &mnTimeout )      );
+    registerProperty( C2U(STR_EPSILONLEVEL), PROP_EPSILONLEVEL, 0, &mnEpsilonLevel, getCppuType( &mnEpsilonLevel ) );
+    registerProperty( C2U(STR_LIMITBBDEPTH), PROP_LIMITBBDEPTH, 0, &mbLimitBBDepth, getCppuType( &mbLimitBBDepth ) );
+}
+
+SolverComponent::~SolverComponent()
+{
+}
+
+IMPLEMENT_FORWARD_XINTERFACE2( SolverComponent, SolverComponent_Base, OPropertyContainer )
+IMPLEMENT_FORWARD_XTYPEPROVIDER2( SolverComponent, SolverComponent_Base, OPropertyContainer )
+
+cppu::IPropertyArrayHelper* SolverComponent::createArrayHelper() const
+{
+    uno::Sequence<beans::Property> aProps;
+    describeProperties( aProps );
+    return new cppu::OPropertyArrayHelper( aProps );
+}
+
+cppu::IPropertyArrayHelper& SAL_CALL SolverComponent::getInfoHelper()
+{
+    return *getArrayHelper();
+}
+
+uno::Reference<beans::XPropertySetInfo> SAL_CALL SolverComponent::getPropertySetInfo() throw(uno::RuntimeException)
+{
+    return createPropertySetInfo( getInfoHelper() );
+}
+
+// XSolverDescription
+
+OUString SAL_CALL SolverComponent::getComponentDescription() throw (uno::RuntimeException)
+{
+    return lcl_GetResourceString( RID_SOLVER_COMPONENT );
+}
+
+OUString SAL_CALL SolverComponent::getStatusDescription() throw (uno::RuntimeException)
+{
+    return maStatus;
+}
+
+OUString SAL_CALL SolverComponent::getPropertyDescription( const OUString& rPropertyName ) throw (uno::RuntimeException)
+{
+    sal_uInt32 nResId = 0;
+    sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
+    switch (nHandle)
+    {
+        case PROP_NONNEGATIVE:
+            nResId = RID_PROPERTY_NONNEGATIVE;
+            break;
+        case PROP_INTEGER:
+            nResId = RID_PROPERTY_INTEGER;
+            break;
+        case PROP_TIMEOUT:
+            nResId = RID_PROPERTY_TIMEOUT;
+            break;
+        case PROP_EPSILONLEVEL:
+            nResId = RID_PROPERTY_EPSILONLEVEL;
+            break;
+        case PROP_LIMITBBDEPTH:
+            nResId = RID_PROPERTY_LIMITBBDEPTH;
+            break;
+        default:
+            {
+                // unknown - leave empty
+            }
+    }
+    OUString aRet;
+    if ( nResId )
+        aRet = lcl_GetResourceString( nResId );
+    return aRet;
+}
+
+// XSolver: settings
+
+uno::Reference<sheet::XSpreadsheetDocument> SAL_CALL SolverComponent::getDocument() throw(uno::RuntimeException)
+{
+    return mxDoc;
+}
+
+void SAL_CALL SolverComponent::setDocument( const uno::Reference<sheet::XSpreadsheetDocument>& _document )
+                                throw(uno::RuntimeException)
+{
+    mxDoc = _document;
+}
+
+table::CellAddress SAL_CALL SolverComponent::getObjective() throw(uno::RuntimeException)
+{
+    return maObjective;
+}
+
+void SAL_CALL SolverComponent::setObjective( const table::CellAddress& _objective ) throw(uno::RuntimeException)
+{
+    maObjective = _objective;
+}
+
+uno::Sequence<table::CellAddress> SAL_CALL SolverComponent::getVariables() throw(uno::RuntimeException)
+{
+    return maVariables;
+}
+
+void SAL_CALL SolverComponent::setVariables( const uno::Sequence<table::CellAddress>& _variables )
+                                throw(uno::RuntimeException)
+{
+    maVariables = _variables;
+}
+
+uno::Sequence<sheet::SolverConstraint> SAL_CALL SolverComponent::getConstraints() throw(uno::RuntimeException)
+{
+    return maConstraints;
+}
+
+void SAL_CALL SolverComponent::setConstraints( const uno::Sequence<sheet::SolverConstraint>& _constraints )
+                                throw(uno::RuntimeException)
+{
+    maConstraints = _constraints;
+}
+
+sal_Bool SAL_CALL SolverComponent::getMaximize() throw(uno::RuntimeException)
+{
+    return mbMaximize;
+}
+
+void SAL_CALL SolverComponent::setMaximize( sal_Bool _maximize ) throw(uno::RuntimeException)
+{
+    mbMaximize = _maximize;
+}
+
+// XSolver: get results
+
+sal_Bool SAL_CALL SolverComponent::getSuccess() throw(uno::RuntimeException)
+{
+    return mbSuccess;
+}
+
+double SAL_CALL SolverComponent::getResultValue() throw(uno::RuntimeException)
+{
+    return mfResultValue;
+}
+
+uno::Sequence<double> SAL_CALL SolverComponent::getSolution() throw(uno::RuntimeException)
+{
+    return maSolution;
+}
+
+// -------------------------------------------------------------------------
+
+void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException)
+{
+    uno::Reference<frame::XModel> xModel( mxDoc, uno::UNO_QUERY );
+    if ( !xModel.is() )
+        throw uno::RuntimeException();
+
+    maStatus = OUString();
+    mbSuccess = false;
+
+    xModel->lockControllers();
+
+    // collect variables in vector (?)
+
+    std::vector<table::CellAddress> aVariableCells;
+    for (sal_Int32 nPos=0; nPos<maVariables.getLength(); nPos++)
+        aVariableCells.push_back( maVariables[nPos] );
+    size_t nVariables = aVariableCells.size();
+    size_t nVar = 0;
+
+    // collect all dependent cells
+
+    ScSolverCellHashMap aCellsHash;
+    aCellsHash[maObjective].reserve( nVariables + 1 );                  // objective function
+
+    for (sal_Int32 nConstrPos = 0; nConstrPos < maConstraints.getLength(); ++nConstrPos)
+    {
+        table::CellAddress aCellAddr = maConstraints[nConstrPos].Left;
+        aCellsHash[aCellAddr].reserve( nVariables + 1 );                // constraints: left hand side
+
+        if ( maConstraints[nConstrPos].Right >>= aCellAddr )
+            aCellsHash[aCellAddr].reserve( nVariables + 1 );            // constraints: right hand side
+    }
+
+    // set all variables to zero
+    //! store old values?
+    //! use old values as initial values?
+    std::vector<table::CellAddress>::const_iterator aVarIter;
+    for ( aVarIter = aVariableCells.begin(); aVarIter != aVariableCells.end(); ++aVarIter )
+    {
+        lcl_SetValue( mxDoc, *aVarIter, 0.0 );
+    }
+
+    // read initial values from all dependent cells
+    ScSolverCellHashMap::iterator aCellsIter;
+    for ( aCellsIter = aCellsHash.begin(); aCellsIter != aCellsHash.end(); ++aCellsIter )
+    {
+        double fValue = lcl_GetValue( mxDoc, aCellsIter->first );
+        aCellsIter->second.push_back( fValue );                         // store as first element, as-is
+    }
+
+    // loop through variables
+    for ( aVarIter = aVariableCells.begin(); aVarIter != aVariableCells.end(); ++aVarIter )
+    {
+        lcl_SetValue( mxDoc, *aVarIter, 1.0 );      // set to 1 to examine influence
+
+        // read value change from all dependent cells
+        for ( aCellsIter = aCellsHash.begin(); aCellsIter != aCellsHash.end(); ++aCellsIter )
+        {
+            double fChanged = lcl_GetValue( mxDoc, aCellsIter->first );
+            double fInitial = aCellsIter->second.front();
+            aCellsIter->second.push_back( fChanged - fInitial );
+        }
+
+        lcl_SetValue( mxDoc, *aVarIter, 2.0 );      // minimal test for linearity
+
+        for ( aCellsIter = aCellsHash.begin(); aCellsIter != aCellsHash.end(); ++aCellsIter )
+        {
+            double fInitial = aCellsIter->second.front();
+            double fCoeff   = aCellsIter->second.back();       // last appended: coefficient for this variable
+            double fTwo     = lcl_GetValue( mxDoc, aCellsIter->first );
+
+            bool bLinear = rtl::math::approxEqual( fTwo, fInitial + 2.0 * fCoeff ) ||
+                           rtl::math::approxEqual( fInitial, fTwo - 2.0 * fCoeff );
+            // second comparison is needed in case fTwo is zero
+            if ( !bLinear )
+                maStatus = lcl_GetResourceString( RID_ERROR_NONLINEAR );
+        }
+
+        lcl_SetValue( mxDoc, *aVarIter, 0.0 );      // set back to zero for examining next variable
+    }
+
+    xModel->unlockControllers();
+
+    if ( maStatus.getLength() )
+        return;
+
+    //
+    // build parameter arrays for CoinMP
+    //
+
+    // set objective function
+
+    const std::vector<double>& rObjCoeff = aCellsHash[maObjective];
+    double* pObjectCoeffs = new double[nVariables];
+    for (nVar=0; nVar<nVariables; nVar++)
+        pObjectCoeffs[nVar] = rObjCoeff[nVar+1];
+    double nObjectConst = rObjCoeff[0];             // constant term of objective
+
+    // add rows
+
+    size_t nRows = maConstraints.getLength();
+    size_t nCompSize = nVariables * nRows;
+    double* pCompMatrix = new double[nCompSize];    // first collect all coefficients, row-wise
+    for (size_t i=0; i<nCompSize; i++)
+        pCompMatrix[i] = 0.0;
+
+    double* pRHS = new double[nRows];
+    char* pRowType = new char[nRows];
+    for (size_t i=0; i<nRows; i++)
+    {
+        pRHS[i] = 0.0;
+        pRowType[i] = 'N';
+    }
+
+    for (sal_Int32 nConstrPos = 0; nConstrPos < maConstraints.getLength(); ++nConstrPos)
+    {
+        // integer constraints are set later
+        sheet::SolverConstraintOperator eOp = maConstraints[nConstrPos].Operator;
+        if ( eOp == sheet::SolverConstraintOperator_LESS_EQUAL ||
+             eOp == sheet::SolverConstraintOperator_GREATER_EQUAL ||
+             eOp == sheet::SolverConstraintOperator_EQUAL )
+        {
+            double fDirectValue = 0.0;
+            bool bRightCell = false;
+            table::CellAddress aRightAddr;
+            const uno::Any& rRightAny = maConstraints[nConstrPos].Right;
+            if ( rRightAny >>= aRightAddr )
+                bRightCell = true;                  // cell specified as right-hand side
+            else
+                rRightAny >>= fDirectValue;         // constant value
+
+            table::CellAddress aLeftAddr = maConstraints[nConstrPos].Left;
+
+            const std::vector<double>& rLeftCoeff = aCellsHash[aLeftAddr];
+            double* pValues = &pCompMatrix[nConstrPos * nVariables];
+            for (nVar=0; nVar<nVariables; nVar++)
+                pValues[nVar] = rLeftCoeff[nVar+1];
+
+            // if left hand cell has a constant term, put into rhs value
+            double fRightValue = -rLeftCoeff[0];
+
+            if ( bRightCell )
+            {
+                const std::vector<double>& rRightCoeff = aCellsHash[aRightAddr];
+                // modify pValues with rhs coefficients
+                for (nVar=0; nVar<nVariables; nVar++)
+                    pValues[nVar] -= rRightCoeff[nVar+1];
+
+                fRightValue += rRightCoeff[0];      // constant term
+            }
+            else
+                fRightValue += fDirectValue;
+
+            switch ( eOp )
+            {
+                case sheet::SolverConstraintOperator_LESS_EQUAL:    pRowType[nConstrPos] = 'L'; break;
+                case sheet::SolverConstraintOperator_GREATER_EQUAL: pRowType[nConstrPos] = 'G'; break;
+                case sheet::SolverConstraintOperator_EQUAL:         pRowType[nConstrPos] = 'E'; break;
+                default:
+                    OSL_ENSURE( false, "unexpected enum type" );
+            }
+            pRHS[nConstrPos] = fRightValue;
+        }
+    }
+
+    // Find non-zero coefficients, column-wise
+
+    int* pMatrixBegin = new int[nVariables+1];
+    int* pMatrixCount = new int[nVariables];
+    double* pMatrix = new double[nCompSize];    // not always completely used
+    int* pMatrixIndex = new int[nCompSize];
+    int nMatrixPos = 0;
+    for (nVar=0; nVar<nVariables; nVar++)
+    {
+        int nBegin = nMatrixPos;
+        for (size_t nRow=0; nRow<nRows; nRow++)
+        {
+            double fCoeff = pCompMatrix[ nRow * nVariables + nVar ];    // row-wise
+            if ( fCoeff != 0.0 )
+            {
+                pMatrix[nMatrixPos] = fCoeff;
+                pMatrixIndex[nMatrixPos] = nRow;
+                ++nMatrixPos;
+            }
+        }
+        pMatrixBegin[nVar] = nBegin;
+        pMatrixCount[nVar] = nMatrixPos - nBegin;
+    }
+    pMatrixBegin[nVariables] = nMatrixPos;
+    delete[] pCompMatrix;
+    pCompMatrix = NULL;
+
+    // apply settings to all variables
+
+    double* pLowerBounds = new double[nVariables];
+    double* pUpperBounds = new double[nVariables];
+    for (nVar=0; nVar<nVariables; nVar++)
+    {
+        pLowerBounds[nVar] = mbNonNegative ? 0.0 : -DBL_MAX;
+        pUpperBounds[nVar] = DBL_MAX;
+
+        // bounds could possibly be further restricted from single-cell constraints
+    }
+
+    char* pColType = new char[nVariables];
+    for (nVar=0; nVar<nVariables; nVar++)
+        pColType[nVar] = mbInteger ? 'I' : 'C';
+
+    // apply single-var integer constraints
+
+    for (sal_Int32 nConstrPos = 0; nConstrPos < maConstraints.getLength(); ++nConstrPos)
+    {
+        sheet::SolverConstraintOperator eOp = maConstraints[nConstrPos].Operator;
+        if ( eOp == sheet::SolverConstraintOperator_INTEGER ||
+             eOp == sheet::SolverConstraintOperator_BINARY )
+        {
+            table::CellAddress aLeftAddr = maConstraints[nConstrPos].Left;
+            // find variable index for cell
+            for (nVar=0; nVar<nVariables; nVar++)
+                if ( AddressEqual( aVariableCells[nVar], aLeftAddr ) )
+                {
+                    if ( eOp == sheet::SolverConstraintOperator_INTEGER )
+                        pColType[nVar] = 'I';
+                    else
+                    {
+                        pColType[nVar] = 'B';
+                        pLowerBounds[nVar] = 0.0;
+                        pUpperBounds[nVar] = 1.0;
+                    }
+                }
+        }
+    }
+
+    int nObjectSense = mbMaximize ? SOLV_OBJSENS_MAX : SOLV_OBJSENS_MIN;
+
+    HPROB hProb = CoinCreateProblem("");
+    int nResult = CoinLoadProblem( hProb, nVariables, nRows, nMatrixPos, 0,
+                    nObjectSense, nObjectConst, pObjectCoeffs,
+                    pLowerBounds, pUpperBounds, pRowType, pRHS, NULL,
+                    pMatrixBegin, pMatrixCount, pMatrixIndex, pMatrix,
+                    NULL, NULL, NULL );
+    nResult = CoinLoadInteger( hProb, pColType );
+
+    delete[] pColType;
+    delete[] pMatrixIndex;
+    delete[] pMatrix;
+    delete[] pMatrixCount;
+    delete[] pMatrixBegin;
+    delete[] pUpperBounds;
+    delete[] pLowerBounds;
+    delete[] pRowType;
+    delete[] pRHS;
+    delete[] pObjectCoeffs;
+
+    CoinSetRealOption( hProb, COIN_REAL_MAXSECONDS, mnTimeout );
+    CoinSetRealOption( hProb, COIN_REAL_MIPMAXSEC, mnTimeout );
+
+    // TODO: handle (or remove) settings: epsilon, B&B depth
+
+    // solve model
+
+    nResult = CoinCheckProblem( hProb );
+    nResult = CoinOptimizeProblem( hProb, 0 );
+
+    mbSuccess = ( nResult == SOLV_CALL_SUCCESS );
+    if ( mbSuccess )
+    {
+        // get solution
+
+        maSolution.realloc( nVariables );
+        CoinGetSolutionValues( hProb, maSolution.getArray(), NULL, NULL, NULL );
+        mfResultValue = CoinGetObjectValue( hProb );
+    }
+    else
+    {
+        int nSolutionStatus = CoinGetSolutionStatus( hProb );
+        if ( nSolutionStatus == 1 )
+            maStatus = lcl_GetResourceString( RID_ERROR_INFEASIBLE );
+        else if ( nSolutionStatus == 2 )
+            maStatus = lcl_GetResourceString( RID_ERROR_UNBOUNDED );
+        // TODO: detect timeout condition and report as RID_ERROR_TIMEOUT
+        // (currently reported as infeasible)
+    }
+
+    CoinUnloadProblem( hProb );
+}
+
+// -------------------------------------------------------------------------
+
+// XServiceInfo
+
+uno::Sequence< OUString > SolverComponent_getSupportedServiceNames()
+{
+    uno::Sequence< OUString > aServiceNames( 1 );
+    aServiceNames[ 0 ] = OUString::createFromAscii( "com.sun.star.sheet.Solver" );
+    return aServiceNames;
+}
+
+OUString SolverComponent_getImplementationName()
+{
+    return OUString::createFromAscii( "com.sun.star.comp.Calc.Solver" );
+}
+
+OUString SAL_CALL SolverComponent::getImplementationName() throw(uno::RuntimeException)
+{
+    return SolverComponent_getImplementationName();
+}
+
+sal_Bool SAL_CALL SolverComponent::supportsService( const OUString& rServiceName ) throw(uno::RuntimeException)
+{
+    const uno::Sequence< OUString > aServices = SolverComponent_getSupportedServiceNames();
+    const OUString* pArray = aServices.getConstArray();
+    const OUString* pArrayEnd = pArray + aServices.getLength();
+    return ::std::find( pArray, pArrayEnd, rServiceName ) != pArrayEnd;
+}
+
+uno::Sequence<OUString> SAL_CALL SolverComponent::getSupportedServiceNames() throw(uno::RuntimeException)
+{
+    return SolverComponent_getSupportedServiceNames();
+}
+
+uno::Reference<uno::XInterface> SolverComponent_createInstance( const uno::Reference<uno::XComponentContext>& rSMgr )
+    throw(uno::Exception)
+{
+    return (cppu::OWeakObject*) new SolverComponent( rSMgr );
+}
+
+// -------------------------------------------------------------------------
+
+extern "C"
+{
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL solver_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+    {
+        OUString    aImplName( OUString::createFromAscii( pImplName ) );
+        void*       pRet = 0;
+
+        if( pServiceManager )
+        {
+            uno::Reference< lang::XSingleComponentFactory > xFactory;
+            if( aImplName.equals( SolverComponent_getImplementationName() ) )
+                xFactory = cppu::createSingleComponentFactory(
+                        SolverComponent_createInstance,
+                        OUString::createFromAscii( pImplName ),
+                        SolverComponent_getSupportedServiceNames() );
+
+            if( xFactory.is() )
+            {
+                xFactory->acquire();
+                pRet = xFactory.get();
+            }
+        }
+        return pRet;
+    }
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit b7270f603e9c91f9575810aaa4dd062aca7fdf86
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu Feb 27 14:51:33 2014 +0100

    Rename sccomp/source/solver/solver.cxx to solver-lpsolve.cxx
    
    Change-Id: I5034cdcbf08d68b2ed0fc9d16ee2635ba30a731b
    (cherry picked from commit 9047edf9a65856b663e7a6ce3fcf305aa5951a14)

diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index 7be3364..e1b2ca3 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_use_externals,solver,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,solver,\
-	sccomp/source/solver/solver \
+	sccomp/source/solver/solver-lpsolve \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver-lpsolve.cxx
similarity index 100%
rename from sccomp/source/solver/solver.cxx
rename to sccomp/source/solver/solver-lpsolve.cxx
commit 738965818bc8dba6ecb3bfe542a941fc9e19c844
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu Feb 27 15:55:40 2014 +0100

    Add CoinMP external as an alternative to lpsolve.
    
    (cherry picked from commit dbe6e76332c4eda87aa2d2168dd14c274a4930d4)
    
    Conflicts:
    	Makefile.fetch
    	download.lst
    	external/Module_external.mk
    
    Change-Id: I9bf5c339a34655c3b842cef3af76814a14c483bc

diff --git a/Makefile.fetch b/Makefile.fetch
index cde2e86..9e164f2 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -75,6 +75,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
 	@date >> $(fetch_LOGFILE)
 	$(foreach item, \
 		$(call fetch_Optional,CDR,CDR_TARBALL) \
+		$(call fetch_Optional,COINMP,COINMP_TARBALL) \
 		$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
 		$(call fetch_Optional,MWAW,MWAW_TARBALL) \
 		$(call fetch_Optional,VISIO,VISIO_TARBALL) \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index b9e64f2..ac1d82f 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	cli_ure \
 	$(call gb_Helper_optional,CLUCENE,clucene) \
 	$(call gb_Helper_optional,DESKTOP,codemaker) \
+	$(call gb_Helper_optional,COINMP,coinmp) \
 	comphelper \
 	configmgr \
 	$(call gb_Helper_optional,DBCONNECTIVITY,connectivity) \
diff --git a/coinmp/ExternalPackage_coinmp.mk b/coinmp/ExternalPackage_coinmp.mk
new file mode 100644
index 0000000..6ce493b
--- /dev/null
+++ b/coinmp/ExternalPackage_coinmp.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,coinmp,coinmp))
+
+$(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,bin/CoinMP.dll,CoinMP/MSVisualStudio/v9/release/CoinMP.dll))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCgl.1.dylib,Cgl/src/.libs/libCgl.1.dylib))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libClp.1.dylib,Clp/src/.libs/libClp.1.dylib))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libOsiClp.1.dylib,Clp/src/OsiClp/.libs/libOsiClp.1.dylib))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCoinMP.1.dylib,CoinMP/src/.libs/libCoinMP.1.dylib))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCoinUtils.3.dylib,CoinUtils/src/.libs/libCoinUtils.3.dylib))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libOsi.1.dylib,Osi/src/Osi/.libs/libOsi.1.dylib))
+else
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCbc.so.3,Cbc/src/.libs/libCbc.so.3.8.8))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCbcSolver.so.3,Cbc/src/.libs/libCbcSolver.so.3.8.8))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCgl.so.1,Cgl/src/.libs/libCgl.so.1.8.5))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libClp.so.1,Clp/src/.libs/libClp.so.1.12.6))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libOsiClp.so.1,Clp/src/OsiClp/.libs/libOsiClp.so.1.12.6))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCoinMP.so.1,CoinMP/src/.libs/libCoinMP.so.1.7.6))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCoinUtils.so.3,CoinUtils/src/.libs/libCoinUtils.so.3.9.11))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libOsi.so.1,Osi/src/Osi/.libs/libOsi.so.1.11.5))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/coinmp/ExternalProject_coinmp.mk b/coinmp/ExternalProject_coinmp.mk
new file mode 100644
index 0000000..b66e877
--- /dev/null
+++ b/coinmp/ExternalProject_coinmp.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,coinmp))
+
+$(eval $(call gb_ExternalProject_register_targets,coinmp,\
+	build \
+))
+
+ifeq ($(COM),MSC)
+$(call gb_ExternalProject_get_state_target,coinmp,build) :
+	$(call gb_ExternalProject_run,build,\
+		MSBuild.exe CoinMP.sln /t:Build \
+			/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
+			/p:Platform=Win32 \
+			$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 /p:VisualStudioVersion=10.0) \
+			$(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 /p:VisualStudioVersion=11.0) \
+	,CoinMP/MSVisualStudio/v9)
+
+else
+$(call gb_ExternalProject_get_state_target,coinmp,build) :
+	+$(call gb_ExternalProject_run,build,\
+		./configure COIN_SKIP_PROJECTS="Data/Sample" \
+		&& $(MAKE) \
+	)
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/coinmp/Makefile b/coinmp/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/coinmp/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/coinmp/Module_coinmp.mk b/coinmp/Module_coinmp.mk
new file mode 100644
index 0000000..30d9d75
--- /dev/null
+++ b/coinmp/Module_coinmp.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,coinmp))
+
+$(eval $(call gb_Module_add_targets,coinmp,\
+	ExternalPackage_coinmp \
+	ExternalProject_coinmp \
+	UnpackedTarball_coinmp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/coinmp/README b/coinmp/README
new file mode 100644
index 0000000..0e155d10f
--- /dev/null
+++ b/coinmp/README
@@ -0,0 +1,5 @@
+CoinMP is a C-API library that supports most of the functionality of CLP (Coin LP),
+CBC (Coin Branch-and-Cut), and CGL (Cut Generation Library) projects.
+
+Info [https://projects.coin-or.org/CoinMP].
+From [http://www.coin-or.org/download/source/CoinMP/].
diff --git a/coinmp/UnpackedTarball_coinmp.mk b/coinmp/UnpackedTarball_coinmp.mk
new file mode 100644
index 0000000..180c4a3
--- /dev/null
+++ b/coinmp/UnpackedTarball_coinmp.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,coinmp))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,coinmp,$(COINMP_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,coinmp,\
+	CoinMP/MSVisualStudio/v9/CoinMP.sln \
+))
+
+$(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
+	coinmp/windows.build.patch.1 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/coinmp/windows.build.patch.1 b/coinmp/windows.build.patch.1
new file mode 100644
index 0000000..560f9ba
--- /dev/null
+++ b/coinmp/windows.build.patch.1
@@ -0,0 +1,3225 @@
+diff -urN coinmp.org/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj
+--- coinmp.org/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj	1970-01-01 01:00:00.000000000 +0100
++++ coinmp/Cbc/MSVisualStudio/v9/libCbc/libCbc.vcxproj	2014-02-28 15:32:36.548600694 +0100
+@@ -0,0 +1,506 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++  <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug|Win32">
++      <Configuration>Debug</Configuration>
++      <Platform>Win32</Platform>
++    </ProjectConfiguration>
++    <ProjectConfiguration Include="Debug|x64">
++      <Configuration>Debug</Configuration>
++      <Platform>x64</Platform>
++    </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|Win32">
++      <Configuration>Release</Configuration>
++      <Platform>Win32</Platform>
++    </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|x64">
++      <Configuration>Release</Configuration>
++      <Platform>x64</Platform>
++    </ProjectConfiguration>
++  </ItemGroup>
++  <PropertyGroup Label="Globals">
++    <ProjectGuid>{363BA154-FEC9-4E1E-BC23-93CEC58AB785}</ProjectGuid>
++    <RootNamespace>libCbc</RootNamespace>
++  </PropertyGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
++    <ConfigurationType>StaticLibrary</ConfigurationType>
++    <PlatformToolset>v110</PlatformToolset>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
++    <ConfigurationType>StaticLibrary</ConfigurationType>
++    <PlatformToolset>v110</PlatformToolset>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
++    <ConfigurationType>StaticLibrary</ConfigurationType>
++    <PlatformToolset>v110</PlatformToolset>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
++    <ConfigurationType>StaticLibrary</ConfigurationType>
++    <PlatformToolset>v110</PlatformToolset>
++    <UseOfMfc>false</UseOfMfc>
++    <CharacterSet>MultiByte</CharacterSet>
++  </PropertyGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
++  <ImportGroup Label="ExtensionSettings">
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
++  </ImportGroup>
++  <PropertyGroup Label="UserMacros" />
++  <PropertyGroup>
++    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
++    <IntDir>$(Configuration)\</IntDir>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
++    <IntDir>$(Configuration)\</IntDir>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
++    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
++    <IntDir>$(Platform)\$(Configuration)\</IntDir>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
++    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
++    <IntDir>$(Platform)\$(Configuration)\</IntDir>
++  </PropertyGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++    <ClCompile>
++      <Optimization>Disabled</Optimization>
++      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <PreprocessorDefinitions>CBC_BUILD;_DEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <MinimalRebuild>true</MinimalRebuild>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      <PrecompiledHeader />
++      <WarningLevel>Level3</WarningLevel>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
++      <CompileAs>Default</CompileAs>
++      <ShowIncludes>false</ShowIncludes>
++    </ClCompile>
++    <ResourceCompile>
++      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <Culture>0x0409</Culture>
++    </ResourceCompile>
++    <Lib>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++    </Lib>
++  </ItemDefinitionGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++    <ClCompile>
++      <Optimization>MaxSpeed</Optimization>
++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <PreprocessorDefinitions>CBC_BUILD;NDEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <StringPooling>true</StringPooling>
++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      <PrecompiledHeader />
++      <WarningLevel>Level3</WarningLevel>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <CompileAs>Default</CompileAs>
++    </ClCompile>
++    <ResourceCompile>
++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <Culture>0x0409</Culture>
++    </ResourceCompile>
++    <Lib>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++    </Lib>
++  </ItemDefinitionGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
++    <Midl>
++      <TargetEnvironment>X64</TargetEnvironment>
++    </Midl>
++    <ClCompile>
++      <Optimization>Disabled</Optimization>
++      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <PreprocessorDefinitions>CBC_BUILD;_DEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <MinimalRebuild>true</MinimalRebuild>
++      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      <PrecompiledHeader />
++      <WarningLevel>Level3</WarningLevel>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++      <CompileAs>Default</CompileAs>
++      <ShowIncludes>false</ShowIncludes>
++    </ClCompile>
++    <ResourceCompile>
++      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <Culture>0x0409</Culture>
++    </ResourceCompile>
++    <Lib>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++    </Lib>
++  </ItemDefinitionGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
++    <Midl>
++      <TargetEnvironment>X64</TargetEnvironment>
++    </Midl>
++    <ClCompile>
++      <Optimization>MaxSpeed</Optimization>
++      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
++      <AdditionalIncludeDirectories>..\..\..\..\Cbc\src\;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <PreprocessorDefinitions>CBC_BUILD;NDEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <StringPooling>true</StringPooling>
++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
++      <FunctionLevelLinking>true</FunctionLevelLinking>
++      <RuntimeTypeInfo>true</RuntimeTypeInfo>
++      <PrecompiledHeader />
++      <WarningLevel>Level3</WarningLevel>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++      <CompileAs>Default</CompileAs>
++    </ClCompile>
++    <ResourceCompile>
++      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <Culture>0x0409</Culture>
++    </ResourceCompile>
++    <Lib>
++      <SuppressStartupBanner>true</SuppressStartupBanner>
++    </Lib>
++  </ItemDefinitionGroup>
++  <ItemGroup>
++    <ClCompile Include="..\..\..\src\CbcBranchAllDifferent.cpp" />
++    <ClCompile Include="..\..\..\src\CbcBranchCut.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcBranchDecision.cpp" />
++    <ClCompile Include="..\..\..\src\CbcBranchDefaultDecision.cpp" />
++    <ClCompile Include="..\..\..\src\CbcBranchDynamic.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcBranchingObject.cpp" />
++    <ClCompile Include="..\..\..\src\CbcBranchLotsize.cpp" />
++    <ClCompile Include="..\..\..\src\CbcBranchToFixLots.cpp" />
++    <ClCompile Include="..\..\..\src\CbcClique.cpp" />
++    <ClCompile Include="..\..\..\src\CbcCompareDefault.cpp" />
++    <ClCompile Include="..\..\..\src\CbcCompareDepth.cpp" />
++    <ClCompile Include="..\..\..\src\CbcCompareEstimate.cpp" />
++    <ClCompile Include="..\..\..\src\CbcCompareObjective.cpp" />
++    <ClCompile Include="..\..\..\src\CbcConsequence.cpp" />
++    <ClCompile Include="..\..\..\src\CbcCountRowCut.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcCutGenerator.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcCutModifier.cpp" />
++    <ClCompile Include="..\..\..\src\CbcCutSubsetModifier.cpp" />
++    <ClCompile Include="..\..\..\src\CbcDummyBranchingObject.cpp" />
++    <ClCompile Include="..\..\..\src\CbcEventHandler.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcFathom.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcFathomDynamicProgramming.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcFixVariable.cpp" />
++    <ClCompile Include="..\..\..\src\CbcFollowOn.cpp" />
++    <ClCompile Include="..\..\..\src\CbcFullNodeInfo.cpp" />
++    <ClCompile Include="..\..\..\src\CbcGeneral.cpp" />
++    <ClCompile Include="..\..\..\src\CbcGeneralDepth.cpp" />
++    <ClCompile Include="..\..\..\src\CbcHeuristic.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcHeuristicDINS.cpp" />
++    <ClCompile Include="..\..\..\src\CbcHeuristicDive.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcHeuristicDiveCoefficient.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcHeuristicDiveFractional.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcHeuristicDiveGuided.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcHeuristicDiveLineSearch.cpp" />
++    <ClCompile Include="..\..\..\src\CbcHeuristicDivePseudoCost.cpp" />
++    <ClCompile Include="..\..\..\src\CbcHeuristicDiveVectorLength.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcHeuristicFPump.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcHeuristicGreedy.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcHeuristicLocal.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcHeuristicPivotAndFix.cpp" />
++    <ClCompile Include="..\..\..\src\CbcHeuristicRandRound.cpp" />
++    <ClCompile Include="..\..\..\src\CbcHeuristicRENS.cpp" />
++    <ClCompile Include="..\..\..\src\CbcHeuristicRINS.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcHeuristicVND.cpp" />
++    <ClCompile Include="..\..\..\src\CbcMessage.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcModel.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcNode.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcNodeInfo.cpp" />
++    <ClCompile Include="..\..\..\src\CbcNWay.cpp" />
++    <ClCompile Include="..\..\..\src\CbcObject.cpp" />
++    <ClCompile Include="..\..\..\src\CbcObjectUpdateData.cpp" />
++    <ClCompile Include="..\..\..\src\CbcParam.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcPartialNodeInfo.cpp" />
++    <ClCompile Include="..\..\..\src\CbcSimpleInteger.cpp" />
++    <ClCompile Include="..\..\..\src\CbcSimpleIntegerDynamicPseudoCost.cpp" />
++    <ClCompile Include="..\..\..\src\CbcSimpleIntegerPseudoCost.cpp" />
++    <ClCompile Include="..\..\..\src\CbcSOS.cpp" />
++    <ClCompile Include="..\..\..\src\CbcStatistics.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcStrategy.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcSubProblem.cpp" />
++    <ClCompile Include="..\..\..\src\CbcThread.cpp" />
++    <ClCompile Include="..\..\..\src\CbcTree.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++    <ClCompile Include="..\..\..\src\CbcTreeLocal.cpp">
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
++      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
++      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
++    </ClCompile>
++  </ItemGroup>
++  <ItemGroup>
++    <ClInclude Include="..\..\..\src\CbcBranchActual.hpp" />
++    <ClInclude Include="..\..\..\src\CbcBranchAllDifferent.hpp" />
++    <ClInclude Include="..\..\..\src\CbcBranchBase.hpp" />
++    <ClInclude Include="..\..\..\src\CbcBranchCut.hpp" />
++    <ClInclude Include="..\..\..\src\CbcBranchDecision.hpp" />
++    <ClInclude Include="..\..\..\src\CbcBranchDefaultDecision.hpp" />
++    <ClInclude Include="..\..\..\src\CbcBranchDynamic.hpp" />
++    <ClInclude Include="..\..\..\src\CbcBranchingObject.hpp" />
++    <ClInclude Include="..\..\..\src\CbcBranchLotsize.hpp" />
++    <ClInclude Include="..\..\..\src\CbcBranchToFixLots.hpp" />
++    <ClInclude Include="..\..\..\src\CbcChooseVariable.hpp" />
++    <ClInclude Include="..\..\..\src\CbcClique.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCompare.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCompareActual.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCompareBase.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCompareDefault.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCompareDepth.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCompareEstimate.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCompareObjective.hpp" />
++    <ClInclude Include="..\..\..\src\CbcConfig.h" />
++    <ClInclude Include="..\..\..\src\CbcConsequence.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCountRowCut.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCutGenerator.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCutModifier.hpp" />
++    <ClInclude Include="..\..\..\src\CbcCutSubsetModifier.hpp" />
++    <ClInclude Include="..\..\..\src\CbcDummyBranchingObject.hpp" />
++    <ClInclude Include="..\..\..\src\CbcEventHandler.hpp" />
++    <ClInclude Include="..\..\..\src\CbcFathom.hpp" />
++    <ClInclude Include="..\..\..\src\CbcFathomDynamicProgramming.hpp" />
++    <ClInclude Include="..\..\..\src\CbcFeasibilityBase.hpp" />
++    <ClInclude Include="..\..\..\src\CbcFixVariable.hpp" />
++    <ClInclude Include="..\..\..\src\CbcFollowOn.hpp" />
++    <ClInclude Include="..\..\..\src\CbcFullNodeInfo.hpp" />
++    <ClInclude Include="..\..\..\src\CbcGeneral.hpp" />
++    <ClInclude Include="..\..\..\src\CbcGeneralDepth.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristic.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicDINS.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicDive.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicDiveCoefficient.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicDiveFractional.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicDiveGuided.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicDiveLineSearch.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicDivePseudoCost.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicDiveVectorLength.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicFPump.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicGreedy.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicLocal.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicPivotAndFix.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicRandRound.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicRENS.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicRINS.hpp" />
++    <ClInclude Include="..\..\..\src\CbcHeuristicVND.hpp" />
++    <ClInclude Include="..\..\..\src\CbcMessage.hpp" />
++    <ClInclude Include="..\..\..\src\CbcModel.hpp" />
++    <ClInclude Include="..\..\..\src\CbcNode.hpp" />
++    <ClInclude Include="..\..\..\src\CbcNodeInfo.hpp" />
++    <ClInclude Include="..\..\..\src\CbcNWay.hpp" />
++    <ClInclude Include="..\..\..\src\CbcObject.hpp" />
++    <ClInclude Include="..\..\..\src\CbcObjectUpdateData.hpp" />
++    <ClInclude Include="..\..\..\..\Clp\src\CbcOrClpParam.hpp" />
++    <ClInclude Include="..\..\..\src\CbcParam.hpp" />
++    <ClInclude Include="..\..\..\src\CbcPartialNodeInfo.hpp" />
++    <ClInclude Include="..\..\..\src\CbcSimpleInteger.hpp" />
++    <ClInclude Include="..\..\..\src\CbcSimpleIntegerDynamicPseudoCost.hpp" />
++    <ClInclude Include="..\..\..\src\CbcSimpleIntegerPseudoCost.hpp" />
++    <ClInclude Include="..\..\..\src\CbcSOS.hpp" />
++    <ClInclude Include="..\..\..\src\CbcStatistics.hpp" />
++    <ClInclude Include="..\..\..\src\CbcStrategy.hpp" />
++    <ClInclude Include="..\..\..\src\CbcSubProblem.hpp" />
++    <ClInclude Include="..\..\..\src\CbcThread.hpp" />
++    <ClInclude Include="..\..\..\src\CbcTree.hpp" />
++    <ClInclude Include="..\..\..\src\CbcTreeLocal.hpp" />
++  </ItemGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
++  <ImportGroup Label="ExtensionTargets">
++  </ImportGroup>
++</Project>
+\ No newline at end of file
+diff -urN coinmp.org/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj
+--- coinmp.org/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj	1970-01-01 01:00:00.000000000 +0100
++++ coinmp/Cbc/MSVisualStudio/v9/libCbcSolver/libCbcSolver.vcxproj	2014-02-28 15:32:36.548600694 +0100
+@@ -0,0 +1,172 @@
++<?xml version="1.0" encoding="utf-8"?>
++<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++  <ItemGroup Label="ProjectConfigurations">
++    <ProjectConfiguration Include="Debug|Win32">
++      <Configuration>Debug</Configuration>
++      <Platform>Win32</Platform>
++    </ProjectConfiguration>
++    <ProjectConfiguration Include="Debug|x64">
++      <Configuration>Debug</Configuration>
++      <Platform>x64</Platform>
++    </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|Win32">
++      <Configuration>Release</Configuration>
++      <Platform>Win32</Platform>
++    </ProjectConfiguration>
++    <ProjectConfiguration Include="Release|x64">
++      <Configuration>Release</Configuration>
++      <Platform>x64</Platform>
++    </ProjectConfiguration>
++  </ItemGroup>
++  <PropertyGroup Label="Globals">
++    <ProjectGuid>{71DA4595-E8A7-4B21-A00A-D96D29D11E3E}</ProjectGuid>
++    <RootNamespace>libCbcSolver</RootNamespace>
++    <Keyword>ManagedCProj</Keyword>
++  </PropertyGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
++    <ConfigurationType>StaticLibrary</ConfigurationType>
++    <PlatformToolset>v110</PlatformToolset>
++    <CharacterSet>Unicode</CharacterSet>
++    <CLRSupport>false</CLRSupport>
++    <WholeProgramOptimization>false</WholeProgramOptimization>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
++    <ConfigurationType>StaticLibrary</ConfigurationType>
++    <PlatformToolset>v110</PlatformToolset>
++    <CharacterSet>Unicode</CharacterSet>
++    <CLRSupport>false</CLRSupport>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
++    <ConfigurationType>StaticLibrary</ConfigurationType>
++    <PlatformToolset>v110</PlatformToolset>
++    <CharacterSet>Unicode</CharacterSet>
++    <CLRSupport>false</CLRSupport>
++    <WholeProgramOptimization>false</WholeProgramOptimization>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
++    <ConfigurationType>StaticLibrary</ConfigurationType>
++    <PlatformToolset>v110</PlatformToolset>
++    <CharacterSet>Unicode</CharacterSet>
++    <CLRSupport>false</CLRSupport>
++  </PropertyGroup>
++  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
++  <ImportGroup Label="ExtensionSettings">
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++  </ImportGroup>
++  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
++    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
++  </ImportGroup>
++  <PropertyGroup Label="UserMacros" />
++  <PropertyGroup>
++    <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
++    <IntDir>$(Configuration)\</IntDir>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
++    <IntDir>$(Configuration)\</IntDir>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
++    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
++    <IntDir>$(Platform)\$(Configuration)\</IntDir>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
++    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
++    <IntDir>$(Platform)\$(Configuration)\</IntDir>
++  </PropertyGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
++    <ClCompile>
++      <Optimization>Disabled</Optimization>
++      <AdditionalIncludeDirectories>..\..\..\src;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglDuplicateRow;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglGMI;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglLandP;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglRedSplit2;..\..\..\..\Cgl\src\CglResidualCapacity;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglZeroHalf;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <PreprocessorDefinitions>CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
++      <PrecompiledHeader />
++      <WarningLevel>Level3</WarningLevel>
++      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
++    </ClCompile>
++  </ItemDefinitionGroup>
++  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
++    <ClCompile>

... etc. - the rest is truncated