Merge remote-tracking branch 'origin/master' into YaSp 19/12119/2
Cedric Delamarre [Tue, 23 Jul 2013 12:45:42 +0000 (14:45 +0200)]
Conflicts:
scilab/modules/differential_equations/sci_gateway/fortran/sci_f_bvode.f
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/fileio/sci_gateway/c/sci_removedir.c
scilab/modules/scicos_blocks/src/c/tows_c.c

Change-Id: Ic52b217a9eed4b5315547f60b1a125c186326f49

1  2 
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj.filters
scilab/modules/scicos_blocks/src/c/tows_c.c

Simple merge
@@@ -568,28 -503,12 +572,31 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographic_objects", "modules\graphic_objects\src\nographic_objects\nographic_objects.vcxproj", "{A910BD0C-8FAF-4382-B06A-F767E4752733}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui_gw", "modules\gui\sci_gateway\cpp\gui_gw.vcxproj", "{83C04253-B152-4EF6-BB36-35A7B0FDFB98}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics_gw", "modules\graphics\sci_gateway\cpp\graphics_gw.vcxproj", "{61B23D9B-3F73-4204-98F7-6F41218F4564}"
 +EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "external_objects", "modules\external_objects\external_objects.vcxproj", "{3142E52C-309A-41D9-BD12-7B7E9E3BDD44}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nogui", "modules\gui\src\nogui\nogui.vcxproj", "{58A50B97-FA8D-4700-9E4A-C4993638EB7A}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nohistory_browser", "modules\history_browser\src\nohistory_browser\nohistory_browser.vcxproj", "{6EA99B1F-99B4-4528-8195-7508EF70CFED}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nolibjvm", "modules\jvm\src\nojvm\nojvm.vcxproj", "{889AD61B-12E9-4F85-8525-B83C16C88C3F}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types_gw", "modules\types\sci_gateway\cpp\types_gw.vcxproj", "{C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparse_gw", "modules\sparse\sci_gateway\cpp\sparse_gw.vcxproj", "{7FC7AEC9-4922-4864-83F1-EAED67981AAC}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_gw", "modules\core\sci_gateway\cpp\core_gw.vcxproj", "{3E933EB6-D427-4828-9B30-B6B9987491F6}"
 +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
@@@ -280,4 -264,4 +280,4 @@@ lib /DEF:"$(ProjectDir)differential_equ
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
--</Project>
++</Project>
@@@ -433,6 -433,6 +433,7 @@@ libsciscicos_blocks_algo_la_CPPFLAGS= -
                        -I$(top_srcdir)/modules/renderer/includes/ \
                        -I$(top_srcdir)/modules/scicos/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
++                      -I$(top_srcdir)/modules/operations/includes/ \
                        $(AM_CPPFLAGS)
  
  libsciscicos_blocks_la_CPPFLAGS= -I$(srcdir)/src/jni/ \
@@@ -1236,6 -1229,6 +1236,7 @@@ libsciscicos_blocks_algo_la_CPPFLAGS = 
                        -I$(top_srcdir)/modules/renderer/includes/ \
                        -I$(top_srcdir)/modules/scicos/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
++                      -I$(top_srcdir)/modules/operations/includes/ \
                        $(AM_CPPFLAGS)
  
  libsciscicos_blocks_la_CPPFLAGS = -I$(srcdir)/src/jni/ \
@@@ -76,7 -76,7 +76,7 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
@@@ -112,7 -112,7 +112,7 @@@ lib /DEF:"$(ProjectDir)../elementary_fu
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
@@@ -146,7 -146,7 +146,7 @@@ lib /DEF:"$(ProjectDir)../elementary_fu
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -187,7 -187,7 +187,7 @@@ lib /DEF:"$(ProjectDir)../elementary_fu
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../../includes;../../../src/c;../../../src/cpp;../../../../output_stream/includes;../../../../localization/includes;../../../../graphics/includes;../../../../scicos/includes;../../../../core/includes;../../../../renderer/includes;../../../../elementary_functions/includes;../../../../string/includes;../../../../../libs/intl;../../../../windows_tools/includes;../../../../jvm/includes;../../../src/jni;../../../../../java/jdk/include;../../../../../java/jdk/include/win32;../../../../fileio/includes;../../../../commons/src/jni;../../../../graphic_objects/includes;../../../../api_scilab/includes;../../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -76,7 -76,7 +76,7 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
@@@ -112,7 -112,7 +112,7 @@@ lib /DEF:"$(ProjectDir)elementary_funct
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
@@@ -146,7 -146,7 +146,7 @@@ lib /DEF:"$(ProjectDir)elementary_funct
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -187,7 -187,7 +187,7 @@@ lib /DEF:"$(ProjectDir)elementary_funct
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../string/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes;../../../commons/src/jni;../../../graphic_objects/includes;../../../api_scilab/includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -556,6 -556,6 +556,7 @@@ lib /DEF:"$(ProjectDir)elementary_funct
      <ClInclude Include="..\cpp\scoUtils.h" />
    </ItemGroup>
    <ItemGroup>
++    <None Include="..\..\locales\scicos_blocks.pot" />
      <None Include="elementary_functions_f_Import.def" />
      <None Include="core_import.def" />
      <None Include="Linear_algebra_f_Import.def" />
      </None>
      <None Include="..\..\Makefile.am" />
      <None Include="..\..\scicos_blocks.iss" />
-     <None Include="..\..\locales\scicos_blocks.pot" />
+     <None Include="elementary_functions_f_Import.def">
+       <Filter>Libraries Dependencies\Import</Filter>
+     </None>
++    <None Include="..\..\locales\scicos_blocks.pot">
++      <Filter>localization</Filter>
++    </None>
+     <None Include="polynomials_f_Import.def">
+       <Filter>Libraries Dependencies\Import</Filter>
+     </None>
    </ItemGroup>
    <ItemGroup>
      <ResourceCompile Include="scicos_blocks.rc">
  #include <stdio.h>
  #include <string.h>
  #include <stdlib.h> /* getenv */
- #include "stack-c.h"
+ #include "api_scilab.h"
+ #include "Scierror.h"
 -#include "code2str.h"
 -#include "stack-c.h"
++#include "stack-def.h"
  #include "MALLOC.h"
  #include "sciprint.h"
  #include "cvstr.h"