From 8850c68a8678c92d92558a8c7d81c7dd4487b6cb Mon Sep 17 00:00:00 2001 From: cherierm Date: Fri, 20 Jun 2008 12:58:39 +0000 Subject: [PATCH] Update the compiler options of the SimGrid DLL project and add the new projects of the teshsuite to the solution. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5789 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- build/vc7/simgrid/all.sln | 160 ++++++++++++++++++++++++++++++- build/vc7/simgrid/simgrid.vcproj | 4 +- 2 files changed, 159 insertions(+), 5 deletions(-) diff --git a/build/vc7/simgrid/all.sln b/build/vc7/simgrid/all.sln index 95524176b1..93b5bb3b74 100644 --- a/build/vc7/simgrid/all.sln +++ b/build/vc7/simgrid/all.sln @@ -39,7 +39,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "trace_usage", "..\testsuite EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testsuite", "testsuite", "{24749C86-C5F3-4498-AA8D-2493979F76C9}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{F356BA40-006E-4F59-AE49-E25171DF2016}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{F356BA40-006E-4F59-AE49-E25171DF2016}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{B24BD5D4-9D03-4644-9792-416396F9C34E}" EndProject @@ -67,10 +67,62 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log_usage", "..\testsuite\x EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphxml_usage", "..\testsuite\xbt\graphxml_usage\graphxml_usage.vcproj", "{05FB934F-D2CE-420F-9DAA-E7EE3FC0E381}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "teshsuite", "teshsuite", "{C48B8100-6A37-4206-9DFF-A7216B0748F8}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "masterslave_forwarder_with_alias", "..\examples\msg\masterslave_forwarder_with_alias\masterslave_forwarder_with_alias.vcproj", "{7BD90322-A802-4ACB-9997-E8ABB0C8C6E1}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "teshsuite", "teshsuite", "{2A1E29F4-C59C-4AED-B0A9-F3A0124D914D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simdag", "simdag", "{A82A2A62-C994-44C2-8B92-A51ADF7B5DFA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic0", "..\teshsuite\simdag\basic0\basic0.vcproj", "{42181CB2-49C9-4B48-84C4-D6B85F4B5EA9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic1", "..\teshsuite\simdag\basic1\basic1.vcproj", "{5C3238CD-D0F4-4D66-BC4F-DE2EF8ED654D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic2", "..\teshsuite\simdag\basic2\basic2.vcproj", "{5ACF0175-128D-4B6C-992B-0F7CE1EA60BD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic3", "..\teshsuite\simdag\basic3\basic3.vcproj", "{7654C29A-BB7B-47D1-B794-6E203BE1B8B0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic4", "..\teshsuite\simdag\basic4\basic4.vcproj", "{3B521757-940A-43A8-8A7E-F8F07231F6F1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic5", "..\teshsuite\simdag\basic5\basic5.vcproj", "{14B130E2-056E-4CF0-A0AE-DB4BFD6D03B0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic6", "..\teshsuite\simdag\basic6\basic6.vcproj", "{0A72F531-6591-487C-8D4D-1EB289450071}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xbt", "xbt", "{94D3F27A-7662-41DE-859C-21795B49FE8E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "log_large_test", "..\teshsuite\xbt\log_large_test\log_large_test.vcproj", "{049D7BF3-1525-4670-8C71-AB3E5EAB7513}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "network", "network", "{A353A96C-5AB0-4EA1-B2E9-44A277D52129}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_reinit_costs", "..\teshsuite\simdag\network\test_reinit_costs\test_reinit_costs.vcproj", "{4A0D5B69-AEFE-4966-9237-72AEBBDD8658}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "p2p", "p2p", "{92AA9CFC-2E35-4063-A681-2748AD6A7DD9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_latency1", "..\teshsuite\simdag\network\p2p\test_latency1\test_latency1.vcproj", "{9EB296B2-F5D0-42F2-9F1F-0DEE74892FE2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_latency2", "..\teshsuite\simdag\network\p2p\test_latency2\test_latency2.vcproj", "{0D3E4178-332A-4A18-9EE0-D0E6E4ED405B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_latency3", "..\teshsuite\simdag\network\p2p\test_latency3\test_latency3.vcproj", "{C8E8CE7A-03FA-4525-A4D3-E27EA30128FE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_latency_bound", "..\teshsuite\simdag\network\p2p\test_latency_bound\test_latency_bound.vcproj", "{43314E55-D4E3-4219-BBDC-BC022EA5E02D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "mxn", "mxn", "{F1C98032-7F43-4B91-8A25-6373B892A619}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_intra_all2all", "..\teshsuite\simdag\network\mxn\test_intra_all2all\test_intra_all2all.vcproj", "{ACB9F0A6-9FAA-4774-A16E-CF7C7C3404AB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_intra_independent_comm", "..\teshsuite\simdag\network\mxn\test_intra_independent_comm\test_intra_independent_comm.vcproj", "{08EE6C8E-2132-4A3E-94A4-3C553B6419FA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_intra_scatter", "..\teshsuite\simdag\network\mxn\test_intra_scatter\test_intra_scatter.vcproj", "{EFE018D6-5039-4772-9323-D8E9D1215477}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "partask", "partask", "{BA6086BB-4B5F-4321-832B-06E30824F001}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_comp_only_par", "..\teshsuite\simdag\partask\test_comp_only_par\test_comp_only_par.vcproj", "{CCDDDECA-8F45-49BB-8A4C-B93993B6FC2D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_comp_only_seq", "..\teshsuite\simdag\partask\test_comp_only_seq\test_comp_only_seq.vcproj", "{9ECA1863-3440-4BFC-9B5B-259C3FCBB8E5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallel_log_crashtest", "..\teshsuite\xbt\parallel_log_crashtest\parallel_log_crashtest.vcproj", "{D9AF4B16-F480-4167-AB60-6470E64CEA6E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "metaxml", "metaxml", "{9C2D1A1D-4C30-4719-B3B5-5E74DD1A74D5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -177,6 +229,82 @@ Global {7BD90322-A802-4ACB-9997-E8ABB0C8C6E1}.Debug|Win32.Build.0 = Debug|Win32 {7BD90322-A802-4ACB-9997-E8ABB0C8C6E1}.Release|Win32.ActiveCfg = Release|Win32 {7BD90322-A802-4ACB-9997-E8ABB0C8C6E1}.Release|Win32.Build.0 = Release|Win32 + {42181CB2-49C9-4B48-84C4-D6B85F4B5EA9}.Debug|Win32.ActiveCfg = Debug|Win32 + {42181CB2-49C9-4B48-84C4-D6B85F4B5EA9}.Debug|Win32.Build.0 = Debug|Win32 + {42181CB2-49C9-4B48-84C4-D6B85F4B5EA9}.Release|Win32.ActiveCfg = Release|Win32 + {42181CB2-49C9-4B48-84C4-D6B85F4B5EA9}.Release|Win32.Build.0 = Release|Win32 + {5C3238CD-D0F4-4D66-BC4F-DE2EF8ED654D}.Debug|Win32.ActiveCfg = Debug|Win32 + {5C3238CD-D0F4-4D66-BC4F-DE2EF8ED654D}.Debug|Win32.Build.0 = Debug|Win32 + {5C3238CD-D0F4-4D66-BC4F-DE2EF8ED654D}.Release|Win32.ActiveCfg = Release|Win32 + {5C3238CD-D0F4-4D66-BC4F-DE2EF8ED654D}.Release|Win32.Build.0 = Release|Win32 + {5ACF0175-128D-4B6C-992B-0F7CE1EA60BD}.Debug|Win32.ActiveCfg = Debug|Win32 + {5ACF0175-128D-4B6C-992B-0F7CE1EA60BD}.Debug|Win32.Build.0 = Debug|Win32 + {5ACF0175-128D-4B6C-992B-0F7CE1EA60BD}.Release|Win32.ActiveCfg = Release|Win32 + {5ACF0175-128D-4B6C-992B-0F7CE1EA60BD}.Release|Win32.Build.0 = Release|Win32 + {7654C29A-BB7B-47D1-B794-6E203BE1B8B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {7654C29A-BB7B-47D1-B794-6E203BE1B8B0}.Debug|Win32.Build.0 = Debug|Win32 + {7654C29A-BB7B-47D1-B794-6E203BE1B8B0}.Release|Win32.ActiveCfg = Release|Win32 + {7654C29A-BB7B-47D1-B794-6E203BE1B8B0}.Release|Win32.Build.0 = Release|Win32 + {3B521757-940A-43A8-8A7E-F8F07231F6F1}.Debug|Win32.ActiveCfg = Debug|Win32 + {3B521757-940A-43A8-8A7E-F8F07231F6F1}.Debug|Win32.Build.0 = Debug|Win32 + {3B521757-940A-43A8-8A7E-F8F07231F6F1}.Release|Win32.ActiveCfg = Release|Win32 + {3B521757-940A-43A8-8A7E-F8F07231F6F1}.Release|Win32.Build.0 = Release|Win32 + {14B130E2-056E-4CF0-A0AE-DB4BFD6D03B0}.Debug|Win32.ActiveCfg = Debug|Win32 + {14B130E2-056E-4CF0-A0AE-DB4BFD6D03B0}.Debug|Win32.Build.0 = Debug|Win32 + {14B130E2-056E-4CF0-A0AE-DB4BFD6D03B0}.Release|Win32.ActiveCfg = Release|Win32 + {14B130E2-056E-4CF0-A0AE-DB4BFD6D03B0}.Release|Win32.Build.0 = Release|Win32 + {0A72F531-6591-487C-8D4D-1EB289450071}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A72F531-6591-487C-8D4D-1EB289450071}.Debug|Win32.Build.0 = Debug|Win32 + {0A72F531-6591-487C-8D4D-1EB289450071}.Release|Win32.ActiveCfg = Release|Win32 + {0A72F531-6591-487C-8D4D-1EB289450071}.Release|Win32.Build.0 = Release|Win32 + {049D7BF3-1525-4670-8C71-AB3E5EAB7513}.Debug|Win32.ActiveCfg = Debug|Win32 + {049D7BF3-1525-4670-8C71-AB3E5EAB7513}.Debug|Win32.Build.0 = Debug|Win32 + {049D7BF3-1525-4670-8C71-AB3E5EAB7513}.Release|Win32.ActiveCfg = Release|Win32 + {049D7BF3-1525-4670-8C71-AB3E5EAB7513}.Release|Win32.Build.0 = Release|Win32 + {4A0D5B69-AEFE-4966-9237-72AEBBDD8658}.Debug|Win32.ActiveCfg = Debug|Win32 + {4A0D5B69-AEFE-4966-9237-72AEBBDD8658}.Debug|Win32.Build.0 = Debug|Win32 + {4A0D5B69-AEFE-4966-9237-72AEBBDD8658}.Release|Win32.ActiveCfg = Release|Win32 + {4A0D5B69-AEFE-4966-9237-72AEBBDD8658}.Release|Win32.Build.0 = Release|Win32 + {9EB296B2-F5D0-42F2-9F1F-0DEE74892FE2}.Debug|Win32.ActiveCfg = Debug|Win32 + {9EB296B2-F5D0-42F2-9F1F-0DEE74892FE2}.Debug|Win32.Build.0 = Debug|Win32 + {9EB296B2-F5D0-42F2-9F1F-0DEE74892FE2}.Release|Win32.ActiveCfg = Release|Win32 + {9EB296B2-F5D0-42F2-9F1F-0DEE74892FE2}.Release|Win32.Build.0 = Release|Win32 + {0D3E4178-332A-4A18-9EE0-D0E6E4ED405B}.Debug|Win32.ActiveCfg = Debug|Win32 + {0D3E4178-332A-4A18-9EE0-D0E6E4ED405B}.Debug|Win32.Build.0 = Debug|Win32 + {0D3E4178-332A-4A18-9EE0-D0E6E4ED405B}.Release|Win32.ActiveCfg = Release|Win32 + {0D3E4178-332A-4A18-9EE0-D0E6E4ED405B}.Release|Win32.Build.0 = Release|Win32 + {C8E8CE7A-03FA-4525-A4D3-E27EA30128FE}.Debug|Win32.ActiveCfg = Debug|Win32 + {C8E8CE7A-03FA-4525-A4D3-E27EA30128FE}.Debug|Win32.Build.0 = Debug|Win32 + {C8E8CE7A-03FA-4525-A4D3-E27EA30128FE}.Release|Win32.ActiveCfg = Release|Win32 + {C8E8CE7A-03FA-4525-A4D3-E27EA30128FE}.Release|Win32.Build.0 = Release|Win32 + {43314E55-D4E3-4219-BBDC-BC022EA5E02D}.Debug|Win32.ActiveCfg = Debug|Win32 + {43314E55-D4E3-4219-BBDC-BC022EA5E02D}.Debug|Win32.Build.0 = Debug|Win32 + {43314E55-D4E3-4219-BBDC-BC022EA5E02D}.Release|Win32.ActiveCfg = Release|Win32 + {43314E55-D4E3-4219-BBDC-BC022EA5E02D}.Release|Win32.Build.0 = Release|Win32 + {ACB9F0A6-9FAA-4774-A16E-CF7C7C3404AB}.Debug|Win32.ActiveCfg = Debug|Win32 + {ACB9F0A6-9FAA-4774-A16E-CF7C7C3404AB}.Debug|Win32.Build.0 = Debug|Win32 + {ACB9F0A6-9FAA-4774-A16E-CF7C7C3404AB}.Release|Win32.ActiveCfg = Release|Win32 + {ACB9F0A6-9FAA-4774-A16E-CF7C7C3404AB}.Release|Win32.Build.0 = Release|Win32 + {08EE6C8E-2132-4A3E-94A4-3C553B6419FA}.Debug|Win32.ActiveCfg = Debug|Win32 + {08EE6C8E-2132-4A3E-94A4-3C553B6419FA}.Debug|Win32.Build.0 = Debug|Win32 + {08EE6C8E-2132-4A3E-94A4-3C553B6419FA}.Release|Win32.ActiveCfg = Release|Win32 + {08EE6C8E-2132-4A3E-94A4-3C553B6419FA}.Release|Win32.Build.0 = Release|Win32 + {EFE018D6-5039-4772-9323-D8E9D1215477}.Debug|Win32.ActiveCfg = Debug|Win32 + {EFE018D6-5039-4772-9323-D8E9D1215477}.Debug|Win32.Build.0 = Debug|Win32 + {EFE018D6-5039-4772-9323-D8E9D1215477}.Release|Win32.ActiveCfg = Release|Win32 + {EFE018D6-5039-4772-9323-D8E9D1215477}.Release|Win32.Build.0 = Release|Win32 + {CCDDDECA-8F45-49BB-8A4C-B93993B6FC2D}.Debug|Win32.ActiveCfg = Debug|Win32 + {CCDDDECA-8F45-49BB-8A4C-B93993B6FC2D}.Debug|Win32.Build.0 = Debug|Win32 + {CCDDDECA-8F45-49BB-8A4C-B93993B6FC2D}.Release|Win32.ActiveCfg = Release|Win32 + {CCDDDECA-8F45-49BB-8A4C-B93993B6FC2D}.Release|Win32.Build.0 = Release|Win32 + {9ECA1863-3440-4BFC-9B5B-259C3FCBB8E5}.Debug|Win32.ActiveCfg = Debug|Win32 + {9ECA1863-3440-4BFC-9B5B-259C3FCBB8E5}.Debug|Win32.Build.0 = Debug|Win32 + {9ECA1863-3440-4BFC-9B5B-259C3FCBB8E5}.Release|Win32.ActiveCfg = Release|Win32 + {9ECA1863-3440-4BFC-9B5B-259C3FCBB8E5}.Release|Win32.Build.0 = Release|Win32 + {D9AF4B16-F480-4167-AB60-6470E64CEA6E}.Debug|Win32.ActiveCfg = Debug|Win32 + {D9AF4B16-F480-4167-AB60-6470E64CEA6E}.Debug|Win32.Build.0 = Debug|Win32 + {D9AF4B16-F480-4167-AB60-6470E64CEA6E}.Release|Win32.ActiveCfg = Release|Win32 + {D9AF4B16-F480-4167-AB60-6470E64CEA6E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -200,6 +328,7 @@ Global {A95FC8DF-52C7-45FD-B7D1-D93081DE6BB1} = {0E867394-9B56-42DA-AB3F-E59080B653A5} {317E8A67-AE41-45F1-85C7-AA4A3A9146D3} = {0E867394-9B56-42DA-AB3F-E59080B653A5} {ACF72B9D-451D-413D-A6F6-B1370FFB2000} = {0E867394-9B56-42DA-AB3F-E59080B653A5} + {9C2D1A1D-4C30-4719-B3B5-5E74DD1A74D5} = {0E867394-9B56-42DA-AB3F-E59080B653A5} {CEF665B7-5EB9-4055-993B-32F7B50D87A1} = {24749C86-C5F3-4498-AA8D-2493979F76C9} {536BA0EC-107D-467E-BFF8-D7BA634023BC} = {24749C86-C5F3-4498-AA8D-2493979F76C9} {D4B14EC6-CCA0-4681-90D4-F435F05EFD3A} = {24749C86-C5F3-4498-AA8D-2493979F76C9} @@ -213,5 +342,30 @@ Global {DF89E558-10A4-42E8-B438-4C60904F87F4} = {D4B14EC6-CCA0-4681-90D4-F435F05EFD3A} {78D7DC8F-D24B-4160-95F5-7101C17A58BA} = {D4B14EC6-CCA0-4681-90D4-F435F05EFD3A} {05FB934F-D2CE-420F-9DAA-E7EE3FC0E381} = {D4B14EC6-CCA0-4681-90D4-F435F05EFD3A} + {A82A2A62-C994-44C2-8B92-A51ADF7B5DFA} = {2A1E29F4-C59C-4AED-B0A9-F3A0124D914D} + {94D3F27A-7662-41DE-859C-21795B49FE8E} = {2A1E29F4-C59C-4AED-B0A9-F3A0124D914D} + {42181CB2-49C9-4B48-84C4-D6B85F4B5EA9} = {A82A2A62-C994-44C2-8B92-A51ADF7B5DFA} + {5C3238CD-D0F4-4D66-BC4F-DE2EF8ED654D} = {A82A2A62-C994-44C2-8B92-A51ADF7B5DFA} + {5ACF0175-128D-4B6C-992B-0F7CE1EA60BD} = {A82A2A62-C994-44C2-8B92-A51ADF7B5DFA} + {7654C29A-BB7B-47D1-B794-6E203BE1B8B0} = {A82A2A62-C994-44C2-8B92-A51ADF7B5DFA} + {3B521757-940A-43A8-8A7E-F8F07231F6F1} = {A82A2A62-C994-44C2-8B92-A51ADF7B5DFA} + {14B130E2-056E-4CF0-A0AE-DB4BFD6D03B0} = {A82A2A62-C994-44C2-8B92-A51ADF7B5DFA} + {0A72F531-6591-487C-8D4D-1EB289450071} = {A82A2A62-C994-44C2-8B92-A51ADF7B5DFA} + {A353A96C-5AB0-4EA1-B2E9-44A277D52129} = {A82A2A62-C994-44C2-8B92-A51ADF7B5DFA} + {BA6086BB-4B5F-4321-832B-06E30824F001} = {A82A2A62-C994-44C2-8B92-A51ADF7B5DFA} + {049D7BF3-1525-4670-8C71-AB3E5EAB7513} = {94D3F27A-7662-41DE-859C-21795B49FE8E} + {D9AF4B16-F480-4167-AB60-6470E64CEA6E} = {94D3F27A-7662-41DE-859C-21795B49FE8E} + {4A0D5B69-AEFE-4966-9237-72AEBBDD8658} = {A353A96C-5AB0-4EA1-B2E9-44A277D52129} + {92AA9CFC-2E35-4063-A681-2748AD6A7DD9} = {A353A96C-5AB0-4EA1-B2E9-44A277D52129} + {F1C98032-7F43-4B91-8A25-6373B892A619} = {A353A96C-5AB0-4EA1-B2E9-44A277D52129} + {9EB296B2-F5D0-42F2-9F1F-0DEE74892FE2} = {92AA9CFC-2E35-4063-A681-2748AD6A7DD9} + {0D3E4178-332A-4A18-9EE0-D0E6E4ED405B} = {92AA9CFC-2E35-4063-A681-2748AD6A7DD9} + {C8E8CE7A-03FA-4525-A4D3-E27EA30128FE} = {92AA9CFC-2E35-4063-A681-2748AD6A7DD9} + {43314E55-D4E3-4219-BBDC-BC022EA5E02D} = {92AA9CFC-2E35-4063-A681-2748AD6A7DD9} + {ACB9F0A6-9FAA-4774-A16E-CF7C7C3404AB} = {F1C98032-7F43-4B91-8A25-6373B892A619} + {08EE6C8E-2132-4A3E-94A4-3C553B6419FA} = {F1C98032-7F43-4B91-8A25-6373B892A619} + {EFE018D6-5039-4772-9323-D8E9D1215477} = {F1C98032-7F43-4B91-8A25-6373B892A619} + {CCDDDECA-8F45-49BB-8A4C-B93993B6FC2D} = {BA6086BB-4B5F-4321-832B-06E30824F001} + {9ECA1863-3440-4BFC-9B5B-259C3FCBB8E5} = {BA6086BB-4B5F-4321-832B-06E30824F001} EndGlobalSection EndGlobal diff --git a/build/vc7/simgrid/simgrid.vcproj b/build/vc7/simgrid/simgrid.vcproj index 33495e53eb..b1a3c8962f 100644 --- a/build/vc7/simgrid/simgrid.vcproj +++ b/build/vc7/simgrid/simgrid.vcproj @@ -54,7 +54,7 @@ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;_WINDOWS;_USRDLL;SIMGRID_EXPORTS;DLL_EXPORT" MinimalRebuild="true" ExceptionHandling="0" - BasicRuntimeChecks="2" + BasicRuntimeChecks="3" RuntimeLibrary="2" BufferSecurityCheck="true" DisableLanguageExtensions="false" @@ -67,7 +67,7 @@ SuppressStartupBanner="true" DebugInformationFormat="4" CompileAs="1" - DisableSpecificWarnings="4127;4996;4244;4715;4090" + DisableSpecificWarnings="4127;4996;4244;4715;4090;4018" OmitDefaultLibName="false" />