summaryrefslogtreecommitdiffstats
path: root/scilab/Scilab_f2c.sln
diff options
context:
space:
mode:
authorCedric Delamarre <cedric.delamarre@scilab-enterprises.com>2013-09-19 12:08:08 +0200
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2013-09-19 15:36:54 +0200
commitc5a5b89c6cc05526b4b3b6c66da6f01bb2bd3381 (patch)
treea8caa6c9309f0018889dd0609de1fabc797921e1 /scilab/Scilab_f2c.sln
parentfac55ba4d22d19fc31cc28425ce48f8277d4e430 (diff)
parentab8b90bd35023438441e53e4eb62205b64bde367 (diff)
downloadscilab-c5a5b89c6cc05526b4b3b6c66da6f01bb2bd3381.zip
scilab-c5a5b89c6cc05526b4b3b6c66da6f01bb2bd3381.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/Makefile.in scilab/Scilab.sln scilab/Scilab_f2c.sln scilab/Version.incl scilab/aclocal.m4 scilab/configure scilab/etc/modules.xml.in scilab/etc/modules.xml.vc scilab/modules/Makefile.in scilab/modules/compatibility_functions/macros/%b_prod.sci scilab/modules/compatibility_functions/macros/%b_sum.sci scilab/modules/completion/src/c/getfieldsdictionary.c scilab/modules/completion/src/cpp/FieldsManager.cpp scilab/modules/core/src/c/callinterf.c scilab/modules/core/src/c/dynamic_gateways.c scilab/modules/core/src/c/dynamic_gateways.h scilab/modules/core/src/fortran/getfun.f scilab/modules/double/Makefile.in scilab/modules/dynamic_link/macros/windows/dlwGetScilabLibraries.sci scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_cumprod.f scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_cumsum.f scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_sum.f scilab/modules/fileio/includes/mseek.h scilab/modules/fileio/sci_gateway/c/sci_mseek.c scilab/modules/fileio/src/c/mget.c scilab/modules/fileio/src/c/mseek.c scilab/modules/graphics/sci_gateway/c/sci_xget.c scilab/modules/graphics/sci_gateway/c/sci_xset.c scilab/modules/intersci/Makefile.in scilab/modules/io/sci_gateway/c/sci_save.c scilab/modules/io/sci_gateway/fortran/intfile.f scilab/modules/io/src/fortran/newsave.f scilab/modules/localization/Makefile.am scilab/modules/localization/Makefile.in scilab/modules/localization/includes/gw_localization.h scilab/modules/localization/includes/localization.h scilab/modules/localization/sci_gateway/c/gw_localization.c scilab/modules/localization/sci_gateway/c/sci_dgettext.c scilab/modules/localization/sci_gateway/c/sci_gettext.c scilab/modules/localization/src/localization.vcxproj scilab/modules/localization/src/localization.vcxproj.filters scilab/modules/overloading/macros/%hm_prod.sci scilab/modules/overloading/macros/%hm_sum.sci scilab/modules/overloading/macros/%p_prod.sci scilab/modules/overloading/macros/%p_sum.sci scilab/modules/overloading/macros/%sp_prod.sci scilab/modules/overloading/macros/%sp_sum.sci scilab/modules/overloading/macros/%spb_sum.sci scilab/modules/scicos/sci_gateway/c/sci_callblk.c scilab/modules/scicos/sci_gateway/c/sci_model2blk.c scilab/modules/scicos/sci_gateway/c/sci_scicosim.c scilab/modules/spreadsheet/src/c/xls.c scilab/modules/windows_tools/etc/windows_tools.start scilab/modules/windows_tools/src/c/scilab_windows/windows_main.c Change-Id: I76f8722e77b44325cb69e982c6fd7eb771d783ce
Diffstat (limited to 'scilab/Scilab_f2c.sln')
-rw-r--r--scilab/Scilab_f2c.sln16
1 files changed, 16 insertions, 0 deletions
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index ebc8cb3..1c06270 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -593,6 +593,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparse_gw", "modules\sparse
593EndProject 593EndProject
594Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_gw", "modules\core\sci_gateway\cpp\core_gw.vcxproj", "{3E933EB6-D427-4828-9B30-B6B9987491F6}" 594Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_gw", "modules\core\sci_gateway\cpp\core_gw.vcxproj", "{3E933EB6-D427-4828-9B30-B6B9987491F6}"
595EndProject 595EndProject
596Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects_java", "modules\external_objects_java\external_objects_java.vcxproj", "{C51BA525-D7C8-4385-862D-F8E67187B827}"
597EndProject
596Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos-cli", "modules\scicos\src\c\cli\scicos-cli.vcxproj", "{A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}" 598Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos-cli", "modules\scicos\src\c\cli\scicos-cli.vcxproj", "{A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}"
597 ProjectSection(ProjectDependencies) = postProject 599 ProjectSection(ProjectDependencies) = postProject
598 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238} 600 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
@@ -600,6 +602,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos-cli", "modules\scico
600EndProject 602EndProject
601Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks-cli", "modules\scicos_blocks\src\c\cli\scicos_blocks-cli.vcxproj", "{424A5578-BA28-435F-8313-8D85886A3539}" 603Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks-cli", "modules\scicos_blocks\src\c\cli\scicos_blocks-cli.vcxproj", "{424A5578-BA28-435F-8313-8D85886A3539}"
602EndProject 604EndProject
605Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpi", "modules\mpi\mpi.vcxproj", "{5E726409-247A-464A-A994-6E6A7A02A981}"
606EndProject
603Global 607Global
604 GlobalSection(SolutionConfigurationPlatforms) = preSolution 608 GlobalSection(SolutionConfigurationPlatforms) = preSolution
605 Debug|Win32 = Debug|Win32 609 Debug|Win32 = Debug|Win32
@@ -1840,6 +1844,14 @@ Global
1840 {3E933EB6-D427-4828-9B30-B6B9987491F6}.Release|Win32.Build.0 = Release|Win32 1844 {3E933EB6-D427-4828-9B30-B6B9987491F6}.Release|Win32.Build.0 = Release|Win32
1841 {3E933EB6-D427-4828-9B30-B6B9987491F6}.Release|x64.ActiveCfg = Release|x64 1845 {3E933EB6-D427-4828-9B30-B6B9987491F6}.Release|x64.ActiveCfg = Release|x64
1842 {3E933EB6-D427-4828-9B30-B6B9987491F6}.Release|x64.Build.0 = Release|x64 1846 {3E933EB6-D427-4828-9B30-B6B9987491F6}.Release|x64.Build.0 = Release|x64
1847 {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|Win32.ActiveCfg = Debug|Win32
1848 {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|Win32.Build.0 = Debug|Win32
1849 {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|x64.ActiveCfg = Debug|x64
1850 {C51BA525-D7C8-4385-862D-F8E67187B827}.Debug|x64.Build.0 = Debug|x64
1851 {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|Win32.ActiveCfg = Release|Win32
1852 {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|Win32.Build.0 = Release|Win32
1853 {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|x64.ActiveCfg = Release|x64
1854 {C51BA525-D7C8-4385-862D-F8E67187B827}.Release|x64.Build.0 = Release|x64
1843 {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|Win32.ActiveCfg = Debug|Win32 1855 {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|Win32.ActiveCfg = Debug|Win32
1844 {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|Win32.Build.0 = Debug|Win32 1856 {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|Win32.Build.0 = Debug|Win32
1845 {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|x64.ActiveCfg = Debug|x64 1857 {A1CE241B-0FA7-488D-B737-1A1BC0F6A85E}.Debug|x64.ActiveCfg = Debug|x64
@@ -1856,6 +1868,10 @@ Global
1856 {424A5578-BA28-435F-8313-8D85886A3539}.Release|Win32.Build.0 = Release|Win32 1868 {424A5578-BA28-435F-8313-8D85886A3539}.Release|Win32.Build.0 = Release|Win32
1857 {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.ActiveCfg = Release|x64 1869 {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.ActiveCfg = Release|x64
1858 {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.Build.0 = Release|x64 1870 {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.Build.0 = Release|x64
1871 {5E726409-247A-464A-A994-6E6A7A02A981}.Debug|Win32.ActiveCfg = Debug|Win32
1872 {5E726409-247A-464A-A994-6E6A7A02A981}.Debug|x64.ActiveCfg = Debug|x64
1873 {5E726409-247A-464A-A994-6E6A7A02A981}.Release|Win32.ActiveCfg = Release|Win32
1874 {5E726409-247A-464A-A994-6E6A7A02A981}.Release|x64.ActiveCfg = Release|x64
1859 EndGlobalSection 1875 EndGlobalSection
1860 GlobalSection(SolutionProperties) = preSolution 1876 GlobalSection(SolutionProperties) = preSolution
1861 HideSolutionNode = FALSE 1877 HideSolutionNode = FALSE