Impact of the new context switch implementation on the Visual C++ project of the...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5048 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/build/vc7/simgrid/all.sln b/build/vc7/simgrid/all.sln
index dba2d99..ab36719 100644 (file)
--- a/build/vc7/simgrid/all.sln
+++ b/build/vc7/simgrid/all.sln
@@ -25,6 +25,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sem_basic", "..\examples\xb
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sem_sched", "..\examples\xbt\sem_sched\sem_sched.vcproj", "{A95FC8DF-52C7-45FD-B7D1-D93081DE6BB1}"\r
 EndProject\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sem_sched", "..\examples\xbt\sem_sched\sem_sched.vcproj", "{A95FC8DF-52C7-45FD-B7D1-D93081DE6BB1}"\r
 EndProject\r

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msg_prop", "..\examples\msg\msg_prop\msg_prop.vcproj", "{D8A5626B-3188-4F74-95F0-732F84F53A1C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sd_prop", "..\examples\simdag\sd_prop\sd_prop.vcproj", "{317E8A67-AE41-45F1-85C7-AA4A3A9146D3}"\r
+EndProject\r

 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r


@@ -79,6 +83,14 @@ Global
                {A95FC8DF-52C7-45FD-B7D1-D93081DE6BB1}.Debug|Win32.Build.0 = Debug|Win32\r
                {A95FC8DF-52C7-45FD-B7D1-D93081DE6BB1}.Release|Win32.ActiveCfg = Release|Win32\r
                {A95FC8DF-52C7-45FD-B7D1-D93081DE6BB1}.Release|Win32.Build.0 = Release|Win32\r
                {A95FC8DF-52C7-45FD-B7D1-D93081DE6BB1}.Debug|Win32.Build.0 = Debug|Win32\r
                {A95FC8DF-52C7-45FD-B7D1-D93081DE6BB1}.Release|Win32.ActiveCfg = Release|Win32\r
                {A95FC8DF-52C7-45FD-B7D1-D93081DE6BB1}.Release|Win32.Build.0 = Release|Win32\r

+               {D8A5626B-3188-4F74-95F0-732F84F53A1C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D8A5626B-3188-4F74-95F0-732F84F53A1C}.Debug|Win32.Build.0 = Debug|Win32\r
+               {D8A5626B-3188-4F74-95F0-732F84F53A1C}.Release|Win32.ActiveCfg = Release|Win32\r
+               {D8A5626B-3188-4F74-95F0-732F84F53A1C}.Release|Win32.Build.0 = Release|Win32\r
+               {317E8A67-AE41-45F1-85C7-AA4A3A9146D3}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {317E8A67-AE41-45F1-85C7-AA4A3A9146D3}.Debug|Win32.Build.0 = Debug|Win32\r
+               {317E8A67-AE41-45F1-85C7-AA4A3A9146D3}.Release|Win32.ActiveCfg = Release|Win32\r
+               {317E8A67-AE41-45F1-85C7-AA4A3A9146D3}.Release|Win32.Build.0 = Release|Win32\r

        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/build/vc7/simgrid/simgrid.vcproj b/build/vc7/simgrid/simgrid.vcproj
index eeff406..b226ffb 100644 (file)
--- a/build/vc7/simgrid/simgrid.vcproj
+++ b/build/vc7/simgrid/simgrid.vcproj
@@ -161,6 +161,8 @@
                                ObjectFile=".\Release/"\r
                                ProgramDataBaseFileName=".\Release/"\r
                                SuppressStartupBanner="true"\r
                                ObjectFile=".\Release/"\r
                                ProgramDataBaseFileName=".\Release/"\r
                                SuppressStartupBanner="true"\r

+                               CompileAs="1"\r
+                               DisableSpecificWarnings="4127;4996;4244;4715;4090"\r

                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r


@@ -175,7 +177,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="odbc32.lib odbccp32.lib WSOCK32.LIB"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="odbc32.lib odbccp32.lib WSOCK32.LIB"\r

-                               OutputFile=".\Release/simgrid.dll"\r
+                               OutputFile="c:\windows\system32\simgrid.dll"\r

                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                ProgramDatabaseFile=".\Release/simgrid.pdb"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                ProgramDatabaseFile=".\Release/simgrid.pdb"\r


@@ -237,10 +239,6 @@
                                RelativePath="..\..\..\src\xbt\config.c"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\..\src\xbt\config.c"\r
                                >\r
                        </File>\r

-                       <File\r
-                               RelativePath="..\..\..\src\xbt\context.c"\r
-                               >\r
-                       </File>\r

                        <File\r
                                RelativePath="..\..\..\src\surf\cpu.c"\r
                                >\r
                        <File\r
                                RelativePath="..\..\..\src\surf\cpu.c"\r
                                >\r


@@ -549,6 +547,10 @@
                                RelativePath="..\..\..\src\surf\workstation_ptask_L07.c"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\..\src\surf\workstation_ptask_L07.c"\r
                                >\r
                        </File>\r

+                       <File\r
+                               RelativePath="..\..\..\src\xbt\xbt_context.c"\r
+                               >\r
+                       </File>\r

                        <File\r
                                RelativePath="..\..\..\src\xbt\xbt_log_appender_file.c"\r
                                >\r
                        <File\r
                                RelativePath="..\..\..\src\xbt\xbt_log_appender_file.c"\r
                                >\r