From ed5640d8b587fbcfed7dd7967f3de04b37a76f26 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 11:06:44 +0200 Subject: Adding upstream version 4:7.4.7. Signed-off-by: Daniel Baumann --- external/coinmp/ExternalPackage_coinmp.mk | 41 + external/coinmp/ExternalProject_coinmp.mk | 59 + external/coinmp/Makefile | 7 + external/coinmp/Module_coinmp.mk | 18 + external/coinmp/README | 5 + external/coinmp/UnpackedTarball_coinmp.mk | 52 + external/coinmp/Wnon-c-typedef-for-linkage.patch | 14 + external/coinmp/coinmp-msvc-disable-sse2.patch.1 | 10 + external/coinmp/configure-exit.patch | 33 + external/coinmp/libtool.patch | 162 ++ external/coinmp/no-binaries.patch.1 | 25 + external/coinmp/osi_cuts_iterator.patch.0 | 12 + external/coinmp/pedantic-errors.patch | 11 + external/coinmp/register.patch | 369 +++ external/coinmp/rpath.patch | 60 + external/coinmp/ubsan.patch.0 | 11 + external/coinmp/werror-format-pedantic.patch.0 | 10 + external/coinmp/werror-format-security.patch.0 | 12 + external/coinmp/werror-undef.patch.0 | 11 + external/coinmp/windows.build.patch.1 | 3241 ++++++++++++++++++++++ 20 files changed, 4163 insertions(+) create mode 100644 external/coinmp/ExternalPackage_coinmp.mk create mode 100644 external/coinmp/ExternalProject_coinmp.mk create mode 100644 external/coinmp/Makefile create mode 100644 external/coinmp/Module_coinmp.mk create mode 100644 external/coinmp/README create mode 100644 external/coinmp/UnpackedTarball_coinmp.mk create mode 100644 external/coinmp/Wnon-c-typedef-for-linkage.patch create mode 100644 external/coinmp/coinmp-msvc-disable-sse2.patch.1 create mode 100644 external/coinmp/configure-exit.patch create mode 100644 external/coinmp/libtool.patch create mode 100644 external/coinmp/no-binaries.patch.1 create mode 100644 external/coinmp/osi_cuts_iterator.patch.0 create mode 100644 external/coinmp/pedantic-errors.patch create mode 100644 external/coinmp/register.patch create mode 100644 external/coinmp/rpath.patch create mode 100644 external/coinmp/ubsan.patch.0 create mode 100644 external/coinmp/werror-format-pedantic.patch.0 create mode 100644 external/coinmp/werror-format-security.patch.0 create mode 100644 external/coinmp/werror-undef.patch.0 create mode 100644 external/coinmp/windows.build.patch.1 (limited to 'external/coinmp') diff --git a/external/coinmp/ExternalPackage_coinmp.mk b/external/coinmp/ExternalPackage_coinmp.mk new file mode 100644 index 000000000..23fbb10b8 --- /dev/null +++ b/external/coinmp/ExternalPackage_coinmp.mk @@ -0,0 +1,41 @@ +# -*- 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) +ifeq ($(CPUNAME),X86_64) +coinmp_arch_subdir=x64/ +endif +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(coinmp_arch_subdir)$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll)) +else ifneq ($(DISABLE_DYNLOADING),) +# Just use the static archives from workdir. See bin/lo-all-static-libs +else ifeq ($(OS),MACOSX) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.8.8.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.8.8.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCgl.1.dylib,Cgl/src/.libs/libCgl.1.8.5.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libClp.1.dylib,Clp/src/.libs/libClp.1.12.6.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsiClp.1.dylib,Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinMP.1.dylib,CoinMP/src/.libs/libCoinMP.1.7.6.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinUtils.3.dylib,CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsi.1.dylib,Osi/src/Osi/.libs/libOsi.1.11.5.dylib)) +else +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.so.3,Cbc/src/.libs/libCbc.so.3.8.8)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.so.3,Cbc/src/.libs/libCbcSolver.so.3.8.8)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCgl.so.1,Cgl/src/.libs/libCgl.so.1.8.5)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libClp.so.1,Clp/src/.libs/libClp.so.1.12.6)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsiClp.so.1,Clp/src/OsiClp/.libs/libOsiClp.so.1.12.6)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinMP.so.1,CoinMP/src/.libs/libCoinMP.so.1.7.6)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCoinUtils.so.3,CoinUtils/src/.libs/libCoinUtils.so.3.9.11)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libOsi.so.1,Osi/src/Osi/.libs/libOsi.so.1.11.5)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk new file mode 100644 index 000000000..0a9c44c5e --- /dev/null +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -0,0 +1,59 @@ +# -*- 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_Trace_StartRange,coinmp,EXTERNAL) + $(call gb_ExternalProject_run,build,\ + MSBuild.exe CoinMP.sln /t:Build \ + /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ + /p:PlatformToolset=$(VCTOOLSET) /p:VisualStudioVersion=$(VCVER) /ToolsVersion:Current \ + $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ + ,CoinMP/MSVisualStudio/v9) + $(call gb_Trace_EndRange,coinmp,EXTERNAL) + +else +$(call gb_ExternalProject_get_state_target,coinmp,build) : + $(call gb_Trace_StartRange,coinmp,EXTERNAL) + +$(call gb_ExternalProject_run,build,\ + $(gb_RUN_CONFIGURE) ./configure COIN_SKIP_PROJECTS="Data/Sample" \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + $(gb_CONFIGURE_PLATFORMS) \ + $(if $(DISABLE_DYNLOADING),--disable-shared) \ + --disable-bzlib \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + --without-glpk \ + --enable-dependency-linking F77=unavailable \ + $(if $(filter LINUX,$(OS)), \ + 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ + -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \ + && $(MAKE) \ + $(if $(filter MACOSX,$(OS)),&& $(PERL) \ + $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ + $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbc.3.8.8.dylib \ + $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbcSolver.3.8.8.dylib \ + $(EXTERNAL_WORKDIR)/Cgl/src/.libs/libCgl.1.8.5.dylib \ + $(EXTERNAL_WORKDIR)/Clp/src/.libs/libClp.1.12.6.dylib \ + $(EXTERNAL_WORKDIR)/Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib \ + $(EXTERNAL_WORKDIR)/CoinMP/src/.libs/libCoinMP.1.7.6.dylib \ + $(EXTERNAL_WORKDIR)/CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib \ + $(EXTERNAL_WORKDIR)/Osi/src/Osi/.libs/libOsi.1.11.5.dylib) \ + ) + $(call gb_Trace_EndRange,coinmp,EXTERNAL) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/coinmp/Makefile b/external/coinmp/Makefile new file mode 100644 index 000000000..e4968cf85 --- /dev/null +++ b/external/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/external/coinmp/Module_coinmp.mk b/external/coinmp/Module_coinmp.mk new file mode 100644 index 000000000..30d9d7585 --- /dev/null +++ b/external/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/external/coinmp/README b/external/coinmp/README new file mode 100644 index 000000000..0e155d10f --- /dev/null +++ b/external/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/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk new file mode 100644 index 000000000..0764d428a --- /dev/null +++ b/external/coinmp/UnpackedTarball_coinmp.mk @@ -0,0 +1,52 @@ +# -*- 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_set_patchlevel,coinmp,0)) + +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,coinmp)) +$(eval $(call gb_UnpackedTarball_update_autoconf_configs,coinmp,\ + BuildTools \ + Cbc \ + Cgl \ + Clp \ + CoinMP \ + CoinUtils \ + Data/Sample \ + Osi \ +)) + +# * external/coinmp/Wnon-c-typedef-for-linkage.patch upstream at +# "[Coin-discuss] +# Small patch to fix Clang -Wnon-c-typedef-for-linkage in Clp": +$(eval $(call gb_UnpackedTarball_add_patches,coinmp,\ + external/coinmp/osi_cuts_iterator.patch.0 \ + external/coinmp/no-binaries.patch.1 \ + external/coinmp/werror-format-security.patch.0 \ + external/coinmp/werror-undef.patch.0 \ + external/coinmp/coinmp-msvc-disable-sse2.patch.1 \ + $(if $(filter MSC,$(COM)),external/coinmp/windows.build.patch.1) \ + external/coinmp/werror-format-pedantic.patch.0 \ + external/coinmp/ubsan.patch.0 \ + external/coinmp/rpath.patch \ + external/coinmp/libtool.patch \ + external/coinmp/Wnon-c-typedef-for-linkage.patch \ + external/coinmp/register.patch \ + external/coinmp/configure-exit.patch \ + external/coinmp/pedantic-errors.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/coinmp/Wnon-c-typedef-for-linkage.patch b/external/coinmp/Wnon-c-typedef-for-linkage.patch new file mode 100644 index 000000000..ace749d23 --- /dev/null +++ b/external/coinmp/Wnon-c-typedef-for-linkage.patch @@ -0,0 +1,14 @@ +--- Clp/src/Clp_C_Interface.h ++++ Clp/src/Clp_C_Interface.h +@@ -12,9 +12,9 @@ + #include "Coin_C_defines.h" + + #if defined (CLP_EXTERN_C) +-typedef struct { ++struct Clp_Solve { + ClpSolve options; +-} Clp_Solve; ++}; + #else + typedef void Clp_Solve; + #endif diff --git a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 new file mode 100644 index 000000000..0f518d6e3 --- /dev/null +++ b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 @@ -0,0 +1,10 @@ +--- coinmp/BuildTools/MSVisualStudio/v10/Release.props.orig 2014-10-02 14:22:21.497268171 +0200 ++++ coinmp/BuildTools/MSVisualStudio/v10/Release.props 2014-10-02 14:22:30.193267497 +0200 +@@ -6,6 +6,7 @@ + + + true ++ StreamingSIMDExtensions + + + diff --git a/external/coinmp/configure-exit.patch b/external/coinmp/configure-exit.patch new file mode 100644 index 000000000..0a81b8073 --- /dev/null +++ b/external/coinmp/configure-exit.patch @@ -0,0 +1,33 @@ +--- Cgl/configure ++++ Cgl/configure +@@ -3501,8 +3501,6 @@ + fi + for ac_declaration in \ + '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +--- Clp/configure ++++ Clp/configure +@@ -3528,8 +3528,6 @@ + fi + for ac_declaration in \ + '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +--- CoinUtils/configure ++++ CoinUtils/configure +@@ -3527,8 +3527,6 @@ + fi + for ac_declaration in \ + '' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' diff --git a/external/coinmp/libtool.patch b/external/coinmp/libtool.patch new file mode 100644 index 000000000..ca1716f5f --- /dev/null +++ b/external/coinmp/libtool.patch @@ -0,0 +1,162 @@ +--- Cbc/ltmain.sh ++++ Cbc/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +--- Cgl/ltmain.sh ++++ Cgl/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +--- Clp/ltmain.sh ++++ Clp/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +--- CoinMP/ltmain.sh ++++ CoinMP/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +--- CoinUtils/ltmain.sh ++++ CoinUtils/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue +--- Osi/ltmain.sh ++++ Osi/ltmain.sh +@@ -1254,6 +1254,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -1607,6 +1613,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/external/coinmp/no-binaries.patch.1 b/external/coinmp/no-binaries.patch.1 new file mode 100644 index 000000000..0c36950c1 --- /dev/null +++ b/external/coinmp/no-binaries.patch.1 @@ -0,0 +1,25 @@ +# -*- Mode: Diff -*- +# Patch to avoid building any programs for CoinMP +# +--- coinmp/Clp/src/Makefile.in ++++ coinmp/Clp/src/Makefile.in +@@ -95,7 +95,7 @@ + @COIN_HAS_AMD_FALSE@@COIN_HAS_CHOLMOD_FALSE@@COIN_HAS_GLPK_TRUE@am__append_4 = ClpCholeskyUfl.cpp ClpCholeskyUfl.hpp + @COIN_HAS_MUMPS_TRUE@am__append_5 = ClpCholeskyMumps.cpp ClpCholeskyMumps.hpp + @COIN_HAS_WSMP_TRUE@am__append_6 = ClpCholeskyWssmp.cpp ClpCholeskyWssmp.hpp ClpCholeskyWssmpKKT.cpp ClpCholeskyWssmpKKT.hpp +-bin_PROGRAMS = clp$(EXEEXT) ++bin_PROGRAMS = + @COIN_HAS_CHOLMOD_TRUE@am__append_7 = -I`$(CYGPATH_W) $(CHOLMODINCDIR)` + @COIN_HAS_AMD_TRUE@am__append_8 = -I`$(CYGPATH_W) $(AMDINCDIR)` + @COIN_HAS_ABC_TRUE@am__append_9 = AbcSimplex.hpp CoinAbcCommon.hpp AbcCommon.hpp +--- coinmp/Cbc/src/Makefile.in ++++ coinmp/Cbc/src/Makefile.in +@@ -44,7 +44,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) ++bin_PROGRAMS = + + ######################################################################## + # cbc program # diff --git a/external/coinmp/osi_cuts_iterator.patch.0 b/external/coinmp/osi_cuts_iterator.patch.0 new file mode 100644 index 000000000..42ed5afdc --- /dev/null +++ b/external/coinmp/osi_cuts_iterator.patch.0 @@ -0,0 +1,12 @@ +diff -ru coinmp.orig/Osi/src/Osi/OsiCuts.hpp coinmp/Osi/src/Osi/OsiCuts.hpp +--- Osi/src/Osi/OsiCuts.hpp 2011-06-13 17:08:11.000000000 +0200 ++++ Osi/src/Osi/OsiCuts.hpp 2016-03-03 22:21:04.669838200 +0100 +@@ -74,7 +74,7 @@ + class const_iterator { + friend class OsiCuts; + public: +- typedef std::bidirectional_iterator_tag iterator_category; ++ typedef std::forward_iterator_tag iterator_category; + typedef OsiCut* value_type; + typedef size_t difference_type; + typedef OsiCut ** pointer; diff --git a/external/coinmp/pedantic-errors.patch b/external/coinmp/pedantic-errors.patch new file mode 100644 index 000000000..2cf86b7e0 --- /dev/null +++ b/external/coinmp/pedantic-errors.patch @@ -0,0 +1,11 @@ +--- Clp/src/ClpSimplex.cpp ++++ Clp/src/ClpSimplex.cpp +@@ -6035,7 +6035,7 @@ + assert (!doKKT); + ClpCholeskyTaucs * cholesky = new ClpCholeskyTaucs(); + barrier.setCholesky(cholesky); +-#elifdef COIN_HAS_MUMPS ++#elif defined COIN_HAS_MUMPS + if (!doKKT) { + ClpCholeskyMumps * cholesky = new ClpCholeskyMumps(); + barrier.setCholesky(cholesky); diff --git a/external/coinmp/register.patch b/external/coinmp/register.patch new file mode 100644 index 000000000..cf4ca4d06 --- /dev/null +++ b/external/coinmp/register.patch @@ -0,0 +1,369 @@ +--- CoinUtils/src/CoinHelperFunctions.hpp ++++ CoinUtils/src/CoinHelperFunctions.hpp +@@ -41,7 +41,7 @@ + handled correctly. */ + + template inline void +-CoinCopyN(register const T* from, const int size, register T* to) ++CoinCopyN(const T* from, const int size, T* to) + { + if (size == 0 || from == to) + return; +@@ -52,10 +52,10 @@ + "CoinCopyN", ""); + #endif + +- register int n = (size + 7) / 8; ++ int n = (size + 7) / 8; + if (to > from) { +- register const T* downfrom = from + size; +- register T* downto = to + size; ++ const T* downfrom = from + size; ++ T* downto = to + size; + // Use Duff's device to copy + switch (size % 8) { + case 0: do{ *--downto = *--downfrom; +@@ -99,7 +99,7 @@ + the difference down to int. -- lh, 100823 -- + */ + template inline void +-CoinCopy(register const T* first, register const T* last, register T* to) ++CoinCopy(const T* first, const T* last, T* to) + { + CoinCopyN(first, static_cast(last-first), to); + } +@@ -114,7 +114,7 @@ + Note JJF - the speed claim seems to be false on IA32 so I have added + CoinMemcpyN which can be used for atomic data */ + template inline void +-CoinDisjointCopyN(register const T* from, const int size, register T* to) ++CoinDisjointCopyN(const T* from, const int size, T* to) + { + #ifndef _MSC_VER + if (size == 0 || from == to) +@@ -135,7 +135,7 @@ + throw CoinError("overlapping arrays", "CoinDisjointCopyN", ""); + #endif + +- for (register int n = size / 8; n > 0; --n, from += 8, to += 8) { ++ for (int n = size / 8; n > 0; --n, from += 8, to += 8) { + to[0] = from[0]; + to[1] = from[1]; + to[2] = from[2]; +@@ -167,8 +167,8 @@ + are copied at a time. The source array is given by its first and "after + last" entry; the target array is given by its first entry. */ + template inline void +-CoinDisjointCopy(register const T* first, register const T* last, +- register T* to) ++CoinDisjointCopy(const T* first, const T* last, ++ T* to) + { + CoinDisjointCopyN(first, static_cast(last - first), to); + } +@@ -256,7 +256,7 @@ + alternative coding if USE_MEMCPY defined*/ + #ifndef COIN_USE_RESTRICT + template inline void +-CoinMemcpyN(register const T* from, const int size, register T* to) ++CoinMemcpyN(const T* from, const int size, T* to) + { + #ifndef _MSC_VER + #ifdef USE_MEMCPY +@@ -296,7 +296,7 @@ + throw CoinError("overlapping arrays", "CoinMemcpyN", ""); + #endif + +- for (register int n = size / 8; n > 0; --n, from += 8, to += 8) { ++ for (int n = size / 8; n > 0; --n, from += 8, to += 8) { + to[0] = from[0]; + to[1] = from[1]; + to[2] = from[2]; +@@ -343,8 +343,8 @@ + are copied at a time. The source array is given by its first and "after + last" entry; the target array is given by its first entry. */ + template inline void +-CoinMemcpy(register const T* first, register const T* last, +- register T* to) ++CoinMemcpy(const T* first, const T* last, ++ T* to) + { + CoinMemcpyN(first, static_cast(last - first), to); + } +@@ -358,7 +358,7 @@ + Note JJF - the speed claim seems to be false on IA32 so I have added + CoinZero to allow for memset. */ + template inline void +-CoinFillN(register T* to, const int size, register const T value) ++CoinFillN(T* to, const int size, const T value) + { + if (size == 0) + return; +@@ -369,7 +369,7 @@ + "CoinFillN", ""); + #endif + #if 1 +- for (register int n = size / 8; n > 0; --n, to += 8) { ++ for (int n = size / 8; n > 0; --n, to += 8) { + to[0] = value; + to[1] = value; + to[2] = value; +@@ -413,7 +413,7 @@ + entries are filled at a time. The array is given by its first and "after + last" entry. */ + template inline void +-CoinFill(register T* first, register T* last, const T value) ++CoinFill(T* first, T* last, const T value) + { + CoinFillN(first, last - first, value); + } +@@ -427,7 +427,7 @@ + Note JJF - the speed claim seems to be false on IA32 so I have allowed + for memset as an alternative */ + template inline void +-CoinZeroN(register T* to, const int size) ++CoinZeroN(T* to, const int size) + { + #ifdef USE_MEMCPY + // Use memset - seems faster on Intel with gcc +@@ -448,7 +448,7 @@ + "CoinZeroN", ""); + #endif + #if 1 +- for (register int n = size / 8; n > 0; --n, to += 8) { ++ for (int n = size / 8; n > 0; --n, to += 8) { + to[0] = 0; + to[1] = 0; + to[2] = 0; +@@ -519,7 +519,7 @@ + entries are filled at a time. The array is given by its first and "after + last" entry. */ + template inline void +-CoinZero(register T* first, register T* last) ++CoinZero(T* first, T* last) + { + CoinZeroN(first, last - first); + } +@@ -545,7 +545,7 @@ + This function was introduced because for some reason compiler tend to + handle the max() function differently. */ + template inline T +-CoinMax(register const T x1, register const T x2) ++CoinMax(const T x1, const T x2) + { + return (x1 > x2) ? x1 : x2; + } +@@ -556,7 +556,7 @@ + This function was introduced because for some reason compiler tend to + handle the min() function differently. */ + template inline T +-CoinMin(register const T x1, register const T x2) ++CoinMin(const T x1, const T x2) + { + return (x1 < x2) ? x1 : x2; + } +@@ -578,7 +578,7 @@ + according to operator<. The array is given by a pointer to its first entry + and by its size. */ + template inline bool +-CoinIsSorted(register const T* first, const int size) ++CoinIsSorted(const T* first, const int size) + { + if (size == 0) + return true; +@@ -590,7 +590,7 @@ + #if 1 + // size1 is the number of comparisons to be made + const int size1 = size - 1; +- for (register int n = size1 / 8; n > 0; --n, first += 8) { ++ for (int n = size1 / 8; n > 0; --n, first += 8) { + if (first[8] < first[7]) return false; + if (first[7] < first[6]) return false; + if (first[6] < first[5]) return false; +@@ -627,7 +627,7 @@ + according to operator<. The array is given by its first and "after + last" entry. */ + template inline bool +-CoinIsSorted(register const T* first, register const T* last) ++CoinIsSorted(const T* first, const T* last) + { + return CoinIsSorted(first, static_cast(last - first)); + } +@@ -638,7 +638,7 @@ + etc. For speed 8 entries are filled at a time. The array is given by a + pointer to its first entry and its size. */ + template inline void +-CoinIotaN(register T* first, const int size, register T init) ++CoinIotaN(T* first, const int size, T init) + { + if (size == 0) + return; +@@ -648,7 +648,7 @@ + throw CoinError("negative number of entries", "CoinIotaN", ""); + #endif + #if 1 +- for (register int n = size / 8; n > 0; --n, first += 8, init += 8) { ++ for (int n = size / 8; n > 0; --n, first += 8, init += 8) { + first[0] = init; + first[1] = init + 1; + first[2] = init + 2; +@@ -706,7 +706,7 @@ + integer array specified by the last two arguments (again, first and "after + last" entry). */ + template inline T * +-CoinDeleteEntriesFromArray(register T * arrayFirst, register T * arrayLast, ++CoinDeleteEntriesFromArray(T * arrayFirst, T * arrayLast, + const int * firstDelPos, const int * lastDelPos) + { + int delNum = static_cast(lastDelPos - firstDelPos); +--- CoinUtils/src/CoinModelUseful2.cpp ++++ CoinUtils/src/CoinModelUseful2.cpp +@@ -917,8 +917,8 @@ + + int position=0; + int nEof=0; // Number of time send of string +- register int yystate; +- register int yyn; ++ int yystate; ++ int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; +@@ -936,12 +936,12 @@ + /* The state stack. */ + short yyssa[YYINITDEPTH]; + short *yyss = yyssa; +- register short *yyssp; ++ short *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; +- register YYSTYPE *yyvsp; ++ YYSTYPE *yyvsp; + + + +--- CoinUtils/src/CoinOslC.h ++++ CoinUtils/src/CoinOslC.h +@@ -34,30 +34,30 @@ + extern "C"{ + #endif + +-int c_ekkbtrn( register const EKKfactinfo *fact, ++int c_ekkbtrn( const EKKfactinfo *fact, + double *dwork1, + int * mpt,int first_nonzero); +-int c_ekkbtrn_ipivrw( register const EKKfactinfo *fact, ++int c_ekkbtrn_ipivrw( const EKKfactinfo *fact, + double *dwork1, + int * mpt, int ipivrw,int * spare); + +-int c_ekketsj( register /*const*/ EKKfactinfo *fact, ++int c_ekketsj( /*const*/ EKKfactinfo *fact, + double *dwork1, + int *mpt2, double dalpha, int orig_nincol, + int npivot, int *nuspikp, + const int ipivrw, int * spare); +-int c_ekkftrn( register const EKKfactinfo *fact, ++int c_ekkftrn( const EKKfactinfo *fact, + double *dwork1, + double * dpermu,int * mpt, int numberNonZero); + +-int c_ekkftrn_ft( register EKKfactinfo *fact, ++int c_ekkftrn_ft( EKKfactinfo *fact, + double *dwork1, int *mpt, int *nincolp); +-void c_ekkftrn2( register EKKfactinfo *fact, double *dwork1, ++void c_ekkftrn2( EKKfactinfo *fact, double *dwork1, + double * dpermu1,int * mpt1, int *nincolp, + double *dwork1_ft, int *mpt_ft, int *nincolp_ft); + +-int c_ekklfct( register EKKfactinfo *fact); +-int c_ekkslcf( register const EKKfactinfo *fact); ++int c_ekklfct( EKKfactinfo *fact); ++int c_ekkslcf( const EKKfactinfo *fact); + inline void c_ekkscpy(int n, const int *marr1,int *marr2) + { CoinMemcpyN(marr1,n,marr2);} + inline void c_ekkdcpy(int n, const double *marr1,double *marr2) +--- CoinUtils/src/CoinOslFactorization2.cpp ++++ CoinUtils/src/CoinOslFactorization2.cpp +@@ -20,9 +20,9 @@ + extern int ets_count; + extern int ets_check; + #endif +-#define COIN_REGISTER register ++#define COIN_REGISTER + #define COIN_REGISTER2 +-#define COIN_REGISTER3 register ++#define COIN_REGISTER3 + #ifdef COIN_USE_RESTRICT + # define COIN_RESTRICT2 __restrict + #else +--- CoinUtils/src/CoinOslFactorization3.cpp ++++ CoinUtils/src/CoinOslFactorization3.cpp +@@ -1378,7 +1378,7 @@ + } + } + } /* c_ekkmltf */ +-int c_ekklfct( register EKKfactinfo *fact) ++int c_ekklfct( EKKfactinfo *fact) + { + const int nrow = fact->nrow; + int ninbas = fact->xcsadr[nrow+1]-1; +@@ -2607,7 +2607,7 @@ + } + } + } /* c_ekkclcp */ +-int c_ekkslcf( register const EKKfactinfo *fact) ++int c_ekkslcf( const EKKfactinfo *fact) + { + int * hrow = fact->xeradr; + int * hcol = fact->xecadr; +--- CoinUtils/src/CoinPackedVectorBase.cpp ++++ CoinUtils/src/CoinPackedVectorBase.cpp +@@ -194,8 +194,8 @@ + double + CoinPackedVectorBase::oneNorm() const + { +- register double norm = 0.0; +- register const double* elements = getElements(); ++ double norm = 0.0; ++ const double* elements = getElements(); + for (int i = getNumElements() - 1; i >= 0; --i) { + norm += fabs(elements[i]); + } +@@ -224,8 +224,8 @@ + double + CoinPackedVectorBase::infNorm() const + { +- register double norm = 0.0; +- register const double* elements = getElements(); ++ double norm = 0.0; ++ const double* elements = getElements(); + for (int i = getNumElements() - 1; i >= 0; --i) { + norm = CoinMax(norm, fabs(elements[i])); + } +--- CoinUtils/src/CoinSearchTree.hpp ++++ CoinUtils/src/CoinSearchTree.hpp +@@ -153,8 +153,8 @@ + static inline const char* name() { return "CoinSearchTreeComparePreferred"; } + inline bool operator()(const CoinTreeSiblings* x, + const CoinTreeSiblings* y) const { +- register const CoinTreeNode* xNode = x->currentNode(); +- register const CoinTreeNode* yNode = y->currentNode(); ++ const CoinTreeNode* xNode = x->currentNode(); ++ const CoinTreeNode* yNode = y->currentNode(); + const BitVector128 xPref = xNode->getPreferred(); + const BitVector128 yPref = yNode->getPreferred(); + bool retval = true; +--- CoinUtils/src/CoinSimpFactorization.cpp ++++ CoinUtils/src/CoinSimpFactorization.cpp +@@ -2440,7 +2440,7 @@ + const int row=secRowOfU_[i]; + const int column=colOfU_[i]; + if ( denseVector_[column]==0.0 ) continue; +- register const double multiplier=denseVector_[column]*invOfPivots_[row]; ++ const double multiplier=denseVector_[column]*invOfPivots_[row]; + denseVector_[column]=0.0; + const int rowBeg=UrowStarts_[row]; + const int rowEnd=rowBeg+UrowLengths_[row]; diff --git a/external/coinmp/rpath.patch b/external/coinmp/rpath.patch new file mode 100644 index 000000000..50a2acde2 --- /dev/null +++ b/external/coinmp/rpath.patch @@ -0,0 +1,60 @@ +--- Cbc/configure ++++ Cbc/configure +@@ -12484,6 +12484,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support +--- Cgl/configure ++++ Cgl/configure +@@ -12455,6 +12455,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support +--- Clp/configure ++++ Clp/configure +@@ -12482,6 +12482,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support +--- CoinMP/configure ++++ CoinMP/configure +@@ -12424,6 +12424,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support +--- CoinUtils/configure ++++ CoinUtils/configure +@@ -13939,6 +13939,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support +--- Osi/configure ++++ Osi/configure +@@ -12453,6 +12453,7 @@ + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + lynxos*) + # FIXME: insert proper C++ library support diff --git a/external/coinmp/ubsan.patch.0 b/external/coinmp/ubsan.patch.0 new file mode 100644 index 000000000..157332986 --- /dev/null +++ b/external/coinmp/ubsan.patch.0 @@ -0,0 +1,11 @@ +--- Clp/src/ClpParameters.hpp ++++ Clp/src/ClpParameters.hpp +@@ -81,7 +81,7 @@ + template inline void + ClpDisjointCopyN( const T * array, const int size, T * newArray) + { +- memcpy(reinterpret_cast (newArray), array, size * sizeof(T)); ++ if (size != 0) memcpy(reinterpret_cast (newArray), array, size * sizeof(T)); + } + /// And set + template inline void diff --git a/external/coinmp/werror-format-pedantic.patch.0 b/external/coinmp/werror-format-pedantic.patch.0 new file mode 100644 index 000000000..a604c4354 --- /dev/null +++ b/external/coinmp/werror-format-pedantic.patch.0 @@ -0,0 +1,10 @@ +--- Cbc/configure ++++ Cbc/configure +@@ -3780,7 +3780,6 @@ + *-darwin*) + ;; + *) +- coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags" + ;; + esac + esac diff --git a/external/coinmp/werror-format-security.patch.0 b/external/coinmp/werror-format-security.patch.0 new file mode 100644 index 000000000..90c116b5b --- /dev/null +++ b/external/coinmp/werror-format-security.patch.0 @@ -0,0 +1,12 @@ +diff -ur coinmp.org/CoinUtils/src/CoinMessageHandler.cpp coinmp/CoinUtils/src/CoinMessageHandler.cpp +--- CoinUtils/src/CoinMessageHandler.cpp 2014-05-21 23:14:01.384874167 +0200 ++++ CoinUtils/src/CoinMessageHandler.cpp 2014-05-21 23:14:47.708874712 +0200 +@@ -820,7 +820,7 @@ + sprintf(messageOut_,g_format_,doublevalue); + if (next != format_+2) { + messageOut_+=strlen(messageOut_); +- sprintf(messageOut_,format_+2); ++ sprintf(messageOut_,"%s",format_+2); + } + } + messageOut_+=strlen(messageOut_); diff --git a/external/coinmp/werror-undef.patch.0 b/external/coinmp/werror-undef.patch.0 new file mode 100644 index 000000000..a9b80f280 --- /dev/null +++ b/external/coinmp/werror-undef.patch.0 @@ -0,0 +1,11 @@ +--- CoinUtils/src/config_coinutils_default.h 2014-06-06 14:28:06.872113540 +0100 ++++ CoinUtils/src/config_coinutils_default.h 2014-06-06 14:28:29.400294129 +0100 +@@ -26,7 +26,7 @@ + all of this inside the guard for MSC_VER >= 1200. If you're reading this + and have been developing in MSVS long enough to know, fix it. -- lh, 100915 -- + */ +-#if _MSC_VER >= 1200 ++#if defined _MSC_VER && _MSC_VER >= 1200 + # include + # define COIN_INT64_T INT64 + # define COIN_UINT64_T UINT64 diff --git a/external/coinmp/windows.build.patch.1 b/external/coinmp/windows.build.patch.1 new file mode 100644 index 000000000..2bd0526ac --- /dev/null +++ b/external/coinmp/windows.build.patch.1 @@ -0,0 +1,3241 @@ +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 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {363BA154-FEC9-4E1E-BC23-93CEC58AB785} ++ libCbc ++ ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.50727.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ ++ Disabled ++ ..\..\..\..\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) ++ CBC_BUILD;_DEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ EditAndContinue ++ Default ++ false ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\..\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) ++ CBC_BUILD;NDEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ ..\..\..\..\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) ++ CBC_BUILD;_DEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ ProgramDatabase ++ Default ++ false ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\..\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) ++ CBC_BUILD;NDEBUG;WIN32;_LIB;USE_CBCCONFIG;COIN_NO_CLP_MESSAGE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ 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 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {71DA4595-E8A7-4B21-A00A-D96D29D11E3E} ++ libCbcSolver ++ ManagedCProj ++ ++ ++ ++ StaticLibrary ++ v110 ++ Unicode ++ false ++ false ++ ++ ++ StaticLibrary ++ v110 ++ Unicode ++ false ++ ++ ++ StaticLibrary ++ v110 ++ Unicode ++ false ++ false ++ ++ ++ StaticLibrary ++ v110 ++ Unicode ++ false ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.50727.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ ++ Disabled ++ ..\..\..\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) ++ CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ ++ ++ ..\..\..\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) ++ CBC_BUILD;WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ ..\..\..\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) ++ CBC_BUILD;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDebugDLL ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\..\..\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) ++ CBC_BUILD;WIN32;NDEBUG;_NDEBUG;COIN_FAST_CODE;CLP_FAST_CODE;COIN_NO_TEST_DUPLICATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ Level3 ++ ProgramDatabase ++ ++ ++ ++ ++ true ++ true ++ ++ ++ true ++ true ++ ++ ++ true ++ true ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -urN coinmp.org/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj +--- coinmp.org/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/Cgl/MSVisualStudio/v9/libCgl/libCgl.vcxproj 2014-02-28 15:32:36.552600694 +0100 +@@ -0,0 +1,397 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {DBEA3904-F0B8-408A-9E1A-6497FEBE8C42} ++ libCgl ++ ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.50727.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\src;..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ Disabled ++ ..\..\..\src;..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ EditAndContinue ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\src;..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ ..\..\..\src;..\..\..\src\CglClique;..\..\..\src\CglDuplicateRow;..\..\..\src\CglFlowCover;..\..\..\src\CglGomory;..\..\..\src\CglKnapsackCover;..\..\..\src\CglMixedIntegerRounding;..\..\..\src\CglMixedIntegerRounding2;..\..\..\src\CglOddHole;..\..\..\src\CglPreProcess;..\..\..\src\CglProbing;..\..\..\src\CglRedSplit;..\..\..\src\CglResidualCapacity;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ ProgramDatabase ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -urN coinmp.org/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj +--- coinmp.org/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/Clp/MSVisualStudio/v9/libClp/libClp.vcxproj 2014-02-28 15:32:36.556600694 +0100 +@@ -0,0 +1,579 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994} ++ libClp ++ ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.50727.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ ++ Disabled ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories) ++ CLP_BUILD;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ EditAndContinue ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories) ++ CLP_BUILD;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories) ++ CLP_BUILD;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ ProgramDatabase ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories) ++ CLP_BUILD;WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -urN coinmp.org/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj +--- coinmp.org/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/Clp/MSVisualStudio/v9/libOsiClp/libOsiClp.vcxproj 2014-02-28 15:32:36.556600694 +0100 +@@ -0,0 +1,181 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {02D45875-A8CF-41B9-990B-3699C0ECFE10} ++ libOsiClp ++ ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.50727.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ ++ Disabled ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ EditAndContinue ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ ProgramDatabase ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;..\..\..\..\Clp\src;..\..\..\..\Clp\src\OsiClp;..\..\..\..\Osi\src;..\..\..\..\Osi\src\Osi;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj +--- coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj 2014-02-28 15:32:36.560600694 +0100 +@@ -0,0 +1,237 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {175F0674-F0B9-479C-9C9D-76969C06D794} ++ CoinMP ++ Win32Proj ++ ++ ++ ++ DynamicLibrary ++ v110 ++ Unicode ++ true ++ ++ ++ DynamicLibrary ++ v110 ++ MultiByte ++ ++ ++ DynamicLibrary ++ v110 ++ Unicode ++ true ++ ++ ++ DynamicLibrary ++ v110 ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.50727.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ true ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ false ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ true ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ false ++ ++ ++ ++ Disabled ++ ..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cbc\src;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglLiftAndProject;..\..\..\..\Cgl\src\CglSimpleRounding;..\..\..\..\Clp\src\OsiClp;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;COINMP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ Level3 ++ EditAndContinue ++ 4996;%(DisableSpecificWarnings) ++ ++ ++ ..\..\..\..\CoinMP\src\CoinMP.def ++ true ++ Windows ++ true ++ ++ MachineX86 ++ ++ ++ ++ ++ ..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cbc\src;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglLiftAndProject;..\..\..\..\Cgl\src\CglSimpleRounding;..\..\..\..\Clp\src\OsiClp;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;COINMP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ Level3 ++ ProgramDatabase ++ 4996;%(DisableSpecificWarnings) ++ ++ ++ ..\..\..\src\CoinMP.def ++ true ++ Windows ++ true ++ true ++ true ++ ++ MachineX86 ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ ..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cbc\src;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglLiftAndProject;..\..\..\..\Cgl\src\CglSimpleRounding;..\..\..\..\Clp\src\OsiClp;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_WINDOWS;_USRDLL;COINMP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ Level3 ++ ProgramDatabase ++ 4996;%(DisableSpecificWarnings) ++ ++ ++ ..\..\..\..\CoinMP\src\CoinMP.def ++ true ++ Windows ++ true ++ ++ MachineX64 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\..\..\..\Clp\src;..\..\..\..\CoinUtils\src;..\..\..\..\Osi\src\Osi;..\..\..\..\Cbc\src;..\..\..\..\Cgl\src;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglLiftAndProject;..\..\..\..\Cgl\src\CglSimpleRounding;..\..\..\..\Clp\src\OsiClp;..\..\..\..\BuildTools\headers;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_WINDOWS;_USRDLL;COINMP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ Level3 ++ ProgramDatabase ++ 4996;%(DisableSpecificWarnings) ++ ++ ++ ..\..\..\src\CoinMP.def ++ true ++ Windows ++ true ++ true ++ true ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ {71da4595-e8a7-4b21-a00a-d96d29d11e3e} ++ false ++ ++ ++ {363ba154-fec9-4e1e-bc23-93cec58ab785} ++ false ++ ++ ++ {dbea3904-f0b8-408a-9e1a-6497febe8c42} ++ false ++ ++ ++ {4f8f7d1c-3a9e-444d-8ee9-77f33fa05994} ++ false ++ ++ ++ {02d45875-a8cf-41b9-990b-3699c0ecfe10} ++ false ++ ++ ++ {c4867f15-438d-4ff8-8388-62fbaaa9786c} ++ false ++ ++ ++ {7d98e2cb-876e-4f75-9f71-77d3fe87e149} ++ false ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP.sln coinmp/CoinMP/MSVisualStudio/v9/CoinMP.sln +--- coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP.sln 2014-02-28 15:32:23.168600537 +0100 ++++ coinmp/CoinMP/MSVisualStudio/v9/CoinMP.sln 2014-02-28 15:32:36.580600695 +0100 +@@ -1,35 +1,23 @@ +  +-Microsoft Visual Studio Solution File, Format Version 10.00 +-# Visual Studio 2008 +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libClp", "..\..\..\Clp\MSVisualStudio\v9\libClp\libClp.vcproj", "{4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}" ++Microsoft Visual Studio Solution File, Format Version 12.00 ++# Visual Studio Express 2012 for Windows Desktop ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libClp", "..\..\..\Clp\MSVisualStudio\v9\libClp\libClp.vcxproj", "{4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCoinUtils", "..\..\..\CoinUtils\MSVisualStudio\v9\libCoinUtils\libCoinUtils.vcproj", "{C4867F15-438D-4FF8-8388-62FBAAA9786C}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCoinUtils", "..\..\..\CoinUtils\MSVisualStudio\v9\libCoinUtils\libCoinUtils.vcxproj", "{C4867F15-438D-4FF8-8388-62FBAAA9786C}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCgl", "..\..\..\Cgl\MSVisualStudio\v9\libCgl\libCgl.vcproj", "{DBEA3904-F0B8-408A-9E1A-6497FEBE8C42}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCgl", "..\..\..\Cgl\MSVisualStudio\v9\libCgl\libCgl.vcxproj", "{DBEA3904-F0B8-408A-9E1A-6497FEBE8C42}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbc", "..\..\..\Cbc\MSVisualStudio\v9\libCbc\libCbc.vcproj", "{363BA154-FEC9-4E1E-BC23-93CEC58AB785}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbc", "..\..\..\Cbc\MSVisualStudio\v9\libCbc\libCbc.vcxproj", "{363BA154-FEC9-4E1E-BC23-93CEC58AB785}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsi", "..\..\..\Osi\MSVisualStudio\v9\libOsi\libOsi.vcproj", "{7D98E2CB-876E-4F75-9F71-77D3FE87E149}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsi", "..\..\..\Osi\MSVisualStudio\v9\libOsi\libOsi.vcxproj", "{7D98E2CB-876E-4F75-9F71-77D3FE87E149}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsiClp", "..\..\..\Clp\MSVisualStudio\v9\libOsiClp\libOsiClp.vcproj", "{02D45875-A8CF-41B9-990B-3699C0ECFE10}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsiClp", "..\..\..\Clp\MSVisualStudio\v9\libOsiClp\libOsiClp.vcxproj", "{02D45875-A8CF-41B9-990B-3699C0ECFE10}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoinMP", "CoinMP\CoinMP.vcproj", "{175F0674-F0B9-479C-9C9D-76969C06D794}" +- ProjectSection(ProjectDependencies) = postProject +- {DBEA3904-F0B8-408A-9E1A-6497FEBE8C42} = {DBEA3904-F0B8-408A-9E1A-6497FEBE8C42} +- {C4867F15-438D-4FF8-8388-62FBAAA9786C} = {C4867F15-438D-4FF8-8388-62FBAAA9786C} +- {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994} = {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994} +- {363BA154-FEC9-4E1E-BC23-93CEC58AB785} = {363BA154-FEC9-4E1E-BC23-93CEC58AB785} +- {02D45875-A8CF-41B9-990B-3699C0ECFE10} = {02D45875-A8CF-41B9-990B-3699C0ECFE10} +- {71DA4595-E8A7-4B21-A00A-D96D29D11E3E} = {71DA4595-E8A7-4B21-A00A-D96D29D11E3E} +- {7D98E2CB-876E-4F75-9F71-77D3FE87E149} = {7D98E2CB-876E-4F75-9F71-77D3FE87E149} +- EndProjectSection ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CoinMP", "CoinMP\CoinMP.vcxproj", "{175F0674-F0B9-479C-9C9D-76969C06D794}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unitTest", "unitTest\unitTest.vcproj", "{9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}" +- ProjectSection(ProjectDependencies) = postProject +- {175F0674-F0B9-479C-9C9D-76969C06D794} = {175F0674-F0B9-479C-9C9D-76969C06D794} +- EndProjectSection ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unitTest", "unitTest\unitTest.vcxproj", "{9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbcSolver", "..\..\..\Cbc\MSVisualStudio\v9\libCbcSolver\libCbcSolver.vcproj", "{71DA4595-E8A7-4B21-A00A-D96D29D11E3E}" ++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCbcSolver", "..\..\..\Cbc\MSVisualStudio\v9\libCbcSolver\libCbcSolver.vcxproj", "{71DA4595-E8A7-4B21-A00A-D96D29D11E3E}" + EndProject + Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +@@ -121,6 +123,7 @@ + {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|Win32.ActiveCfg = Debug|Win32 + {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|Win32.Build.0 = Debug|Win32 + {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|x64.ActiveCfg = Debug|x64 ++ {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|x64.Build.0 = Debug|x64 + {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Any CPU.ActiveCfg = Release|Win32 + {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Mixed Platforms.Build.0 = Release|Win32 +@@ -134,6 +137,7 @@ + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|Win32.Build.0 = Debug|Win32 + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|x64.ActiveCfg = Debug|x64 ++ {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|x64.Build.0 = Debug|x64 + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Release|Any CPU.ActiveCfg = Release|Win32 + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Release|Mixed Platforms.Build.0 = Release|Win32 +diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj +--- coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj 2014-02-28 15:32:36.564600694 +0100 +@@ -0,0 +1,188 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6} ++ unitTest ++ Win32Proj ++ ++ ++ ++ Application ++ v110 ++ Unicode ++ true ++ ++ ++ Application ++ v110 ++ Unicode ++ ++ ++ Application ++ v110 ++ Unicode ++ true ++ ++ ++ Application ++ v110 ++ Unicode ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.50727.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ true ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ false ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ true ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ false ++ ++ ++ ++ Disabled ++ ..\..\..\..\CoinMP\src;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ Level3 ++ EditAndContinue ++ 4996;%(DisableSpecificWarnings) ++ ++ ++ true ++ Console ++ true ++ ++ MachineX86 ++ ++ ++ ++ ++ ..\..\..\..\CoinMP\src;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ Level3 ++ ProgramDatabase ++ 4996;%(DisableSpecificWarnings) ++ ++ ++ true ++ Console ++ true ++ true ++ true ++ ++ MachineX86 ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ ..\..\..\..\CoinMP\src;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ ++ Level3 ++ ProgramDatabase ++ 4996;%(DisableSpecificWarnings) ++ ++ ++ true ++ Console ++ true ++ ++ MachineX64 ++ ++ ++ ++ ++ X64 ++ ++ ++ ..\..\..\..\CoinMP\src;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) ++ MultiThreadedDLL ++ ++ Level3 ++ ProgramDatabase ++ 4996;%(DisableSpecificWarnings) ++ ++ ++ true ++ Console ++ true ++ true ++ true ++ ++ MachineX64 ++ ++ ++ ++ ++ ++ ++ ++ {175f0674-f0b9-479c-9c9d-76969c06d794} ++ false ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -urN coinmp.org/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj +--- coinmp.org/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/CoinUtils/MSVisualStudio/v9/libCoinUtils/libCoinUtils.vcxproj 2014-02-28 15:32:36.564600694 +0100 +@@ -0,0 +1,650 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {C4867F15-438D-4FF8-8388-62FBAAA9786C} ++ libCoinUtils ++ ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.50727.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ ++ Disabled ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ EditAndContinue ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ ProgramDatabase ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ Disabled ++ EnableFastChecks ++ Disabled ++ EnableFastChecks ++ MaxSpeed ++ MaxSpeed ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file +diff -urN coinmp.org/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj +--- coinmp.org/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj 1970-01-01 01:00:00.000000000 +0100 ++++ coinmp/Osi/MSVisualStudio/v9/libOsi/libOsi.vcxproj 2014-02-28 15:32:36.568600695 +0100 +@@ -0,0 +1,220 @@ ++ ++ ++ ++ ++ Debug ++ Win32 ++ ++ ++ Debug ++ x64 ++ ++ ++ Release ++ Win32 ++ ++ ++ Release ++ x64 ++ ++ ++ ++ {7D98E2CB-876E-4F75-9F71-77D3FE87E149} ++ ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ StaticLibrary ++ v110 ++ false ++ MultiByte ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ <_ProjectFileVersion>11.0.50727.1 ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ $(SolutionDir)$(Configuration)\ ++ $(Configuration)\ ++ ++ ++ $(SolutionDir)$(Platform)\$(Configuration)\ ++ $(Platform)\$(Configuration)\ ++ ++ ++ ++ Disabled ++ ..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ EditAndContinue ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ X64 ++ ++ ++ Disabled ++ ..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories) ++ WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ EnableFastChecks ++ MultiThreadedDebugDLL ++ true ++ ++ Level3 ++ true ++ ProgramDatabase ++ Default ++ ++ ++ _DEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ X64 ++ ++ ++ MaxSpeed ++ OnlyExplicitInline ++ ..\..\..\..\Osi\src\Osi;..\..\..\..\BuildTools\headers;..\..\..\..\CoinUtils\inc;..\..\..\..\CoinUtils\src;%(AdditionalIncludeDirectories) ++ WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) ++ true ++ MultiThreadedDLL ++ true ++ true ++ ++ Level3 ++ true ++ Default ++ ++ ++ NDEBUG;%(PreprocessorDefinitions) ++ 0x0409 ++ ++ ++ true ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file -- cgit v1.2.3