Merge remote-tracking branch 'origin/master' into JIMS
[scilab.git] / scilab / Scilab.sln
index 9e91685..1e27fd8 100644 (file)
@@ -147,6 +147,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos", "modules\scicos\sr
                {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {566E524B-D327-4416-A865-9C83503FAB7B} = {566E524B-D327-4416-A865-9C83503FAB7B}
                {2F7B6080-8D84-43A7-A967-13FC8AA83DEB} = {2F7B6080-8D84-43A7-A967-13FC8AA83DEB}
+               {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "scicos_f", "modules\scicos\src\fortran\scicos_f.vfproj", "{566E524B-D327-4416-A865-9C83503FAB7B}"
@@ -503,6 +504,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects", "modules
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects_java", "modules\external_objects_java\external_objects_java.vcxproj", "{C51BA525-D7C8-4385-862D-F8E67187B827}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos-cli", "modules\scicos\src\c\cli\scicos-cli.vcxproj", "{A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}"
+       ProjectSection(ProjectDependencies) = postProject
+               {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks-cli", "modules\scicos_blocks\src\c\cli\scicos_blocks-cli.vcxproj", "{424A5578-BA28-435F-8313-8D85886A3539}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -1571,6 +1579,22 @@ Global
                {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|Win32.Build.0 = Release|Win32
                {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|x64.ActiveCfg = Release|x64
                {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|x64.Build.0 = Release|x64
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|Win32.ActiveCfg = Debug|Win32
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|Win32.Build.0 = Debug|Win32
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|x64.ActiveCfg = Debug|x64
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|x64.Build.0 = Debug|x64
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Release|Win32.ActiveCfg = Release|Win32
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Release|Win32.Build.0 = Release|Win32
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Release|x64.ActiveCfg = Release|x64
+               {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Release|x64.Build.0 = Release|x64
+               {424A5578-BA28-435F-8313-8D85886A3539}.Debug|Win32.ActiveCfg = Debug|Win32
+               {424A5578-BA28-435F-8313-8D85886A3539}.Debug|Win32.Build.0 = Debug|Win32
+               {424A5578-BA28-435F-8313-8D85886A3539}.Debug|x64.ActiveCfg = Debug|x64
+               {424A5578-BA28-435F-8313-8D85886A3539}.Debug|x64.Build.0 = Debug|x64
+               {424A5578-BA28-435F-8313-8D85886A3539}.Release|Win32.ActiveCfg = Release|Win32
+               {424A5578-BA28-435F-8313-8D85886A3539}.Release|Win32.Build.0 = Release|Win32
+               {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.ActiveCfg = Release|x64
+               {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE