Changeset 816 for trunk

Timestamp:

Oct 3, 2007 9:17:46 PM (12 years ago)

Author:

jpfasano

Message:

Modifications to get building with MS V7 compiler

Location:

trunk/Cbc/MSVisualStudio/v7

Files:

• Cbc.suo (modified) (previous)
• cbc/cbc.vcproj (modified) (5 diffs)
• libCbc/libCbc.vcproj (modified) (3 diffs)

trunk/Cbc/MSVisualStudio/v7/cbc/cbc.vcproj

@@ -3 +3 @@
         ProjectType="Visual C++"
         Version="7.10"
-        Name="cbc"
+        Name="cbcGeneric"
         SccProjectName=""
         SccLocalPath="">
@@ -23 +23 @@
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="..\..\..\..\Osi\src\OsiCbc,..\..\..\..\Osi\src,..\..\..\..\Cgl\src\CglTwomir,..\..\..\..\Cgl\src\CglMixedIntegerRounding,..\..\..\..\Cgl\src\CglMixedIntegerRounding2,..\..\..\..\Cgl\src\CglFlowCover,..\..\..\..\Cgl\src\CglClique,..\..\..\..\Cgl\src\CglOddHole,..\..\..\..\Cgl\src\CglKnapsackCover,..\..\..\..\Cgl\src\CglGomory,..\..\..\..\Cgl\src\CglPreProcess,..\..\..\..\Cgl\src\CglProbing,..\..\..\..\Cgl\src,..\..\..\..\Clp\src,..\..\..\..\Osi\src\OsiClp,..\..\..\..\CoinUtils\src,..\..\..\..\BuildTools\headers"
+                                AdditionalIncludeDirectories="..\..\..\..\Osi\src\OsiCbc;..\..\..\..\Osi\src;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Osi\src\OsiClp;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                 StringPooling="TRUE"
@@ -83 +83 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\..\..\..\Osi\src\OsiCbc,..\..\..\..\Osi\src,..\..\..\..\Cgl\src\CglTwomir,..\..\..\..\Cgl\src\CglMixedIntegerRounding,..\..\..\..\Cgl\src\CglMixedIntegerRounding2,..\..\..\..\Cgl\src\CglFlowCover,..\..\..\..\Cgl\src\CglClique,..\..\..\..\Cgl\src\CglOddHole,..\..\..\..\Cgl\src\CglKnapsackCover,..\..\..\..\Cgl\src\CglGomory,..\..\..\..\Cgl\src\CglPreProcess,..\..\..\..\Cgl\src\CglProbing,..\..\..\..\Cgl\src,..\..\..\..\Clp\src,..\..\..\..\Osi\src\OsiClp,..\..\..\..\CoinUtils\src,..\..\..\..\BuildTools\headers"
+                                AdditionalIncludeDirectories="..\..\..\..\Osi\src\OsiCbc;..\..\..\..\Osi\src;..\..\..\..\Cgl\src\CglTwomir;..\..\..\..\Cgl\src\CglMixedIntegerRounding;..\..\..\..\Cgl\src\CglMixedIntegerRounding2;..\..\..\..\Cgl\src\CglFlowCover;..\..\..\..\Cgl\src\CglClique;..\..\..\..\Cgl\src\CglOddHole;..\..\..\..\Cgl\src\CglKnapsackCover;..\..\..\..\Cgl\src\CglGomory;..\..\..\..\Cgl\src\CglPreProcess;..\..\..\..\Cgl\src\CglRedSplit;..\..\..\..\Cgl\src\CglProbing;..\..\..\..\Cgl\src;..\..\..\..\Clp\src;..\..\..\..\Osi\src\OsiClp;..\..\..\..\CoinUtils\src;..\..\..\..\BuildTools\headers"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                 BasicRuntimeChecks="3"
@@ -141 +141 @@
                         Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
                         <File
-                                RelativePath="..\..\..\..\Cbc\src\CbcMain.cpp">
-                                <FileConfiguration
-                                        Name="Release|Win32">
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                Optimization="2"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""/>
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|Win32">
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                Optimization="0"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                                BasicRuntimeChecks="3"/>
-                                </FileConfiguration>
-                        </File>
-                        <File
-                                RelativePath="..\..\..\..\Cbc\src\unitTest.cpp">
-                                <FileConfiguration
-                                        Name="Release|Win32">
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                Optimization="2"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""/>
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|Win32">
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                Optimization="0"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                                BasicRuntimeChecks="3"/>
-                                </FileConfiguration>
+                                RelativePath="..\..\..\src\CbcGenBaB.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenCbcParam.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenCbcParamUtils.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenCtlBlk.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGeneric.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenMessages.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenOsiParam.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenOsiParamUtils.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenParam.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenParamUtils.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenSolution.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenSolvers.cpp">
                         </File>
                 </Filter>
@@ -201 +197 @@
                         <File
                                 RelativePath="..\..\..\..\Cbc\src\CbcEventHandler.hpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenCbcParam.hpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenCtlBlk.hpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenMessages.hpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenOsiParam.hpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcGenParam.hpp">
                         </File>
                         <File

trunk/Cbc/MSVisualStudio/v7/libCbc/libCbc.vcproj

@@ -450 +450 @@
                         </File>
                         <File
+                                RelativePath="..\..\..\src\CbcLinked.cpp">
+                        </File>
+                        <File
                                 RelativePath="..\..\..\..\Cbc\src\CbcMessage.cpp">
                                 <FileConfiguration
@@ -608 +611 @@
                                                 PreprocessorDefinitions=""/>
                                 </FileConfiguration>
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\ClpAmplStuff.cpp">
                         </File>
                 </Filter>
@@ -675 +681 @@
                         <File
                                 RelativePath="..\..\..\src\CbcHeuristicRINS.hpp">
+                        </File>
+                        <File
+                                RelativePath="..\..\..\src\CbcLinked.hpp">
                         </File>
                         <File