Ignore:
Timestamp:
Dec 19, 2010 12:25:22 PM (8 years ago)
Author:
stefan
Message:

sync with trunk rev1648, except for half of chgset1635 and except for chgset1643

Location:
stable/1.13/Clp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.13/Clp

  • stable/1.13/Clp/MSVisualStudio/v9/Clp.sln

    r1313 r1649  
    11Microsoft Visual Studio Solution File, Format Version 10.00
    2 # Visual C++ Express 2008
     2# Visual Studio 2008
    33Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClpExamplesMinimum", "ClpExamplesMinimum\ClpExamplesMinimum.vcproj", "{C23C220A-5EF9-4C87-93E9-31472E684D6A}"
    44        ProjectSection(ProjectDependencies) = postProject
     
    99Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClpExamplesTestBarrier", "ClpExamplesTestBarrier\ClpExamplesTestBarrier.vcproj", "{F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}"
    1010        ProjectSection(ProjectDependencies) = postProject
     11                {C4867F15-438D-4FF8-8388-62FBAAA9786C} = {C4867F15-438D-4FF8-8388-62FBAAA9786C}
    1112                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994} = {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}
    12                 {C4867F15-438D-4FF8-8388-62FBAAA9786C} = {C4867F15-438D-4FF8-8388-62FBAAA9786C}
    1313        EndProjectSection
    1414EndProject
    1515Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ClpExamplesTestQP", "ClpExamplesTestQP\ClpExamplesTestQP.vcproj", "{E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}"
    1616        ProjectSection(ProjectDependencies) = postProject
     17                {C4867F15-438D-4FF8-8388-62FBAAA9786C} = {C4867F15-438D-4FF8-8388-62FBAAA9786C}
    1718                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994} = {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}
    18                 {C4867F15-438D-4FF8-8388-62FBAAA9786C} = {C4867F15-438D-4FF8-8388-62FBAAA9786C}
    1919        EndProjectSection
    2020EndProject
     
    2929Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCoinUtils", "..\..\..\CoinUtils\MSVisualStudio\v9\libCoinUtils\libCoinUtils.vcproj", "{C4867F15-438D-4FF8-8388-62FBAAA9786C}"
    3030EndProject
    31 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unitTestCoinUtils", "..\..\..\CoinUtils\MSVisualStudio\v9\unitTestCoinUtils\unitTestCoinUtils.vcproj", "{D8879B84-4497-48E6-96A5-49B154FB0422}"
     31Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsiClp", "libOsiClp\libOsiClp.vcproj", "{02D45875-A8CF-41B9-990B-3699C0ECFE10}"
     32EndProject
     33Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OsiClpUnitTest", "OsiClpUnitTest\OsiClpUnitTest.vcproj", "{70730B26-9A00-4C1D-8AD2-ECE43B8F96A7}"
    3234        ProjectSection(ProjectDependencies) = postProject
    3335                {C4867F15-438D-4FF8-8388-62FBAAA9786C} = {C4867F15-438D-4FF8-8388-62FBAAA9786C}
     36                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994} = {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}
     37                {109D6E6F-6D91-460F-86AE-DF27400E09A9} = {109D6E6F-6D91-460F-86AE-DF27400E09A9}
     38                {02D45875-A8CF-41B9-990B-3699C0ECFE10} = {02D45875-A8CF-41B9-990B-3699C0ECFE10}
     39                {7D98E2CB-876E-4F75-9F71-77D3FE87E149} = {7D98E2CB-876E-4F75-9F71-77D3FE87E149}
    3440        EndProjectSection
     41EndProject
     42Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsi", "..\..\..\Osi\MSVisualStudio\v9\libOsi\libOsi.vcproj", "{7D98E2CB-876E-4F75-9F71-77D3FE87E149}"
     43EndProject
     44Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOsiCommonTest", "..\..\..\Osi\MSVisualStudio\v9\libOsiCommonTest\libOsiCommonTest.vcproj", "{109D6E6F-6D91-460F-86AE-DF27400E09A9}"
    3545EndProject
    3646Global
    3747        GlobalSection(SolutionConfigurationPlatforms) = preSolution
    3848                Debug|Win32 = Debug|Win32
     49                Debug|x64 = Debug|x64
    3950                Release|Win32 = Release|Win32
     51                Release|x64 = Release|x64
    4052        EndGlobalSection
    4153        GlobalSection(ProjectConfigurationPlatforms) = postSolution
    4254                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|Win32.ActiveCfg = Debug|Win32
    43                 {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|Win32.Build.0 = Debug|Win32
     55                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Debug|x64.ActiveCfg = Debug|Win32
    4456                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|Win32.ActiveCfg = Release|Win32
    45                 {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|Win32.Build.0 = Release|Win32
     57                {C23C220A-5EF9-4C87-93E9-31472E684D6A}.Release|x64.ActiveCfg = Release|Win32
    4658                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|Win32.ActiveCfg = Debug|Win32
    47                 {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|Win32.Build.0 = Debug|Win32
     59                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Debug|x64.ActiveCfg = Debug|Win32
    4860                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|Win32.ActiveCfg = Release|Win32
    49                 {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|Win32.Build.0 = Release|Win32
     61                {F6DD73C8-6714-414E-9A98-D51F6D6AD9B4}.Release|x64.ActiveCfg = Release|Win32
    5062                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|Win32.ActiveCfg = Debug|Win32
    51                 {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|Win32.Build.0 = Debug|Win32
     63                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Debug|x64.ActiveCfg = Debug|Win32
    5264                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|Win32.ActiveCfg = Release|Win32
    53                 {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|Win32.Build.0 = Release|Win32
     65                {E7EA8BD6-D2AA-40F0-9F0E-42A339DCF613}.Release|x64.ActiveCfg = Release|Win32
    5466                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Debug|Win32.ActiveCfg = Debug|Win32
    5567                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Debug|Win32.Build.0 = Debug|Win32
     68                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Debug|x64.ActiveCfg = Debug|x64
     69                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Debug|x64.Build.0 = Debug|x64
    5670                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Release|Win32.ActiveCfg = Release|Win32
    5771                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Release|Win32.Build.0 = Release|Win32
     72                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Release|x64.ActiveCfg = Release|x64
     73                {0E9135A7-CB30-48D9-A83D-0F49EC3B601B}.Release|x64.Build.0 = Release|x64
    5874                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}.Debug|Win32.ActiveCfg = Debug|Win32
    5975                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}.Debug|Win32.Build.0 = Debug|Win32
     76                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}.Debug|x64.ActiveCfg = Debug|x64
     77                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}.Debug|x64.Build.0 = Debug|x64
    6078                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}.Release|Win32.ActiveCfg = Release|Win32
    6179                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}.Release|Win32.Build.0 = Release|Win32
     80                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}.Release|x64.ActiveCfg = Release|x64
     81                {4F8F7D1C-3A9E-444D-8EE9-77F33FA05994}.Release|x64.Build.0 = Release|x64
    6282                {C4867F15-438D-4FF8-8388-62FBAAA9786C}.Debug|Win32.ActiveCfg = Debug|Win32
    6383                {C4867F15-438D-4FF8-8388-62FBAAA9786C}.Debug|Win32.Build.0 = Debug|Win32
     84                {C4867F15-438D-4FF8-8388-62FBAAA9786C}.Debug|x64.ActiveCfg = Debug|x64
     85                {C4867F15-438D-4FF8-8388-62FBAAA9786C}.Debug|x64.Build.0 = Debug|x64
    6486                {C4867F15-438D-4FF8-8388-62FBAAA9786C}.Release|Win32.ActiveCfg = Release|Win32
    6587                {C4867F15-438D-4FF8-8388-62FBAAA9786C}.Release|Win32.Build.0 = Release|Win32
    66                 {D8879B84-4497-48E6-96A5-49B154FB0422}.Debug|Win32.ActiveCfg = Debug|Win32
    67                 {D8879B84-4497-48E6-96A5-49B154FB0422}.Debug|Win32.Build.0 = Debug|Win32
    68                 {D8879B84-4497-48E6-96A5-49B154FB0422}.Release|Win32.ActiveCfg = Release|Win32
    69                 {D8879B84-4497-48E6-96A5-49B154FB0422}.Release|Win32.Build.0 = Release|Win32
     88                {C4867F15-438D-4FF8-8388-62FBAAA9786C}.Release|x64.ActiveCfg = Release|x64
     89                {C4867F15-438D-4FF8-8388-62FBAAA9786C}.Release|x64.Build.0 = Release|x64
     90                {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Debug|Win32.ActiveCfg = Debug|Win32
     91                {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Debug|Win32.Build.0 = Debug|Win32
     92                {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Debug|x64.ActiveCfg = Debug|x64
     93                {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Debug|x64.Build.0 = Debug|x64
     94                {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Release|Win32.ActiveCfg = Release|Win32
     95                {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Release|Win32.Build.0 = Release|Win32
     96                {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Release|x64.ActiveCfg = Release|x64
     97                {02D45875-A8CF-41B9-990B-3699C0ECFE10}.Release|x64.Build.0 = Release|x64
     98                {70730B26-9A00-4C1D-8AD2-ECE43B8F96A7}.Debug|Win32.ActiveCfg = Debug|Win32
     99                {70730B26-9A00-4C1D-8AD2-ECE43B8F96A7}.Debug|Win32.Build.0 = Debug|Win32
     100                {70730B26-9A00-4C1D-8AD2-ECE43B8F96A7}.Debug|x64.ActiveCfg = Debug|x64
     101                {70730B26-9A00-4C1D-8AD2-ECE43B8F96A7}.Debug|x64.Build.0 = Debug|x64
     102                {70730B26-9A00-4C1D-8AD2-ECE43B8F96A7}.Release|Win32.ActiveCfg = Release|Win32
     103                {70730B26-9A00-4C1D-8AD2-ECE43B8F96A7}.Release|Win32.Build.0 = Release|Win32
     104                {70730B26-9A00-4C1D-8AD2-ECE43B8F96A7}.Release|x64.ActiveCfg = Release|x64
     105                {70730B26-9A00-4C1D-8AD2-ECE43B8F96A7}.Release|x64.Build.0 = Release|x64
     106                {7D98E2CB-876E-4F75-9F71-77D3FE87E149}.Debug|Win32.ActiveCfg = Debug|Win32
     107                {7D98E2CB-876E-4F75-9F71-77D3FE87E149}.Debug|Win32.Build.0 = Debug|Win32
     108                {7D98E2CB-876E-4F75-9F71-77D3FE87E149}.Debug|x64.ActiveCfg = Debug|x64
     109                {7D98E2CB-876E-4F75-9F71-77D3FE87E149}.Debug|x64.Build.0 = Debug|x64
     110                {7D98E2CB-876E-4F75-9F71-77D3FE87E149}.Release|Win32.ActiveCfg = Release|Win32
     111                {7D98E2CB-876E-4F75-9F71-77D3FE87E149}.Release|Win32.Build.0 = Release|Win32
     112                {7D98E2CB-876E-4F75-9F71-77D3FE87E149}.Release|x64.ActiveCfg = Release|x64
     113                {7D98E2CB-876E-4F75-9F71-77D3FE87E149}.Release|x64.Build.0 = Release|x64
     114                {109D6E6F-6D91-460F-86AE-DF27400E09A9}.Debug|Win32.ActiveCfg = Debug|Win32
     115                {109D6E6F-6D91-460F-86AE-DF27400E09A9}.Debug|Win32.Build.0 = Debug|Win32
     116                {109D6E6F-6D91-460F-86AE-DF27400E09A9}.Debug|x64.ActiveCfg = Debug|x64
     117                {109D6E6F-6D91-460F-86AE-DF27400E09A9}.Debug|x64.Build.0 = Debug|x64
     118                {109D6E6F-6D91-460F-86AE-DF27400E09A9}.Release|Win32.ActiveCfg = Release|Win32
     119                {109D6E6F-6D91-460F-86AE-DF27400E09A9}.Release|Win32.Build.0 = Release|Win32
     120                {109D6E6F-6D91-460F-86AE-DF27400E09A9}.Release|x64.ActiveCfg = Release|x64
     121                {109D6E6F-6D91-460F-86AE-DF27400E09A9}.Release|x64.Build.0 = Release|x64
    70122        EndGlobalSection
    71123        GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.