Merge remote-tracking branch 'origin/master' into yasp 79/12279/2
Antoine ELIAS [Tue, 13 Aug 2013 22:03:07 +0000 (00:03 +0200)]
Conflicts:
scilab/modules/action_binding/src/jni/InterpreterManagement_wrap.c
scilab/modules/commons/src/jni/CommonFileUtils_wrap.c
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/completion/src/jni/Completion_wrap.c
scilab/modules/console/src/jni/DropFiles_wrap.c
scilab/modules/console/src/jni/GuiManagement_wrap.c
scilab/modules/core/includes/returnProperty.h
scilab/modules/core/src/c/returnProperty.c
scilab/modules/double/src/c/double.vcxproj
scilab/modules/double/src/fortran/double_f2c.vcxproj
scilab/modules/dynamic_link/src/fortran/dynamic_link_f2c.vcxproj
scilab/modules/fileio/fileio.vcxproj
scilab/modules/functions/src/fortran/functions_f2c.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/jni/DataLoader_wrap.c
scilab/modules/graphic_objects/src/jni/ScilabNativeView_wrap.c
scilab/modules/graphics/core_Import.def
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/sci_gateway/c/sci_matplot.c
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.h
scilab/modules/gui/src/jni/ScilabTermination_wrap.c
scilab/modules/history_manager/src/jni/HistoryManagement_wrap.c
scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcxproj
scilab/modules/intersci/src/exe/interscin/interscin.vcxproj
scilab/modules/intersci/src/lib/intersci.vcxproj
scilab/modules/io/src/fortran/io_f2c.vcxproj
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/localization/src/jni/LocaleToLCID_wrap.c
scilab/modules/localization/src/jni/Messages_wrap.c
scilab/modules/localization/src/jni/setdefaultlanguage_wrap.c
scilab/modules/scinotes/src/jni/ScilabKeywords_wrap.c
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/string/src/fortran/string_f2c.vcxproj
scilab/modules/types/src/cpp/ScilabToJava.cpp
scilab/modules/types/src/jni/ScilabVariables.giws.xml
scilab/modules/types/src/jni/getScilabVariable_wrap.c
scilab/modules/types/types.vcxproj
scilab/modules/ui_data/src/jni/ui_data_wrap.c
scilab/tools/Dumpexts/winDumpExts.c

Change-Id: I50ce66384949ac2604788f83f682da094ac6b819

175 files changed:
1  2 
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/libs/GetWindowsVersion/GetWindowsVersion.vcxproj
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj
scilab/modules/action_binding/src/c/action_binding.vcxproj
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/includes/returnProperty.h
scilab/modules/api_scilab/src/cpp/returnProperty.cpp
scilab/modules/arnoldi/arnoldi.vcxproj
scilab/modules/ast/ast-tools/ast-tools.vcxproj
scilab/modules/ast/ast.vcxproj
scilab/modules/boolean/src/c/boolean.vcxproj
scilab/modules/boolean/src/cpp/boolean_gw.vcxproj
scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj
scilab/modules/cacsd/src/c/cacsd.vcxproj
scilab/modules/cacsd/src/fortran/cacsd_f2c.vcxproj
scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcxproj
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/completion/src/c/completion.vcxproj
scilab/modules/completion/src/nocompletion/nocompletion.vcxproj
scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/core/sci_gateway/cpp/core_gw.vcxproj
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/fortran/core_f2c.vcxproj
scilab/modules/data_structures/src/c/data_structures.vcxproj
scilab/modules/data_structures/src/fortran/data_structures_f2c.vcxproj
scilab/modules/differential_equations/sci_gateway/differential_equations_gw.vcxproj
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcxproj
scilab/modules/dynamic_link/macros/windows/dlwGetSdkPath.sci
scilab/modules/dynamic_link/sci_gateway/cpp/dynamic_link_gw.vcxproj
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcxproj
scilab/modules/external_objects/external_objects.vcxproj
scilab/modules/fftw/fftw.vcxproj
scilab/modules/fftw/src/nofftw/nofftw.vcxproj
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcxproj
scilab/modules/functions/sci_gateway/cpp/functions_gw.vcxproj
scilab/modules/functions/scripts/buildmacros/BuildMacros.vcxproj
scilab/modules/functions/src/c/functions.vcxproj
scilab/modules/functions_manager/functions_manager.vcxproj
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_export/src/nographic_export/nographic_export.vcxproj
scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoaderJNI.java
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/sci_gateway/c/sci_matplot.c
scilab/modules/graphics/sci_gateway/c/sci_matplot1.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj
scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c
scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/get_data_property.h
scilab/modules/graphics/src/c/getHandleProperty/get_image_type_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_data_property.c
scilab/modules/graphics/src/c/getHandleProperty/set_image_type_property.c
scilab/modules/graphics/src/nographics/nographics.vcxproj
scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/nogui/nogui.vcxproj
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/helptools/src/BuildChm/BuildChm.vcxproj
scilab/modules/helptools/src/BuildHelp.vcxproj
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/history_browser/src/c/history_browser.vcxproj
scilab/modules/history_manager/sci_gateway/cpp/history_manager_gw.vcxproj
scilab/modules/history_manager/src/c/history_manager.vcxproj
scilab/modules/integer/src/c/integer.vcxproj
scilab/modules/integer/src/cpp/integer_gw.vcxproj
scilab/modules/interpolation/src/c/interpolation.vcxproj
scilab/modules/io/src/c/io.vcxproj
scilab/modules/io/src/cpp/io_gw.vcxproj
scilab/modules/javasci/Javasci.vcxproj
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_Scilab.java
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_ScilabJNI.java
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/javasci/tests/java/javasci-JAVA-tests.vcxproj
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj
scilab/modules/jvm/src/nojvm/nojvm.vcxproj
scilab/modules/linear_algebra/sci_gateway/cpp/linear_algebra_gw.vcxproj
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/linear_algebra/src/fortran/linear_algebra_f2c.vcxproj
scilab/modules/localization/sci_gateway/cpp/localization_gw.vcxproj
scilab/modules/localization/src/localization.vcxproj
scilab/modules/matio/matio.vcxproj
scilab/modules/matio/sci_gateway/cpp/matio_gw.vcxproj
scilab/modules/mexlib/src/libmat/libmat.vcxproj
scilab/modules/mexlib/src/libmex/libmex.vcxproj
scilab/modules/mexlib/src/libmx/libmx.vcxproj
scilab/modules/operations/operations.vcxproj
scilab/modules/optimization/src/c/optimization.vcxproj
scilab/modules/optimization/src/fortran/optimization_f2c.vcxproj
scilab/modules/output_stream/sci_gateway/cpp/output_stream_gw/output_stream_gw.vcxproj
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/output_stream/src/fortran/output_stream_f2c.vcxproj
scilab/modules/parallel/src/c/parallel.vcxproj
scilab/modules/parameters/parameters.vcxproj
scilab/modules/parse/parse.vcxproj
scilab/modules/polynomials/src/c/polynomials.vcxproj
scilab/modules/polynomials/src/fortran/polynomials_f2c.vcxproj
scilab/modules/preferences/src/c/preferences.vcxproj
scilab/modules/randlib/src/c/randlib.vcxproj
scilab/modules/randlib/src/norandlib/norandlib.vcxproj
scilab/modules/renderer/renderer.vcxproj
scilab/modules/scicos/src/c/noscicos/noscicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/scinotes/src/c/scinotes.vcxproj
scilab/modules/signal_processing/sci_gateway/cpp/signal_processing_gw.vcxproj
scilab/modules/signal_processing/src/c/signal_processing.vcxproj
scilab/modules/signal_processing/src/fortran/signal_processing_f2c.vcxproj
scilab/modules/sound/sound.vcxproj
scilab/modules/sound/src/nosound/nosound.vcxproj
scilab/modules/sparse/sci_gateway/cpp/sparse_gw.vcxproj
scilab/modules/sparse/src/c/sparse.vcxproj
scilab/modules/sparse/src/fortran/sparse_f2c.vcxproj
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/spreadsheet/spreadsheet.vcxproj.filters
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcxproj
scilab/modules/statistics/sci_gateway/cpp/statistics_gw.vcxproj
scilab/modules/statistics/src/c/statistics.vcxproj
scilab/modules/string/sci_gateway/cpp/string_gw.vcxproj
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/symbol/symbol.vcxproj
scilab/modules/symbolic/src/c/symbolic.vcxproj
scilab/modules/system_env/system_env.vcxproj
scilab/modules/tclsci/tclsci.vcxproj
scilab/modules/threads/threads.vcxproj
scilab/modules/time/sci_gateway/cpp/time_gw.vcxproj
scilab/modules/time/time.vcxproj
scilab/modules/types/sci_gateway/cpp/types_gw.vcxproj
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariable.java
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariableJNI.java
scilab/modules/types/src/jni/ScilabVariables.cpp
scilab/modules/types/src/jni/ScilabVariables.giws.xml
scilab/modules/types/src/jni/ScilabVariables.hxx
scilab/modules/types/src/jni/ScilabVariablesRefresh.cpp
scilab/modules/types/src/jni/ScilabVariablesRefresh.hxx
scilab/modules/types/types.vcxproj
scilab/modules/types/typesjni/typesjni.vcxproj
scilab/modules/types/typesjni/typesjni.vcxproj.filters
scilab/modules/types/typesmacro/typesmacro.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/umfpack/src/c/umfpack.vcxproj
scilab/modules/umfpack/src/noumfpack/noumfpack.vcxproj
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj
scilab/modules/windows_tools/src/c/windows_tools.vcxproj
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.vcxproj
scilab/modules/xcos/src/c/xcos.vcxproj
scilab/modules/xml/xml.vcxproj
scilab/tools/Dumpexts/Dumpexts.vcxproj
scilab/tools/localization/generatePoFile.vcxproj

@@@ -50,15 -44,13 +50,13 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
                {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8}
                {BC462A57-C5B3-4F93-8067-80363827DCDA} = {BC462A57-C5B3-4F93-8067-80363827DCDA}
                {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
-               {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
 -              {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315}
 +              {273B1F5C-C137-46D1-B516-FFE5764FABE5} = {273B1F5C-C137-46D1-B516-FFE5764FABE5}
                {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A}
                {A824EA62-AF07-4F43-9036-0E63990556BD} = {A824EA62-AF07-4F43-9036-0E63990556BD}
                {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
                {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
 +              {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
                {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
-               {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
                {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
                {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604} = {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
@@@ -600,6 -512,6 +593,10 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  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
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giws-all", "Visual-Studio-settings\giws-all\giws-all.vcxproj", "{88E95224-A931-4B3E-AC6C-5A40B3961421}"
++EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "typesjni", "modules\types\typesjni\typesjni.vcxproj", "{FC2F9DEC-EF14-401B-A0A9-CCD88552A359}"
++EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|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
++              {88E95224-A931-4B3E-AC6C-5A40B3961421}.Debug|Win32.ActiveCfg = Debug|Win32
++              {88E95224-A931-4B3E-AC6C-5A40B3961421}.Debug|x64.ActiveCfg = Debug|x64
++              {88E95224-A931-4B3E-AC6C-5A40B3961421}.Release|Win32.ActiveCfg = Release|Win32
++              {88E95224-A931-4B3E-AC6C-5A40B3961421}.Release|x64.ActiveCfg = Release|x64
++              {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Debug|Win32.ActiveCfg = Debug|Win32
++              {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Debug|Win32.Build.0 = Debug|Win32
++              {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Debug|x64.ActiveCfg = Debug|x64
++              {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Debug|x64.Build.0 = Debug|x64
++              {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Release|Win32.ActiveCfg = Release|Win32
++              {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Release|Win32.Build.0 = Release|Win32
++              {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Release|x64.ActiveCfg = Release|x64
++              {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
Simple merge
index 25d2dd0,0000000..7c76aa0
mode 100644,000000..100644
--- /dev/null
@@@ -1,295 -1,0 +1,299 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{3419B733-85A2-4F66-BC04-A5A8DC8FA057}</ProjectGuid>
 +    <RootNamespace>action_binding_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sci$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sci$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">sci$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">sci$(ProjectName)</TargetName>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +    <PostBuildEvent>
 +      <Command>
 +      </Command>
 +    </PostBuildEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +    <PostBuildEvent>
 +      <Command>
 +      </Command>
 +    </PostBuildEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +    <PostBuildEvent>
 +      <Command>
 +      </Command>
 +    </PostBuildEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +    <PostBuildEvent>
 +      <Command>
 +      </Command>
 +    </PostBuildEvent>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="sci_notify.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\action_binding_gw.hxx" />
 +    <ClInclude Include="..\..\includes\dynlib_action_binding_gw.h" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\commons\src\c\commons.vcxproj">
 +      <Project>{eca09a1e-6d12-4a47-92e1-a671c181df77}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\jvm\libjvm.vcxproj">
 +      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\src\c\action_binding.vcxproj">
 +      <Project>{8a654cc5-22c1-4972-a8cf-1b89f78b5383}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index b0e5767,0000000..0629dc1
mode 100644,000000..100644
--- /dev/null
@@@ -1,125 -1,0 +1,187 @@@
 +/*
 + * Scilab (http://www.scilab.org/ ) - This file is part of Scilab
 + * Copyright (C) 2006 - INRIA - Jean-Baptiste SILVY
 + *
 + * This file must be used under the terms of the CeCILL.
 + * This source file is licensed as described in the file COPYING, which
 + * you should have received as part of this distribution.  The terms
 + * are also available at
 + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 + *
 + */
 +/*------------------------------------------------------------------------*/
 +/* file: returnProperty.h                                                 */
 +/* desc : a set of functions used to return values in Scilab              */
 +/*------------------------------------------------------------------------*/
 +
 +#ifndef _RETURN_PROPERTY_H_
 +#define _RETURN_PROPERTY_H_
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
 +#include "dynlib_api_scilab.h"
 +
 +
 +    /**
 +     * create an empty matrix in the scilab stack in order to see it in the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnEmptyMatrix();
 +
 +    /**
 +     * copy the string value in the scilab stack in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnString(const char * value ) ;
 +
 +    /**
 +     * copy a char value into a scilab string in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnChar(char value ) ;
 +
 +    /**
 +     * copy a single double in the scilab stack in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnDouble(double value ) ;
 +
 +    /**
 +     * copy a single int in the scilab stack in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnInt(int value ) ;
 +
 +    /**
 +     * copy a double array into a row vector in the scilab stack in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnRowVector(const double values[], int nbValues ) ;
 +
 +    /**
 +    * copy a int array into a row vector (of double) in the scilab stack
 +    * in order to see it the console.
 +    * @return 0 if the function was executed correctly, -1 if an error occurred.
 +    */
 +    void* sciReturnRowVectorFromInt(const int values[], int nbValues ) ;
 +
 +    /**
 +     * copy an int array into an int row vector in the scilab stack
 +     * in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnRowIntVector(const int values[], int nbValues ) ;
 +
 +    /**
 +     * copy a char * array into an string row vector in the scilab stack
 +     * in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnRowStringVector(char * values[], int nbValues ) ;
 +
 +    /**
 +     * copy a handle in the scilab stack in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnHandle(long handle ) ;
 +
 +    /**
 +     * copy an handle array into a row vector in the scilab stack in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnRowHandleVector(const long handles[], int nbValues ) ;
 +
 +    /**
 +    * copy an handle array into a col vector in the scilab stack in order to see it the console.
 +    * @return 0 if the function was executed correctly, -1 if an error occurred.
 +    */
 +    void* sciReturnColHandleVector(const long handles[], int nbValues ) ;
 +
 +    /**
 +     * copy a matrix stored has a double array
 +     * into a Scilab matrix in the stack in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnMatrix(double values[], int nbRow, int nbCol ) ;
 +
 +    /**
 +     * copy a matrix stored has a char * array
 +     * into a Scilab string matrix in the stack in order to see it the console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnStringMatrix(char * values[], int nbRow, int nbCol ) ;
 +
 +    /**
 +     * return user data in the scilab console.
 +     * @return 0 if the function was executed correctly, -1 if an error occurred.
 +     */
 +    void* sciReturnUserData(const int * userData, int userDataSize ) ;
 +
++    /**
++     * copy a matrix stored has a double hypermatrix
++     * into a Scilab matrix in the stack in order to see it the console.
++     * @return 0 if the function was executed correctly, -1 if an error occurred.
++     */
++    void* sciReturnHypermatOfDouble(int dims[], int ndims, double values[]);
++
++    /**
++     * copy a matrix stored has a int8 hypermatrix
++     * into a Scilab matrix in the stack in order to see it the console.
++     * @return 0 if the function was executed correctly, -1 if an error occurred.
++     */
++    void* sciReturnHypermatOfInteger8(int dims[], int ndims, char values[]);
++
++    /**
++     * copy a matrix stored has a uint8 hypermatrix
++     * into a Scilab matrix in the stack in order to see it the console.
++     * @return 0 if the function was executed correctly, -1 if an error occurred.
++     */
++    void* sciReturnHypermatOfUnsignedInteger8(int dims[], int ndims, unsigned char values[]);
++
++    /**
++     * copy a matrix stored has a int8 array
++     * into a Scilab matrix in the stack in order to see it the console.
++     * @return 0 if the function was executed correctly, -1 if an error occurred.
++     */
++    void* sciReturnMatrixOfInteger8(char values[], int nbRow, int nbCol);
++
++    /**
++     * copy a matrix stored has a uint8 array
++     * into a Scilab matrix in the stack in order to see it the console.
++     * @return 0 if the function was executed correctly, -1 if an error occurred.
++     */
++    void* sciReturnMatrixOfUnsignedInteger8(unsigned char values[], int nbRow, int nbCol);
++
++    /**
++     * copy a matrix stored has a int16 array
++     * into a Scilab matrix in the stack in order to see it the console.
++     * @return 0 if the function was executed correctly, -1 if an error occurred.
++     */
++    void* sciReturnMatrixOfInteger16(short values[], int nbRow, int nbCol);
++
++    /**
++     * copy a matrix stored has a uint16 array
++     * into a Scilab matrix in the stack in order to see it the console.
++     * @return 0 if the function was executed correctly, -1 if an error occurred.
++     */
++    void* sciReturnMatrixOfUnsignedInteger16(unsigned short values[], int nbRow, int nbCol);
++
++    /**
++     * copy a matrix stored has a int32 array
++     * into a Scilab matrix in the stack in order to see it the console.
++     * @return 0 if the function was executed correctly, -1 if an error occurred.
++     */
++    void* sciReturnMatrixOfInteger32(int values[], int nbRow, int nbCol);
++
++    /**
++     * copy a matrix stored has a uint32 array
++     * into a Scilab matrix in the stack in order to see it the console.
++     * @return 0 if the function was executed correctly, -1 if an error occurred.
++     */
++    void* sciReturnMatrixOfUnsignedInteger32(unsigned int values[], int nbRow, int nbCol);
 +#ifdef __cplusplus
 +}
 +#endif
 +#endif /* _RETURN_PROPERTY_H_ */
index b277936,0000000..21493d2
mode 100644,000000..100644
--- /dev/null
@@@ -1,221 -1,0 +1,329 @@@
 +/*
 + * Scilab (http://www.scilab.org/) - This file is part of Scilab
 + * Copyright (C) 2006 - INRIA - Jean-Baptiste SILVY
 + *
 + * This file must be used under the terms of the CeCILL.
 + * This source file is licensed as described in the file COPYING, which
 + * you should have received as part of this distribution.  The terms
 + * are also available at
 + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 + *
 + */
 +/*------------------------------------------------------------------------*/
 +/* file: returnProperty.c                                                 */
 +/* desc : a set of functions used to return values in Scilab              */
 +/*------------------------------------------------------------------------*/
 +
 +//#include "api_scilab.h"
 +#include "returnProperty.h"
 +#include <string.h>
 +#include "MALLOC.h"
 +#include "double.hxx"
 +#include "string.hxx"
 +#include "graphichandle.hxx"
 +
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnEmptyMatrix()
 +{
 +    //createEmptyMatrix(_pvCtx, nbInputArgument(_pvCtx) + 1);
 +    return types::Double::Empty();
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnString(const char * value)
 +{
 +    //createSingleString(_pvCtx, nbInputArgument(_pvCtx) + 1, value)
 +    return new types::String(value);
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnChar(char value)
 +{
 +    //createSingleString(_pvCtx, nbInputArgument(_pvCtx) + 1, pstValue)
 +    char pstValue[2] = {value, 0};//createSingleString needs null terminated characters string
 +    return new types::String(pstValue);
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnDouble(double value)
 +{
 +    //createScalarDouble(_pvCtx, nbInputArgument(_pvCtx) + 1, value)
 +    return new types::Double(value);
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnInt(int value)
 +{
 +    return sciReturnDouble((double)value);
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnRowVector(const double values[], int nbValues)
 +{
 +    //SciErr sciErr = createMatrixOfDouble(_pvCtx, nbInputArgument(_pvCtx) + 1, 1, nbValues, values);
 +    //if (sciErr.iErr)
 +    //{
 +    //    printError(&sciErr, 0);
 +    //    return 1;
 +    //}
 +
 +    //return 0;
 +
 +    double* pdbl = NULL;
 +    types::Double* pD = new types::Double(1, nbValues, &pdbl);
 +    for (int i = 0 ; i < nbValues ; i++)
 +    {
 +        pdbl[i] = values[i];
 +    }
 +    return pD;
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnRowVectorFromInt(const int values[], int nbValues)
 +{
 +    //SciErr sciErr = createMatrixOfDoubleAsInteger(_pvCtx, nbInputArgument(_pvCtx) + 1, 1, nbValues, values);
 +    //if (sciErr.iErr)
 +    //{
 +    //    printError(&sciErr, 0);
 +    //    return 1;
 +    //}
 +
 +    //return 0;
 +
 +    double* pdbl = NULL;
 +    types::Double* pD = new types::Double(1, nbValues, &pdbl);
 +    for (int i = 0 ; i < nbValues ; i++)
 +    {
 +        pdbl[i] = (double)values[i];
 +    }
 +    return pD;
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnRowIntVector(const int values[], int nbValues)
 +{
 +    return sciReturnRowVectorFromInt(values, nbValues);
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnRowStringVector(char * values[], int nbValues)
 +{
 +    return sciReturnStringMatrix(values, 1, nbValues);
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnHandle(long handle)
 +{
 +    //createScalarHandle(_pvCtx, nbInputArgument(_pvCtx) + 1, handle)
 +    return new types::GraphicHandle(handle);
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnRowHandleVector(const long handles[], int nbValues)
 +{
 +    //int i = 0;
 +    //long long* pH = NULL;
 +    //SciErr sciErr = allocMatrixOfHandle(_pvCtx, nbInputArgument(_pvCtx) + 1, 1, nbValues, &pH);
 +    //if (sciErr.iErr)
 +    //{
 +    //    printError(&sciErr, 0);
 +    //    return 1;
 +    //}
 +
 +    //for (i = 0 ; i < nbValues ; i++)
 +    //{
 +    //    pH[i] = handles[i];
 +    //}
 +
 +    //return 0;
 +
 +    types::GraphicHandle* pH = new types::GraphicHandle(1, nbValues);
 +    long long* pHandle = pH->get();
 +    for (int i = 0 ; i < nbValues ; i++)
 +    {
 +        pHandle[i] = (long long)handles[i];
 +    }
 +    return pH;
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnColHandleVector(const long handles[], int nbValues)
 +{
 +    //int i = 0;
 +    //long long* pH = NULL;
 +    //SciErr sciErr = allocMatrixOfHandle(_pvCtx, nbInputArgument(_pvCtx) + 1, nbValues, 1, &pH);
 +    //if (sciErr.iErr)
 +    //{
 +    //    printError(&sciErr, 0);
 +    //    return 1;
 +    //}
 +
 +    //for (i = 0 ; i < nbValues ; i++)
 +    //{
 +    //    pH[i] = handles[i];
 +    //}
 +
 +    //return 0;
 +    types::GraphicHandle* pH = new types::GraphicHandle(nbValues, 1);
 +    long long* pHandle = pH->get();
 +    for (int i = 0 ; i < nbValues ; i++)
 +    {
 +        pHandle[i] = (long long)handles[i];
 +    }
 +    return pH;
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnMatrix(double values[], int nbRow, int nbCol)
 +{
 +    //SciErr sciErr = createMatrixOfDouble(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
 +    //if (sciErr.iErr)
 +    //{
 +    //    printError(&sciErr, 0);
 +    //    return 1;
 +    //}
 +
 +    //return 0;
 +    double* pdbl = NULL;
 +    types::Double* pD = new types::Double(nbRow, nbCol, &pdbl);
 +    for (int i = 0 ; i < nbRow * nbCol ; i++)
 +    {
 +        pdbl[i] = values[i];
 +    }
 +    return pD;
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnStringMatrix(char * values[], int nbRow, int nbCol)
 +{
 +    //SciErr sciErr = createMatrixOfString(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
 +    //if (sciErr.iErr)
 +    //{
 +    //    printError(&sciErr, 0);
 +    //    return 1;
 +    //}
 +
 +    //return 0;
 +
 +    types::String* pS = new types::String(nbRow, nbCol);
 +    for (int i = 0 ; i < nbRow * nbCol ; i++)
 +    {
 +        wchar_t* pwstValue = to_wide_string(values[i]);
 +        pS->set(i, pwstValue);
 +        FREE(pwstValue);
 +    }
 +    return pS;
 +}
 +/*--------------------------------------------------------------------------*/
 +void* sciReturnUserData(const int * userData, int userDataSize)
 +{
 +    //take care of 32 and 64 bits arch.
 +    if (userDataSize == 1)
 +    {
 +        //32 bits
 +        int* p = (int*)userData;
 +        return ((types::InternalType*) * p);
 +    }
 +    else
 +    {
 +        //64 bits
 +        long long* p = (long long*)userData;
 +        return ((types::InternalType*) * p);
 +    }
 +}
 +/*--------------------------------------------------------------------------*/
++void* sciReturnHypermatOfDouble(int dims[], int ndims, double values[])
++{
++    //SciErr sciErr = createHypermatOfDouble(_pvCtx, nbInputArgument(_pvCtx) + 1, dims, ndims, values);
++    //if (sciErr.iErr)
++    //{
++    //    printError(&sciErr, 0);
++    //    return 1;
++    //}
++
++    return 0;
++}
++/*--------------------------------------------------------------------------*/
++void* sciReturnHypermatOfInteger8(int dims[], int ndims, char values[])
++{
++    //SciErr sciErr = createHypermatOfInteger8(_pvCtx, nbInputArgument(_pvCtx) + 1, dims, ndims, values);
++    //if (sciErr.iErr)
++    //{
++    //    printError(&sciErr, 0);
++    //    return 1;
++    //}
++
++    return 0;
++}
++/*--------------------------------------------------------------------------*/
++void* sciReturnHypermatOfUnsignedInteger8(int dims[], int ndims, unsigned char values[])
++{
++    //SciErr sciErr = createHypermatOfUnsignedInteger8(_pvCtx, nbInputArgument(_pvCtx) + 1, dims, ndims, values);
++    //if (sciErr.iErr)
++    //{
++    //    printError(&sciErr, 0);
++    //    return 1;
++    //}
++
++    return 0;
++}
++/*--------------------------------------------------------------------------*/
++void* sciReturnMatrixOfInteger8(char values[], int nbRow, int nbCol)
++{
++    //SciErr sciErr = createMatrixOfInteger8(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
++    //if (sciErr.iErr)
++    //{
++    //    printError(&sciErr, 0);
++    //    return 1;
++    //}
++
++    return 0;
++}
++/*--------------------------------------------------------------------------*/
++void* sciReturnMatrixOfUnsignedInteger8(unsigned char values[], int nbRow, int nbCol)
++{
++    //SciErr sciErr = createMatrixOfUnsignedInteger8(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
++    //if (sciErr.iErr)
++    //{
++    //    printError(&sciErr, 0);
++    //    return 1;
++    //}
++
++    return 0;
++}
++/*--------------------------------------------------------------------------*/
++void* sciReturnMatrixOfInteger16(short values[], int nbRow, int nbCol)
++{
++    //SciErr sciErr = createMatrixOfInteger16(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
++    //if (sciErr.iErr)
++    //{
++    //    printError(&sciErr, 0);
++    //    return 1;
++    //}
++
++    return 0;
++}
++/*--------------------------------------------------------------------------*/
++void* sciReturnMatrixOfUnsignedInteger16(unsigned short values[], int nbRow, int nbCol)
++{
++    //SciErr sciErr = createMatrixOfUnsignedInteger16(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
++    //if (sciErr.iErr)
++    //{
++    //    printError(&sciErr, 0);
++    //    return 1;
++    //}
++
++    return 0;
++}
++/*--------------------------------------------------------------------------*/
++void* sciReturnMatrixOfInteger32(int values[], int nbRow, int nbCol)
++{
++    //SciErr sciErr = createMatrixOfInteger32(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
++    //if (sciErr.iErr)
++    //{
++    //    printError(&sciErr, 0);
++    //    return 1;
++    //}
++
++    return 0;
++}
++/*--------------------------------------------------------------------------*/
++void* sciReturnMatrixOfUnsignedInteger32(unsigned int values[], int nbRow, int nbCol)
++{
++    //SciErr sciErr = createMatrixOfUnsignedInteger32(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
++    //if (sciErr.iErr)
++    //{
++    //    printError(&sciErr, 0);
++    //    return 1;
++    //}
++
++    return 0;
++}
++/*--------------------------------------------------------------------------*/
index bbc669d,0000000..ef4bcf8
mode 100644,000000..100644
--- /dev/null
@@@ -1,206 -1,0 +1,210 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{1F4A0344-99ED-461B-BD53-1593788FB34D}</ProjectGuid>
 +    <RootNamespace>ast_tools</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +    <ProjectName>ast-tools</ProjectName>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>..\includes;..\..\symbol\includes;..\..\types\includes;..\..\functions_manager\includes;..\../core/includes;..\..\elementary_functions\includes;..\../operations/includes;..\../localization/includes;..\../../libs/intl;..\../output_stream/includes;..\../system_env/includes;..\../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AST_TOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilocalization.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)system_env.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)core_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>core.lib;system_env.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>..\includes;..\..\symbol\includes;..\..\types\includes;..\..\functions_manager\includes;..\../core/includes;..\..\elementary_functions\includes;..\../operations/includes;..\../localization/includes;..\../../libs/intl;..\../output_stream/includes;..\../system_env/includes;..\../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AST_TOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilocalization.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)system_env.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)core_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>core.lib;system_env.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>..\includes;..\..\symbol\includes;..\..\types\includes;..\..\functions_manager\includes;..\../core/includes;..\..\elementary_functions\includes;..\../operations/includes;..\../localization/includes;..\../../libs/intl;..\../output_stream/includes;..\../system_env/includes;..\../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AST_TOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilocalization.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)system_env.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)core_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>core.lib;system_env.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>..\includes;..\..\symbol\includes;..\..\types\includes;..\..\functions_manager\includes;..\../core/includes;..\..\elementary_functions\includes;..\../operations/includes;..\../localization/includes;..\../../libs/intl;..\../output_stream/includes;..\../system_env/includes;..\../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AST_TOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)Localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scilocalization.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)system_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)system_env.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)core_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>core.lib;system_env.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\src\cpp\scilabexception.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\includes\dynlib_ast_tools.hxx" />
 +    <ClInclude Include="..\includes\scilabexception.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <None Include="core_Import.def" />
 +    <None Include="Localization_Import.def" />
 +    <None Include="system_env_Import .def" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\..\bin\lapack.lib" />
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index 1528db2,0000000..c4ebf0f
mode 100644,000000..100644
--- /dev/null
@@@ -1,306 -1,0 +1,310 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{0D3FA25B-8116-44EC-A45E-260789DAA3D9}</ProjectGuid>
 +    <RootNamespace>ast</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>includes;../symbol/includes;../types/includes;../functions_manager/includes;../core/includes;../elementary_functions/includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/Eigen/includes;../console/includes;../graphic_objects/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
 +      <AdditionalDependencies>core.lib;$(SolutionDir)bin\types.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>includes;../symbol/includes;../types/includes;../functions_manager/includes;../core/includes;../elementary_functions/includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/Eigen/includes;../console/includes;../graphic_objects/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
 +      <AdditionalDependencies>core.lib;$(SolutionDir)bin\types.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>includes;../symbol/includes;../types/includes;../functions_manager/includes;../core/includes;../elementary_functions/includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/Eigen/includes;../console/includes;../graphic_objects/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
 +      <AdditionalDependencies>core.lib;$(SolutionDir)bin\types.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>includes;../symbol/includes;../types/includes;../functions_manager/includes;../core/includes;../elementary_functions/includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/Eigen/includes;../console/includes;../graphic_objects/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
 +      <AdditionalDependencies>core.lib;$(SolutionDir)bin\types.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="src\cpp\debugvisitor.cpp" />
 +    <ClCompile Include="src\cpp\libAst.cpp" />
 +    <ClCompile Include="src\cpp\macrovarvisitor.cpp" />
 +    <ClCompile Include="src\cpp\mutevisitor.cpp" />
 +    <ClCompile Include="src\cpp\printvisitor.cpp" />
 +    <ClCompile Include="src\cpp\shortcutvisitor.cpp" />
 +    <ClCompile Include="src\cpp\visitor_common.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="includes\all.hxx" />
 +    <ClInclude Include="includes\alldec.hxx" />
 +    <ClInclude Include="includes\allexp.hxx" />
 +    <ClInclude Include="includes\allvar.hxx" />
 +    <ClInclude Include="includes\anydecs.hxx" />
 +    <ClInclude Include="includes\arraylistexp.hxx" />
 +    <ClInclude Include="includes\arraylistvar.hxx" />
 +    <ClInclude Include="includes\assignexp.hxx" />
 +    <ClInclude Include="includes\assignlistexp.hxx" />
 +    <ClInclude Include="includes\ast.hxx" />
 +    <ClInclude Include="includes\boolexp.hxx" />
 +    <ClInclude Include="includes\breakexp.hxx" />
 +    <ClInclude Include="includes\callexp.hxx" />
 +    <ClInclude Include="includes\caseexp.hxx" />
 +    <ClInclude Include="includes\cellcallexp.hxx" />
 +    <ClInclude Include="includes\cellexp.hxx" />
 +    <ClInclude Include="includes\colonvar.hxx" />
 +    <ClInclude Include="includes\commentexp.hxx" />
 +    <ClInclude Include="includes\constexp.hxx" />
 +    <ClInclude Include="includes\continueexp.hxx" />
 +    <ClInclude Include="includes\controlexp.hxx" />
 +    <ClInclude Include="includes\debugvisitor.hxx" />
 +    <ClInclude Include="includes\dec.hxx" />
 +    <ClInclude Include="includes\decls.hxx" />
 +    <ClInclude Include="includes\decs.hxx" />
 +    <ClInclude Include="includes\dollarvar.hxx" />
 +    <ClInclude Include="includes\doubleexp.hxx" />
 +    <ClInclude Include="includes\dummyvisitor.hxx" />
 +    <ClInclude Include="includes\execvisitor.hxx" />
 +    <ClInclude Include="includes\exp.hxx" />
 +    <ClInclude Include="includes\fieldexp.hxx" />
 +    <ClInclude Include="includes\floatexp.hxx" />
 +    <ClInclude Include="includes\forexp.hxx" />
 +    <ClInclude Include="includes\functiondec.hxx" />
 +    <ClInclude Include="includes\ifexp.hxx" />
 +    <ClInclude Include="includes\intexp.hxx" />
 +    <ClInclude Include="includes\macrovarvisitor.hxx" />
 +    <ClInclude Include="includes\stepvisitor.hxx" />
 +    <ClInclude Include="src\cpp\libAst.hxx" />
 +    <ClInclude Include="includes\listexp.hxx" />
 +    <ClInclude Include="includes\logicalopexp.hxx" />
 +    <ClInclude Include="includes\mathexp.hxx" />
 +    <ClInclude Include="includes\matrixexp.hxx" />
 +    <ClInclude Include="includes\matrixlineexp.hxx" />
 +    <ClInclude Include="includes\mutevisitor.hxx" />
 +    <ClInclude Include="includes\nilexp.hxx" />
 +    <ClInclude Include="includes\notexp.hxx" />
 +    <ClInclude Include="includes\opexp.hxx" />
 +    <ClInclude Include="includes\printvisitor.hxx" />
 +    <ClInclude Include="includes\returnexp.hxx" />
 +    <ClInclude Include="includes\run_AssignExp.hxx" />
 +    <ClInclude Include="includes\run_CallExp.hxx" />
 +    <ClInclude Include="includes\run_MatrixExp.hxx" />
 +    <ClInclude Include="includes\run_OpExp.hxx" />
 +    <ClInclude Include="includes\runvisitor.hxx" />
 +    <ClInclude Include="includes\selectexp.hxx" />
 +    <ClInclude Include="includes\seqexp.hxx" />
 +    <ClInclude Include="includes\shortcutvisitor.hxx" />
 +    <ClInclude Include="includes\simplevar.hxx" />
 +    <ClInclude Include="includes\stringexp.hxx" />
 +    <ClInclude Include="includes\timedvisitor.hxx" />
 +    <ClInclude Include="includes\token.hxx" />
 +    <ClInclude Include="includes\transposeexp.hxx" />
 +    <ClInclude Include="includes\trycatchexp.hxx" />
 +    <ClInclude Include="includes\var.hxx" />
 +    <ClInclude Include="includes\vardec.hxx" />
 +    <ClInclude Include="includes\visitor.hxx" />
 +    <ClInclude Include="includes\visitor_common.hxx" />
 +    <ClInclude Include="includes\whileexp.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\bin\lapack.lib" />
 +    <Library Include="..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\api_scilab\api_scilab.vcxproj">
 +      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\console\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\operations\operations.vcxproj">
 +      <Project>{1bb396f7-ce61-4cfc-9c22-266b2cfb2e74}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\threads\threads.vcxproj">
 +      <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\types\typesmacro\typesmacro.vcxproj">
 +      <Project>{9252a034-7f22-4cb1-a634-4577da69f2d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="ast-tools\ast-tools.vcxproj">
 +      <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <None Include="core_Import.def" />
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index 6e3617f,0000000..c7f7de2
mode 100644,000000..100644
--- /dev/null
@@@ -1,244 -1,0 +1,248 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{09E6CF32-EF2F-4C63-A2B8-B04964768BD6}</ProjectGuid>
 +    <RootNamespace>boolean_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../../libs/Eigen/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BOOLEAN_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../../libs/Eigen/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BOOLEAN_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../../libs/Eigen/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BOOLEAN_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../../libs/Eigen/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BOOLEAN_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\..\sci_gateway\cpp\sci_bool2s.cpp" />
 +    <ClCompile Include="..\..\sci_gateway\cpp\sci_find.cpp" />
 +    <ClCompile Include="..\..\sci_gateway\c\sci_and.c" />
 +    <ClCompile Include="..\..\sci_gateway\c\sci_or.c" />
 +    <ClCompile Include="boolean_gw.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\boolean_gw.hxx" />
 +    <ClInclude Include="..\..\includes\dynlib_boolean_gw.h" />
 +    <ClInclude Include="..\..\includes\gw_boolean.h" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\..\..\bin\lapack.lib" />
 +    <Library Include="..\..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\..\tools\Dumpexts\Dumpexts.vcxproj">
 +      <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
 +      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\ast\ast-tools\ast-tools.vcxproj">
 +      <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\ast\ast.vcxproj">
 +      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\console\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\operations\operations.vcxproj">
 +      <Project>{1bb396f7-ce61-4cfc-9c22-266b2cfb2e74}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\threads\threads.vcxproj">
 +      <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\typesmacro\typesmacro.vcxproj">
 +      <Project>{9252a034-7f22-4cb1-a634-4577da69f2d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\c\boolean.vcxproj">
 +      <Project>{8ab8ecec-8c22-475e-80d0-e14696f5a19b}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index 2879a47,0000000..adb4d8d
mode 100644,000000..100644
--- /dev/null
@@@ -1,210 -1,0 +1,214 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClCompile Include="console_gw.cpp" />
 +    <ClCompile Include="sci_clc.cpp" />
 +    <ClCompile Include="sci_iswaitingforinput.cpp" />
 +    <ClCompile Include="sci_lines.cpp" />
 +    <ClCompile Include="sci_prompt.cpp" />
 +    <ClCompile Include="sci_tohome.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\console_gw.hxx" />
 +    <ClInclude Include="..\..\includes\dynlib_console_gw.h" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{273B1F5C-C137-46D1-B516-FFE5764FABE5}</ProjectGuid>
 +    <RootNamespace>console_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index 92d1420,0000000..6397147
mode 100644,000000..100644
--- /dev/null
@@@ -1,270 -1,0 +1,274 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{3E933EB6-D427-4828-9B30-B6B9987491F6}</ProjectGuid>
 +    <RootNamespace>core_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;../../../../libs/Eigen/includes;../../../console/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;../../../../libs/Eigen/includes;../../../console/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;../../../../libs/Eigen/includes;../../../console/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;../../../../libs/Eigen/includes;../../../console/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="sci_format.cpp" />
 +    <ClCompile Include="sci_funcprot.cpp" />
 +    <ClCompile Include="sci_ieee.cpp" />
 +    <ClCompile Include="sci_mode.cpp" />
 +    <ClCompile Include="sci_sciargs.cpp" />
 +    <ClCompile Include="..\c\sci_getdebuginfo.c" />
 +    <ClCompile Include="..\c\sci_type.c" />
 +    <ClCompile Include="core_gw.cpp" />
 +    <ClCompile Include="sci_abort.cpp" />
 +    <ClCompile Include="sci_argn.cpp" />
 +    <ClCompile Include="sci_banner.cpp" />
 +    <ClCompile Include="sci_clear.cpp" />
 +    <ClCompile Include="sci_clearglobal.cpp" />
 +    <ClCompile Include="sci_error.cpp" />
 +    <ClCompile Include="sci_exists.cpp" />
 +    <ClCompile Include="sci_exit.cpp" />
 +    <ClCompile Include="sci_getmd5.cpp" />
 +    <ClCompile Include="sci_getmodules.cpp" />
 +    <ClCompile Include="sci_getos.cpp" />
 +    <ClCompile Include="sci_getscilabmode.cpp" />
 +    <ClCompile Include="sci_getversion.cpp" />
 +    <ClCompile Include="sci_global.cpp" />
 +    <ClCompile Include="sci_isglobal.cpp" />
 +    <ClCompile Include="sci_lasterror.cpp" />
 +    <ClCompile Include="sci_pause.cpp" />
 +    <ClCompile Include="sci_quit.cpp" />
 +    <ClCompile Include="sci_stacksize.cpp" />
 +    <ClCompile Include="sci_typename.cpp" />
 +    <ClCompile Include="sci_warning.cpp" />
 +    <ClCompile Include="sci_who.cpp" />
 +    <ClCompile Include="sci_with_module.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\banner.hxx" />
 +    <ClInclude Include="..\..\includes\core_gw.hxx" />
 +    <ClInclude Include="..\..\includes\dynlib_core_gw.h" />
 +    <ClInclude Include="..\..\includes\runner.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\..\..\bin\lapack.lib" />
 +    <Library Include="..\..\..\..\bin\libintl.lib" />
 +    <Library Include="..\..\..\..\bin\libxml2.lib" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\..\tools\Dumpexts\Dumpexts.vcxproj">
 +      <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\ast\ast-tools\ast-tools.vcxproj">
 +      <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\ast\ast.vcxproj">
 +      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
 +      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\console\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\fileio\fileio.vcxproj">
 +      <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\threads\threads.vcxproj">
 +      <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index ed3d33d,0000000..e1a3092
mode 100644,000000..100644
--- /dev/null
@@@ -1,283 -1,0 +1,287 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{99D6BDD6-2226-43A1-B0FA-9D412BBCA6DD}</ProjectGuid>
 +    <RootNamespace>differential_equations_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../includes;../src/c;../../types/includes;../../ast/includes;../../core/includes;../../../libs/intl;../../localization/includes;../../system_env/includes;../../api_scilab/includes;../../symbol/includes;../../operations/includes;../../threads/includes;../../output_stream/includes;../../elementary_functions/includes;../../string/includes;../../../libs/Eigen/includes;../../console/includes;../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DIFFERENTIAL_EQUATIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)differential_equations_f.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>differential_equations_f.lib</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../includes;../src/c;../../types/includes;../../ast/includes;../../core/includes;../../../libs/intl;../../localization/includes;../../system_env/includes;../../api_scilab/includes;../../symbol/includes;../../operations/includes;../../threads/includes;../../output_stream/includes;../../elementary_functions/includes;../../string/includes;../../../libs/Eigen/includes;../../console/includes;../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DIFFERENTIAL_EQUATIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)differential_equations_f.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>differential_equations_f.lib</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>../includes;../src/c;../../types/includes;../../ast/includes;../../core/includes;../../../libs/intl;../../localization/includes;../../system_env/includes;../../api_scilab/includes;../../symbol/includes;../../operations/includes;../../threads/includes;../../output_stream/includes;../../elementary_functions/includes;../../string/includes;../../../libs/Eigen/includes;../../console/includes;../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DIFFERENTIAL_EQUATIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)differential_equations_f.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>differential_equations_f.lib</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>../includes;../src/c;../../types/includes;../../ast/includes;../../core/includes;../../../libs/intl;../../localization/includes;../../system_env/includes;../../api_scilab/includes;../../symbol/includes;../../operations/includes;../../threads/includes;../../output_stream/includes;../../elementary_functions/includes;../../string/includes;../../../libs/Eigen/includes;../../console/includes;../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DIFFERENTIAL_EQUATIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)differential_equations_f.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>differential_equations_f.lib</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\includes\differential_equations_gw.hxx" />
 +    <ClInclude Include="..\includes\dynlib_differential_equations_gw.h" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClCompile Include="cpp\sci_bvode.cpp" />
 +    <ClCompile Include="cpp\sci_dasrt.cpp" />
 +    <ClCompile Include="cpp\sci_dassl.cpp" />
 +    <ClCompile Include="cpp\sci_feval.cpp" />
 +    <ClCompile Include="cpp\sci_impl.cpp" />
 +    <ClCompile Include="cpp\sci_int2d.cpp" />
 +    <ClCompile Include="cpp\sci_int3d.cpp" />
 +    <ClCompile Include="cpp\sci_intg.cpp" />
 +    <ClCompile Include="cpp\sci_ode.cpp" />
 +    <ClCompile Include="cpp\sci_odedc.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\console\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\elementary_functions\src\c\elementary_functions.vcxproj">
 +      <Project>{5b110267-7c18-437c-b87d-dba2b50729e9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\src\c\differential_equations.vcxproj">
 +      <Project>{f0190b5d-fb21-47a2-99ac-06627cdd0f8a}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <None Include="differential_equations_f_Import.def" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
@@@ -32,9 -35,8 +35,8 @@@ function SDKpath = dlwGetSdkPath(
                  SDKpath = [];
              end
          else
 -            errclear();
 +            //errclear();
          end
      end
  endfunction
  //=============================================================================
index e081f02,0000000..43b327a
mode 100644,000000..100644
--- /dev/null
@@@ -1,284 -1,0 +1,288 @@@
- <?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{F93FF3EE-217A-4554-AB17-2F8D56B4BF4B}</ProjectGuid>
 +    <RootNamespace>dynamic_link_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="dynamic_link_gw.cpp" />
 +    <ClCompile Include="sci_addinter.cpp" />
 +    <ClCompile Include="sci_c_link.cpp" />
 +    <ClCompile Include="sci_getdynlibext.cpp" />
 +    <ClCompile Include="sci_ilib_verbose.cpp" />
 +    <ClCompile Include="sci_link.cpp" />
 +    <ClCompile Include="sci_ulink.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\dynamic_link_gw.hxx" />
 +    <ClInclude Include="..\..\includes\dynlib_dynamic_link_gw.h" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\ast\ast-tools\ast-tools.vcxproj">
 +      <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
 +      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\src\c\dynamic_link.vcxproj">
 +      <Project>{eab6c580-22b3-4359-ba1d-dd7499a96163}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index ac4c75f,0000000..5641b5c
mode 100644,000000..100644
--- /dev/null
@@@ -1,344 -1,0 +1,348 @@@
- <?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{9881F0CE-A1AC-4744-B709-7C1453A77B95}</ProjectGuid>
 +    <RootNamespace>elem_func_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +    <ProjectName>elementary_functions_gw</ProjectName>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\src\c;..\..\..\src\cpp;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;../../../../../double/includes;../../../../../libs/Eigen/includes;../../../../console/includes;../../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core_f.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)elementary_functions_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions.lib" 1&gt;NUL 2&gt;NUL
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>core_f.lib;elementary_functions_f.lib;elementary_functions.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\src\c;..\..\..\src\cpp;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;../../../../../double/includes;../../../../../libs/Eigen/includes;../../../../console/includes;../../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core_f.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)elementary_functions_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions.lib" 1&gt;NUL 2&gt;NUL
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>core_f.lib;elementary_functions_f.lib;elementary_functions.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\src\c;..\..\..\src\cpp;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;../../../../../double/includes;../../../../../libs/Eigen/includes;../../../../console/includes;../../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core_f.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)elementary_functions_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions.lib" 1&gt;NUL 2&gt;NUL
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>core_f.lib;elementary_functions_f.lib;elementary_functions.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\src\c;..\..\..\src\cpp;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;../../../../../double/includes;../../../../../libs/Eigen/includes;../../../../console/includes;../../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core_f.lib" 1&gt;NUL 2&gt;NUL
 +lib /DEF:"$(ProjectDir)elementary_functions_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions.lib" 1&gt;NUL 2&gt;NUL
 +</Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>core_f.lib;elementary_functions_f.lib;elementary_functions.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\..\..\src\cpp\getmode.cpp" />
 +    <ClCompile Include="..\..\c\sci_base2dec.c" />
 +    <ClCompile Include="..\..\c\sci_dec2base.c" />
 +    <ClCompile Include="..\..\c\sci_isequalbitwise.c" />
 +    <ClCompile Include="..\..\c\sci_nearfloat.c" />
 +    <ClCompile Include="..\..\c\sci_number_properties.c" />
 +    <ClCompile Include="..\..\c\sci_round.c" />
 +    <ClCompile Include="..\..\c\sci_sign.c" />
 +    <ClCompile Include="..\..\c\sci_sqrt.c" />
 +    <ClCompile Include="..\..\c\sci_testmatrix.c" />
 +    <ClCompile Include="..\elem_func_gw.cpp" />
 +    <ClCompile Include="..\sci_abs.cpp" />
 +    <ClCompile Include="..\sci_acos.cpp" />
 +    <ClCompile Include="..\sci_asin.cpp" />
 +    <ClCompile Include="..\sci_atan.cpp" />
 +    <ClCompile Include="..\sci_ceil.cpp" />
 +    <ClCompile Include="..\sci_clean.cpp" />
 +    <ClCompile Include="..\sci_conj.cpp" />
 +    <ClCompile Include="..\sci_cos.cpp" />
 +    <ClCompile Include="..\sci_cumprod.cpp" />
 +    <ClCompile Include="..\sci_cumsum.cpp" />
 +    <ClCompile Include="..\sci_diag.cpp" />
 +    <ClCompile Include="..\sci_dsearch.cpp" />
 +    <ClCompile Include="..\sci_exp.cpp" />
 +    <ClCompile Include="..\sci_expm.cpp" />
 +    <ClCompile Include="..\sci_eye.cpp" />
 +    <ClCompile Include="..\sci_floor.cpp" />
 +    <ClCompile Include="..\sci_frexp.cpp" />
 +    <ClCompile Include="..\sci_gsort.cpp" />
 +    <ClCompile Include="..\sci_imag.cpp" />
 +    <ClCompile Include="..\sci_imult.cpp" />
 +    <ClCompile Include="..\sci_int.cpp" />
 +    <ClCompile Include="..\sci_isequal.cpp" />
 +    <ClCompile Include="..\sci_isreal.cpp" />
 +    <ClCompile Include="..\sci_kron.cpp" />
 +    <ClCompile Include="..\sci_log.cpp" />
 +    <ClCompile Include="..\sci_log1p.cpp" />
 +    <ClCompile Include="..\sci_matrix.cpp" />
 +    <ClCompile Include="..\sci_max.cpp" />
 +    <ClCompile Include="..\sci_ones.cpp">
 +      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
 +    </ClCompile>
 +    <ClCompile Include="..\sci_prod.cpp" />
 +    <ClCompile Include="..\sci_rand.cpp" />
 +    <ClCompile Include="..\sci_rat.cpp" />
 +    <ClCompile Include="..\sci_sin.cpp" />
 +    <ClCompile Include="..\sci_size.cpp" />
 +    <ClCompile Include="..\sci_sum.cpp" />
 +    <ClCompile Include="..\sci_tan.cpp" />
 +    <ClCompile Include="..\sci_tril.cpp" />
 +    <ClCompile Include="..\sci_triu.cpp" />
 +    <ClCompile Include="..\sci_zeros.cpp" />
 +    <ClCompile Include="..\sci_real.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\..\includes\dynlib_elementary_functions_gw.h" />
 +    <ClInclude Include="..\..\..\includes\elem_func_gw.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <None Include="core_f_Import.def" />
 +    <None Include="elementary_functions_f_Import.def" />
 +    <None Include="elementary_functions_Import.def" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\..\..\..\bin\lapack.lib" />
 +    <Library Include="..\..\..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\..\..\tools\Dumpexts\Dumpexts.vcxproj">
 +      <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\ast\ast-tools\ast-tools.vcxproj">
 +      <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\api_scilab\api_scilab.vcxproj">
 +      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\ast\ast.vcxproj">
 +      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\cacsd\src\c\cacsd.vcxproj">
 +      <Project>{d5dd1407-3926-4f6c-ad7b-3a6b2de56049}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\console\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\operations\operations.vcxproj">
 +      <Project>{1bb396f7-ce61-4cfc-9c22-266b2cfb2e74}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\polynomials\src\c\polynomials.vcxproj">
 +      <Project>{620d8fa7-3704-438e-bb1e-391c84401a2e}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\sparse\src\c\sparse.vcxproj">
 +      <Project>{51240b08-5e4e-439b-b745-c870d5b513bf}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\threads\threads.vcxproj">
 +      <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\..\types\typesmacro\typesmacro.vcxproj">
 +      <Project>{9252a034-7f22-4cb1-a634-4577da69f2d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\src\c\elementary_functions.vcxproj">
 +      <Project>{5b110267-7c18-437c-b87d-dba2b50729e9}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
Simple merge
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
      <ProjectConfiguration Include="Debug|Win32">
index f26750e,0000000..3fed547
mode 100644,000000..100644
--- /dev/null
@@@ -1,291 -1,0 +1,295 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{6D9647CE-9CB9-4B16-B34D-8542484EFBB0}</ProjectGuid>
 +    <RootNamespace>fileio_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;../../../io/includes;../../../../libs/Eigen/includes;../../../../libs/libxml2;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;../../../io/includes;../../../../libs/Eigen/includes;../../../../libs/libxml2;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;../../../io/includes;../../../../libs/Eigen/includes;../../../../libs/libxml2;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;../../../io/includes;../../../../libs/Eigen/includes;../../../../libs/libxml2;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\c\sci_chdir.c" />
 +    <ClCompile Include="..\c\sci_copyfile.c" />
 +    <ClCompile Include="..\c\sci_fprintfMat.c" />
 +    <ClCompile Include="..\c\sci_fscanfMat.c" />
 +    <ClCompile Include="..\c\sci_getURL.c" />
 +    <ClCompile Include="..\c\sci_maxfiles.c" />
 +    <ClCompile Include="..\c\sci_movefile.c" />
 +    <ClCompile Include="..\c\sci_pwd.c" />
 +    <ClCompile Include="..\c\sci_splitURL.c" />
 +    <ClCompile Include="..\c\sci_tempname.c" />
 +    <ClCompile Include="fileio_gw.cpp" />
 +    <ClCompile Include="sci_basename.cpp" />
 +    <ClCompile Include="sci_createdir.cpp" />
 +    <ClCompile Include="sci_deletefile.cpp" />
 +    <ClCompile Include="sci_fileext.cpp" />
 +    <ClCompile Include="sci_fileinfo.cpp" />
 +    <ClCompile Include="sci_fileparts.cpp" />
 +    <ClCompile Include="sci_filesep.cpp" />
 +    <ClCompile Include="sci_findfiles.cpp" />
 +    <ClCompile Include="sci_fullpath.cpp" />
 +    <ClCompile Include="sci_getdrives.cpp" />
 +    <ClCompile Include="sci_get_absolute_file_path.cpp" />
 +    <ClCompile Include="sci_getlongpathname.cpp" />
 +    <ClCompile Include="sci_getrelativefilename.cpp" />
 +    <ClCompile Include="sci_getshortpathname.cpp" />
 +    <ClCompile Include="sci_isdir.cpp" />
 +    <ClCompile Include="sci_isfile.cpp" />
 +    <ClCompile Include="sci_mclearerr.cpp" />
 +    <ClCompile Include="sci_mclose.cpp" />
 +    <ClCompile Include="sci_meof.cpp" />
 +    <ClCompile Include="sci_merror.cpp" />
 +    <ClCompile Include="sci_mfprintf.cpp" />
 +    <ClCompile Include="sci_mfscanf.cpp" />
 +    <ClCompile Include="sci_mget.cpp" />
 +    <ClCompile Include="sci_mgetl.cpp" />
 +    <ClCompile Include="sci_mgetstr.cpp" />
 +    <ClCompile Include="sci_mopen.cpp" />
 +    <ClCompile Include="sci_mput.cpp" />
 +    <ClCompile Include="sci_mputl.cpp" />
 +    <ClCompile Include="sci_mputstr.cpp" />
 +    <ClCompile Include="sci_mscanf.cpp" />
 +    <ClCompile Include="sci_mseek.cpp" />
 +    <ClCompile Include="sci_msscanf.cpp" />
 +    <ClCompile Include="sci_mtell.cpp" />
 +    <ClCompile Include="sci_newest.cpp" />
 +    <ClCompile Include="sci_pathconvert.cpp" />
 +    <ClCompile Include="sci_pathsep.cpp" />
 +    <ClCompile Include="sci_removedir.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\fileio_gw.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\..\..\bin\lapack.lib" />
 +    <Library Include="..\..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\ast\ast-tools\ast-tools.vcxproj">
 +      <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\ast\ast.vcxproj">
 +      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
 +      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\console\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\operations\operations.vcxproj">
 +      <Project>{1bb396f7-ce61-4cfc-9c22-266b2cfb2e74}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\sci_gateway\cpp\output_stream_gw\output_stream_gw.vcxproj">
 +      <Project>{c000fdf7-4d32-4630-9595-560d9cc66d11}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\threads\threads.vcxproj">
 +      <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\typesmacro\typesmacro.vcxproj">
 +      <Project>{9252a034-7f22-4cb1-a634-4577da69f2d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\windows_tools\src\c\scilab_windows\scilab_windows.vcxproj">
 +      <Project>{8028f371-6a94-4a26-8804-6e7f05f1d1aa}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\fileio.vcxproj">
 +      <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index 417cc0c,0000000..9b617b5
mode 100644,000000..100644
--- /dev/null
@@@ -1,261 -1,0 +1,265 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}</ProjectGuid>
 +    <RootNamespace>functions_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../console/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../../../libs/Eigen/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../console/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../../../libs/Eigen/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../console/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../../../libs/Eigen/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FUNCTIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../console/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../../../libs/Eigen/includes;../../../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FUNCTIONS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="sci_exec.cpp">
 +      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
 +    </ClCompile>
 +    <ClCompile Include="sci_execstr.cpp" />
 +    <ClCompile Include="sci_functionlist.cpp" />
 +    <ClCompile Include="sci_getCurrentThreadId.cpp" />
 +    <ClCompile Include="sci_getThreads.cpp" />
 +    <ClCompile Include="sci_macrovar.cpp" />
 +    <ClCompile Include="sci_whereis.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\dynlib_functions_gw.h" />
 +    <ClInclude Include="..\..\includes\functions_gw.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\..\..\bin\lapack.lib" />
 +    <Library Include="..\..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\..\tools\Dumpexts\Dumpexts.vcxproj">
 +      <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\ast\ast-tools\ast-tools.vcxproj">
 +      <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\ast\ast.vcxproj">
 +      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
 +      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\console\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\fileio\fileio.vcxproj">
 +      <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\operations\operations.vcxproj">
 +      <Project>{1bb396f7-ce61-4cfc-9c22-266b2cfb2e74}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\parse\parse.vcxproj">
 +      <Project>{74d43792-dbfc-47f0-adbc-4d7a20cdada2}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\threads\threads.vcxproj">
 +      <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\typesmacro\typesmacro.vcxproj">
 +      <Project>{9252a034-7f22-4cb1-a634-4577da69f2d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\src\c\functions.vcxproj">
 +      <Project>{53a01263-92be-4c87-aa9a-79297f882310}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index afef78f,0000000..d0069e4
mode 100644,000000..100644
--- /dev/null
@@@ -1,363 -1,0 +1,367 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}</ProjectGuid>
 +    <RootNamespace>functions_manager</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>includes;../types/includes;../core/includes;../system_env/includes;../../libs/libxml2;../symbol/includes;../operations/includes;../ast/includes;../fileio/includes;../parse/includes;../localization/includes;../../libs/intl;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;../jvm/includes;../../libs/Eigen/includes;../console/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FUNC_MAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +    </Link>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)core_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>includes;../types/includes;../core/includes;../system_env/includes;../../libs/libxml2;../symbol/includes;../operations/includes;../ast/includes;../fileio/includes;../parse/includes;../localization/includes;../../libs/intl;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;../jvm/includes;../../libs/Eigen/includes;../console/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FUNC_MAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +    </Link>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)core_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>includes;../types/includes;../core/includes;../system_env/includes;../../libs/libxml2;../symbol/includes;../operations/includes;../ast/includes;../fileio/includes;../parse/includes;../localization/includes;../../libs/intl;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;../jvm/includes;../../libs/Eigen/includes;../console/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FUNC_MAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +    </Link>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)core_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>includes;../types/includes;../core/includes;../system_env/includes;../../libs/libxml2;../symbol/includes;../operations/includes;../ast/includes;../fileio/includes;../parse/includes;../localization/includes;../../libs/intl;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;../jvm/includes;../../libs/Eigen/includes;../console/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FUNC_MAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ImportLibrary>../../bin/$(ProjectName).lib</ImportLibrary>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies>
 +    </Link>
 +    <PreLinkEvent>
 +      <Command>lib /DEF:"$(ProjectDir)core_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL</Command>
 +    </PreLinkEvent>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="src\cpp\dynamic_modules.cpp" />
 +    <ClCompile Include="src\cpp\funcmanager.cpp" />
 +    <ClCompile Include="src\cpp\functions_manager.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="includes\dynamic_modules.hxx" />
 +    <ClInclude Include="includes\dynlib_functions_manager.h" />
 +    <ClInclude Include="includes\funcmanager.hxx" />
 +    <ClInclude Include="includes\functions_manager.h" />
 +    <ClInclude Include="includes\module_declaration.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\bin\lapack.lib" />
 +    <Library Include="..\..\bin\libintl.lib" />
 +    <Library Include="..\..\bin\libxml2.lib" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <None Include="core_Import.def" />
 +    <None Include="ReadMe.txt" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\tools\Dumpexts\Dumpexts.vcxproj">
 +      <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\api_scilab\api_scilab.vcxproj">
 +      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\ast\ast-tools\ast-tools.vcxproj">
 +      <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\ast\ast.vcxproj">
 +      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\action_binding\sci_gateway\cpp\action_binding_gw.vcxproj">
 +      <Project>{3419b733-85a2-4f66-bc04-a5a8dc8fa057}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\boolean\src\cpp\boolean_gw.vcxproj">
 +      <Project>{09e6cf32-ef2f-4c63-a2b8-b04964768bd6}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\console\sci_gateway\cpp\console_gw.vcxproj">
 +      <Project>{273b1f5c-c137-46d1-b516-ffe5764fabe5}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\console\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\core\sci_gateway\cpp\core_gw.vcxproj">
 +      <Project>{3e933eb6-d427-4828-9b30-b6b9987491f6}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\data_structures\src\c\data_structures.vcxproj">
 +      <Project>{b7a168a0-dfc0-4c6d-b0cc-6079912a4a76}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\dynamic_link\sci_gateway\cpp\dynamic_link_gw.vcxproj">
 +      <Project>{f93ff3ee-217a-4554-ab17-2f8d56b4bf4b}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\dynamic_link\src\c\dynamic_link.vcxproj">
 +      <Project>{eab6c580-22b3-4359-ba1d-dd7499a96163}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\elementary_functions\sci_gateway\cpp\elem_func_gw\elem_func_gw.vcxproj">
 +      <Project>{9881f0ce-a1ac-4744-b709-7c1453a77b95}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\fileio\sci_gateway\cpp\fileio_gw.vcxproj">
 +      <Project>{6d9647ce-9cb9-4b16-b34d-8542484efbb0}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\functions\sci_gateway\cpp\functions_gw.vcxproj">
 +      <Project>{67ff36d3-ec5a-4f0d-bf3b-a84a66d77294}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\graphics\sci_gateway\cpp\graphics_gw.vcxproj">
 +      <Project>{61b23d9b-3f73-4204-98f7-6f41218f4564}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\gui\sci_gateway\cpp\gui_gw.vcxproj">
 +      <Project>{83c04253-b152-4ef6-bb36-35a7b0fdfb98}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\hdf5\src\c\hdf5.vcxproj">
 +      <Project>{a824ea62-af07-4f43-9036-0e63990556bd}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\helptools\src\c\helptools.vcxproj">
 +      <Project>{bed4a0f2-5129-487f-9f94-ec09480f04d7}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\history_manager\sci_gateway\cpp\history_manager_gw.vcxproj">
 +      <Project>{ce49c183-2ece-4ea4-b289-d74e2e664164}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\integer\src\cpp\integer_gw.vcxproj">
 +      <Project>{215274d7-05ec-4d1e-b7bb-b2c957da960b}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\io\src\cpp\io_gw.vcxproj">
 +      <Project>{719ec179-3ad3-4c6b-bbd8-b44c96b1a204}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\jvm\libjvm.vcxproj">
 +      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\jvm\sci_gateway\cpp\libjvm_gw.vcxproj">
 +      <Project>{2d02dd0e-cbf5-493e-aa06-1e289ed24666}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\linear_algebra\sci_gateway\cpp\linear_algebra_gw.vcxproj">
 +      <Project>{ee43be6d-817d-4b09-ac40-7e6ac5bdb80d}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\localization\sci_gateway\cpp\localization_gw.vcxproj">
 +      <Project>{7a68edc6-f0af-47d1-bb16-b8a9dcd9202d}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\matio\sci_gateway\cpp\matio_gw.vcxproj">
 +      <Project>{764fac09-369d-4c11-a0ff-ce097d9a4faf}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\operations\operations.vcxproj">
 +      <Project>{1bb396f7-ce61-4cfc-9c22-266b2cfb2e74}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\output_stream\sci_gateway\cpp\output_stream_gw\output_stream_gw.vcxproj">
 +      <Project>{c000fdf7-4d32-4630-9595-560d9cc66d11}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\parse\parse.vcxproj">
 +      <Project>{74d43792-dbfc-47f0-adbc-4d7a20cdada2}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\polynomials\src\c\polynomials.vcxproj">
 +      <Project>{620d8fa7-3704-438e-bb1e-391c84401a2e}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\scinotes\src\c\scinotes.vcxproj">
 +      <Project>{bae68b54-2c1a-44d0-a0e9-05156a784e79}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\signal_processing\sci_gateway\cpp\signal_processing_gw.vcxproj">
 +      <Project>{a968a82e-b2dc-4ed2-bd9b-12c1e97abbb4}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\sparse\sci_gateway\cpp\sparse_gw.vcxproj">
 +      <Project>{7fc7aec9-4922-4864-83f1-eaed67981aac}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\statistics\sci_gateway\cpp\statistics_gw.vcxproj">
 +      <Project>{eae1009f-b967-43c4-9408-97a37efa8678}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\string\sci_gateway\cpp\string_gw.vcxproj">
 +      <Project>{aec1f7b5-28f2-4c1f-a436-98d0352fd3f5}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\threads\threads.vcxproj">
 +      <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\time\sci_gateway\cpp\time_gw.vcxproj">
 +      <Project>{28305722-6486-481d-bd0f-b4398d8a09c5}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\types\sci_gateway\cpp\types_gw.vcxproj">
 +      <Project>{c2e5f4f6-5ee7-4b36-bfac-4ac36bb41420}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 +    </ProjectReference>
 +    <ProjectReference Include="..\types\typesmacro\typesmacro.vcxproj">
 +      <Project>{9252a034-7f22-4cb1-a634-4577da69f2d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\windows_tools\src\c\windows_tools.vcxproj">
 +      <Project>{9594ac02-20ee-4fbf-95b4-bfa5865ed7ca}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
      <ClInclude Include="..\..\includes\getConsoleIdentifier.h" />
      <ClInclude Include="..\..\includes\getGraphicObjectProperty.h" />
      <ClInclude Include="..\..\includes\graphicObjectProperties.h" />
 +    <ClInclude Include="..\..\includes\HandleManagement.h" />
+     <ClInclude Include="..\..\includes\Matplot.h" />
      <ClInclude Include="..\..\includes\MatPlotDecomposer.hxx" />
      <ClInclude Include="..\..\includes\NgonGridMatplotDataDecomposer.hxx" />
      <ClInclude Include="..\..\includes\returnType.h" />
      <ClInclude Include="..\..\includes\ScilabView.hxx" />
      <ClInclude Include="..\..\includes\setGraphicObjectProperty.h" />
 +    <ClInclude Include="..\..\includes\TriangleMeshFecData.hxx" />
+     <ClInclude Include="..\..\includes\Texture.hxx" />
      <ClInclude Include="..\..\includes\Triangulator.hxx" />
      <ClInclude Include="..\jni\CallGraphicController.hxx" />
      <ClInclude Include="..\..\includes\createGraphicObject.h" />
Simple merge
Simple merge
@@@ -1,4 -1,4 +1,4 @@@
--<?xml version="1.0" encoding="utf-8"?>
++<?xml version="1.0" encoding="utf-8"?>
  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup>
      <Filter Include="Source Files">
      <ClCompile Include="src\c\getHandleProperty\set_figure_closerequestfcn_property.c">
        <Filter>Source Files</Filter>
      </ClCompile>
 +    <ClCompile Include="src\c\getHandleProperty\set_user_data_property.c">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
+     <ClCompile Include="src\c\getHandleProperty\set_image_type_property.c">
+       <Filter>Source Files</Filter>
+     </ClCompile>
+     <ClCompile Include="src\c\getHandleProperty\get_image_type_property.c">
+       <Filter>Source Files</Filter>
+     </ClCompile>
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="includes\Axes.h">
  #include "api_scilab.h"
  #include "localization.h"
  #include "Scierror.h"
+ #include "Matplot.h"
  /*--------------------------------------------------------------------------*/
 -
 -int sci_matplot(char *fname, unsigned long fname_len)
 +int sci_matplot(char *fname, void *pvApiCtx)
  {
      SciErr sciErr;
      int m1 = 0, n1 = 0;
  #include "gw_graphics.h"
  #include "BuildObjects.h"
  #include "sciCall.h"
+ #include "Matplot.h"
  
  /*--------------------------------------------------------------------------*/
 -int sci_matplot1(char * fname, unsigned long fname_len)
 +int sci_matplot1(char * fname, void *pvApiCtx)
  {
      SciErr sciErr;
      int m1 = 0, n1 = 0, m2 = 0, n2 = 0;
index a87c16b,0000000..309a75d
mode 100644,000000..100644
--- /dev/null
@@@ -1,257 -1,0 +1,261 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\dynlib_graphics_gw.h" />
 +    <ClInclude Include="..\..\includes\graphics_gw.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClCompile Include="graphics_gw.cpp" />
 +    <ClCompile Include="sci_get.cpp" />
 +    <ClCompile Include="sci_winsid.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\..\Visual-Studio-settings\rename-vc-files\rename-vc-files.vcxproj">
 +      <Project>{dd8a0506-8d31-4cf8-856a-c10ece9c13a4}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
 +      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\ast\ast-tools\ast-tools.vcxproj">
 +      <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\ast\ast.vcxproj">
 +      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\console\src\c\console.vcxproj">
 +      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\graphic_objects\src\c\graphic_objects.vcxproj">
 +      <Project>{30f9ee41-587b-4618-8de7-698d3fba4985}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\jvm\libjvm.vcxproj">
 +      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\operations\operations.vcxproj">
 +      <Project>{1bb396f7-ce61-4cfc-9c22-266b2cfb2e74}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\system_env\system_env.vcxproj">
 +      <Project>{7ca60aef-9afa-4d06-af28-613c0aa27640}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\threads\threads.vcxproj">
 +      <Project>{50a1ffc8-adc2-4d9e-a2d0-5dcd63188ae9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\typesmacro\typesmacro.vcxproj">
 +      <Project>{9252a034-7f22-4cb1-a634-4577da69f2d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\graphics.vcxproj">
 +      <Project>{8ccdd3c2-b025-4a12-a986-1aa28d7c0c33}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{61B23D9B-3F73-4204-98F7-6F41218F4564}</ProjectGuid>
 +    <RootNamespace>graphics_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../graphic_objects/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../../libs/Eigen/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../graphic_objects/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../../libs/Eigen/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../graphic_objects/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../../libs/Eigen/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../src/c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../graphic_objects/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../../libs/Eigen/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
@@@ -46,7 -46,7 +46,7 @@@ typedef struc
   * don't forget to modify it each time the propertyTable
   * is modified.
   */
- #define NB_PROPERTIES_TAB 162
 -#define NB_PROPERTIES 163
++#define NB_PROPERTIES_TAB 163
  
  /**
   * list of all property names and associated functions in scilab
  #include "GetConsoleShowHiddenHandles.h"
  #include "GetUicontrolTooltipString.h"
  
 -int get_figures_id_property(void* _pvCtx, char* pobjUID);
 -int get_visible_property(void* _pvCtx, char* pobjUID);
 -int get_pixel_drawing_mode_property(void* _pvCtx, char* pobjUID);
 -int get_old_style_property(void* _pvCtx, char* pobjUID);
 -int get_figure_style_property(void* _pvCtx, char* pobjUID);
 -int get_auto_resize_property(void* _pvCtx, char* pobjUID);
 -int get_figure_position_property(void* _pvCtx, char* pobjUID);
 -int get_axes_size_property(void* _pvCtx, char* pobjUID);
 -int get_figure_size_property(void* _pvCtx, char* pobjUID);
 -int get_figure_name_property(void* _pvCtx, char* pobjUID);
 -int get_figure_id_property(void* _pvCtx, char* pobjUID);
 -int get_figure_resizefcn_property(void* _pvCtx, char* pobjUID);
 -int get_figure_closerequestfcn_property(void* _pvCtx, char* pobjUID);
 -int get_rotation_style_property(void* _pvCtx, char* pobjUID);
 -int get_immediate_drawing_property(void* _pvCtx, char* pobjUID);
 -int get_pixmap_property(void* _pvCtx, char* pobjUID);
 -int get_type_property(void* _pvCtx, char* pobjUID);
 -int get_parent_property(void* _pvCtx, char* pobjUID);
 -int get_current_axes_property(void* _pvCtx, char* pobjUID);
 -int get_current_figure_property(void* _pvCtx, char* pobjUID);
 -int get_current_entity_property(void* _pvCtx, char* pobjUID);
 -int get_children_property(void* _pvCtx, char* pobjUID);
 -int get_default_figure_property(void* _pvCtx, char* pobjUID);
 -int get_default_axes_property(void* _pvCtx, char* pobjUID);
 -int get_color_map_property(void* _pvCtx, char* pobjUID);
 -int get_interp_color_vector_property(void* _pvCtx, char* pobjUID);
 -int get_interp_color_mode_property(void* _pvCtx, char* pobjUID);
 -int get_background_property(void* _pvCtx, char* pobjUID);
 -int get_foreground_property(void* _pvCtx, char* pobjUID);
 -int get_fill_mode_property(void* _pvCtx, char* pobjUID);
 -int get_thickness_property(void* _pvCtx, char* pobjUID);
 -int get_arrow_size_factor_property(void* _pvCtx, char* pobjUID);
 -int get_line_style_property(void* _pvCtx, char* pobjUID);
 -int get_line_mode_property(void* _pvCtx, char* pobjUID);
 -int get_surface_mode_property(void* _pvCtx, char* pobjUID);
 -int get_mark_style_property(void* _pvCtx, char* pobjUID);
 -int get_mark_mode_property(void* _pvCtx, char* pobjUID);
 -int get_mark_size_unit_property(void* _pvCtx, char* pobjUID);
 -int get_mark_size_property(void* _pvCtx, char* pobjUID);
 -int get_mark_foreground_property(void* _pvCtx, char* pobjUID);
 -int get_mark_background_property(void* _pvCtx, char* pobjUID);
 -int get_bar_layout_property(void* _pvCtx, char* pobjUID);
 -int get_bar_width_property(void* _pvCtx, char* pobjUID);
 -int get_x_shift_property(void* _pvCtx, char* pobjUID);
 -int get_y_shift_property(void* _pvCtx, char* pobjUID);
 -int get_z_shift_property(void* _pvCtx, char* pobjUID);
 -int get_polyline_style_property(void* _pvCtx, char* pobjUID);
 -int get_font_size_property(void* _pvCtx, char* pobjUID);
 -int get_font_angle_property(void* _pvCtx, char* pobjUID);
 -int get_font_foreground_property(void* _pvCtx, char* pobjUID);
 -int get_font_color_property(void* _pvCtx, char* pobjUID);
 -int get_font_style_property(void* _pvCtx, char* pobjUID);
 -int get_text_box_mode_property(void* _pvCtx, char* pobjUID);
 -int get_auto_dimensionning_property(void* _pvCtx, char* pobjUID);
 -int get_alignment_property(void* _pvCtx, char* pobjUID);
 -int get_text_box_property(void* _pvCtx, char* pobjUID);
 -int get_text_property(void* _pvCtx, char* pobjUID);
 -int get_auto_clear_property(void* _pvCtx, char* pobjUID);
 -int get_auto_scale_property(void* _pvCtx, char* pobjUID);
 -int get_zoom_box_property(void* _pvCtx, char* pobjUID);
 -int get_zoom_state_property(void* _pvCtx, char* pobjUID);
 -int get_clip_box_property(void* _pvCtx, char* pobjUID);
 -int get_clip_state_property(void* _pvCtx, char* pobjUID);
 -int get_data_property(void* _pvCtx, char* pobjUID);
 -int get_callback_property(void* _pvCtx, char* pobjUID);
 -int get_x_label_property(void* _pvCtx, char* pobjUID);
 -int get_y_label_property(void* _pvCtx, char* pobjUID);
 -int get_z_label_property(void* _pvCtx, char* pobjUID);
 -int get_title_property(void* _pvCtx, char* pobjUID);
 -int get_log_flags_property(void* _pvCtx, char* pobjUID);
 -int get_tics_direction_property(void* _pvCtx, char* pobjUID);
 -int get_x_location_property(void* _pvCtx, char* pobjUID);
 -int get_y_location_property(void* _pvCtx, char* pobjUID);
 -int get_tight_limits_property(void* _pvCtx, char* pobjUID);
 -int get_closed_property(void* _pvCtx, char* pobjUID);
 -int get_auto_position_property(void* _pvCtx, char* pobjUID);
 -int get_auto_rotation_property(void* _pvCtx, char* pobjUID);
 -int get_position_property(void* _pvCtx, char* pobjUID);
 -int get_auto_ticks_property(void* _pvCtx, char* pobjUID);
 -int get_axes_reverse_property(void* _pvCtx, char* pobjUID);
 -int get_view_property(void* _pvCtx, char* pobjUID);
 -int get_axes_bounds_property(void* _pvCtx, char* pobjUID);
 -int get_data_bounds_property(void* _pvCtx, char* pobjUID);
 -int get_margins_property(void* _pvCtx, char* pobjUID);
 -int get_tics_color_property(void* _pvCtx, char* pobjUID);
 -int get_tics_style_property(void* _pvCtx, char* pobjUID);
 -int get_sub_tics_property(void* _pvCtx, char* pobjUID);
 -int get_tics_segment_property(void* _pvCtx, char* pobjUID);
 -int get_labels_font_size_property(void* _pvCtx, char* pobjUID);
 -int get_labels_font_color_property(void* _pvCtx, char* pobjUID);
 -int get_labels_font_style_property(void* _pvCtx, char* pobjUID);
 -int get_format_n_property(void* _pvCtx, char* pobjUID);
 -int get_xtics_coord_property(void* _pvCtx, char* pobjUID);
 -int get_ytics_coord_property(void* _pvCtx, char* pobjUID);
 -int get_tics_labels_property(void* _pvCtx, char* pobjUID);
 -int get_box_property(void* _pvCtx, char* pobjUID);
 -int get_grid_property(void* _pvCtx, char* pobjUID);
 -int get_axes_visible_property(void* _pvCtx, char* pobjUID);
 -int get_hidden_color_property(void* _pvCtx, char* pobjUID);
 -int get_isoview_property(void* _pvCtx, char* pobjUID);
 -int get_cube_scaling_property(void* _pvCtx, char* pobjUID);
 -int get_arrow_size_property(void* _pvCtx, char* pobjUID);
 -int get_segs_color_property(void* _pvCtx, char* pobjUID);
 -int get_colored_property(void* _pvCtx, char* pobjUID);
 -int get_data_mapping_property(void* _pvCtx, char* pobjUID);
 -int get_rotation_angles_property(void* _pvCtx, char* pobjUID);
 -int get_color_mode_property(void* _pvCtx, char* pobjUID);
 -int get_color_flag_property(void* _pvCtx, char* pobjUID);
 -int get_cdata_mapping_property(void* _pvCtx, char* pobjUID);
 -int get_surface_color_property(void* _pvCtx, char* pobjUID);
 -int get_triangles_property(void* _pvCtx, char* pobjUID);
 -int get_z_bounds_property(void* _pvCtx, char* pobjUID);
 -int get_user_data_property(void* _pvCtx, char* pobjUID);
 -int get_handle_visible_property(void* _pvCtx, char* pobjUID);
 -int get_callback_type_property(void* _pvCtx, char* pobjUID);
 -int get_hidden_axis_color_property(void* _pvCtx, char* pobjUID);
 -int get_x_ticks_property(void* _pvCtx, char* pobjUID);
 -int get_y_ticks_property(void* _pvCtx, char* pobjUID);
 -int get_z_ticks_property(void* _pvCtx, char* pobjUID);
 -int get_viewport_property(void* _pvCtx, char* pobjUID);
 -int get_info_message_property(void* _pvCtx, char* pobjUID);
 -int get_screen_position_property(void* _pvCtx, char* pobjUID);
 -int get_event_handler_enable_property(void* _pvCtx, char* pobjUID);
 -int get_event_handler_property(void* _pvCtx, char* pobjUID);
 -int get_arc_drawing_method_property(void* _pvCtx, char* pobjUID);
 -int get_fractional_font_property(void* _pvCtx, char* pobjUID);
 -int get_links_property(void* _pvCtx, char* pobjUID);
 -int get_legend_location_property(void* _pvCtx, char* pobjUID);
 -int get_filled_property(void* _pvCtx, char* pobjUID);
 -int get_color_range_property(void* _pvCtx, char* pobjUID);
 -int get_outside_colors_property(void* _pvCtx, char* pobjUID);
 -int get_grid_position_property(void* _pvCtx, char* pobjUID);
 -int get_anti_aliasing_property(void* _pvCtx, char* pobjUID);
 -int get_tag_property(void* _pvCtx, char* pobjUID);
 -int get_UID(void* _pvCtx, char *pobjUID);
 -int get_image_type_property(void* _pvCtx, char* pobjUID);
 -int get_video_mode_property(void* _pvCtx, char* pobjUID);
 +void* get_figures_id_property(void* _pvCtx, char* pobjUID);
 +void* get_visible_property(void* _pvCtx, char* pobjUID);
 +void* get_pixel_drawing_mode_property(void* _pvCtx, char* pobjUID);
 +void* get_old_style_property(void* _pvCtx, char* pobjUID);
 +void* get_figure_style_property(void* _pvCtx, char* pobjUID);
 +void* get_auto_resize_property(void* _pvCtx, char* pobjUID);
 +void* get_figure_position_property(void* _pvCtx, char* pobjUID);
 +void* get_axes_size_property(void* _pvCtx, char* pobjUID);
 +void* get_figure_size_property(void* _pvCtx, char* pobjUID);
 +void* get_figure_name_property(void* _pvCtx, char* pobjUID);
 +void* get_figure_id_property(void* _pvCtx, char* pobjUID);
 +void* get_figure_resizefcn_property(void* _pvCtx, char* pobjUID);
 +void* get_figure_closerequestfcn_property(void* _pvCtx, char* pobjUID);
 +void* get_rotation_style_property(void* _pvCtx, char* pobjUID);
 +void* get_immediate_drawing_property(void* _pvCtx, char* pobjUID);
 +void* get_pixmap_property(void* _pvCtx, char* pobjUID);
 +void* get_type_property(void* _pvCtx, char* pobjUID);
 +void* get_parent_property(void* _pvCtx, char* pobjUID);
 +void* get_current_axes_property(void* _pvCtx, char* pobjUID);
 +void* get_current_figure_property(void* _pvCtx, char* pobjUID);
 +void* get_current_entity_property(void* _pvCtx, char* pobjUID);
 +void* get_children_property(void* _pvCtx, char* pobjUID);
 +void* get_default_figure_property(void* _pvCtx, char* pobjUID);
 +void* get_default_axes_property(void* _pvCtx, char* pobjUID);
 +void* get_color_map_property(void* _pvCtx, char* pobjUID);
 +void* get_interp_color_vector_property(void* _pvCtx, char* pobjUID);
 +void* get_interp_color_mode_property(void* _pvCtx, char* pobjUID);
 +void* get_background_property(void* _pvCtx, char* pobjUID);
 +void* get_foreground_property(void* _pvCtx, char* pobjUID);
 +void* get_fill_mode_property(void* _pvCtx, char* pobjUID);
 +void* get_thickness_property(void* _pvCtx, char* pobjUID);
 +void* get_arrow_size_factor_property(void* _pvCtx, char* pobjUID);
 +void* get_line_style_property(void* _pvCtx, char* pobjUID);
 +void* get_line_mode_property(void* _pvCtx, char* pobjUID);
 +void* get_surface_mode_property(void* _pvCtx, char* pobjUID);
 +void* get_mark_style_property(void* _pvCtx, char* pobjUID);
 +void* get_mark_mode_property(void* _pvCtx, char* pobjUID);
 +void* get_mark_size_unit_property(void* _pvCtx, char* pobjUID);
 +void* get_mark_size_property(void* _pvCtx, char* pobjUID);
 +void* get_mark_foreground_property(void* _pvCtx, char* pobjUID);
 +void* get_mark_background_property(void* _pvCtx, char* pobjUID);
 +void* get_bar_layout_property(void* _pvCtx, char* pobjUID);
 +void* get_bar_width_property(void* _pvCtx, char* pobjUID);
 +void* get_x_shift_property(void* _pvCtx, char* pobjUID);
 +void* get_y_shift_property(void* _pvCtx, char* pobjUID);
 +void* get_z_shift_property(void* _pvCtx, char* pobjUID);
 +void* get_polyline_style_property(void* _pvCtx, char* pobjUID);
 +void* get_font_size_property(void* _pvCtx, char* pobjUID);
 +void* get_font_angle_property(void* _pvCtx, char* pobjUID);
 +void* get_font_foreground_property(void* _pvCtx, char* pobjUID);
 +void* get_font_color_property(void* _pvCtx, char* pobjUID);
 +void* get_font_style_property(void* _pvCtx, char* pobjUID);
 +void* get_text_box_mode_property(void* _pvCtx, char* pobjUID);
 +void* get_auto_dimensionning_property(void* _pvCtx, char* pobjUID);
 +void* get_alignment_property(void* _pvCtx, char* pobjUID);
 +void* get_text_box_property(void* _pvCtx, char* pobjUID);
 +void* get_text_property(void* _pvCtx, char* pobjUID);
 +void* get_auto_clear_property(void* _pvCtx, char* pobjUID);
 +void* get_auto_scale_property(void* _pvCtx, char* pobjUID);
 +void* get_zoom_box_property(void* _pvCtx, char* pobjUID);
 +void* get_zoom_state_property(void* _pvCtx, char* pobjUID);
 +void* get_clip_box_property(void* _pvCtx, char* pobjUID);
 +void* get_clip_state_property(void* _pvCtx, char* pobjUID);
 +void* get_data_property(void* _pvCtx, char* pobjUID);
 +void* get_callback_property(void* _pvCtx, char* pobjUID);
 +void* get_x_label_property(void* _pvCtx, char* pobjUID);
 +void* get_y_label_property(void* _pvCtx, char* pobjUID);
 +void* get_z_label_property(void* _pvCtx, char* pobjUID);
 +void* get_title_property(void* _pvCtx, char* pobjUID);
 +void* get_log_flags_property(void* _pvCtx, char* pobjUID);
 +void* get_tics_direction_property(void* _pvCtx, char* pobjUID);
 +void* get_x_location_property(void* _pvCtx, char* pobjUID);
 +void* get_y_location_property(void* _pvCtx, char* pobjUID);
 +void* get_tight_limits_property(void* _pvCtx, char* pobjUID);
 +void* get_closed_property(void* _pvCtx, char* pobjUID);
 +void* get_auto_position_property(void* _pvCtx, char* pobjUID);
 +void* get_auto_rotation_property(void* _pvCtx, char* pobjUID);
 +void* get_position_property(void* _pvCtx, char* pobjUID);
 +void* get_auto_ticks_property(void* _pvCtx, char* pobjUID);
 +void* get_axes_reverse_property(void* _pvCtx, char* pobjUID);
 +void* get_view_property(void* _pvCtx, char* pobjUID);
 +void* get_axes_bounds_property(void* _pvCtx, char* pobjUID);
 +void* get_data_bounds_property(void* _pvCtx, char* pobjUID);
 +void* get_margins_property(void* _pvCtx, char* pobjUID);
 +void* get_tics_color_property(void* _pvCtx, char* pobjUID);
 +void* get_tics_style_property(void* _pvCtx, char* pobjUID);
 +void* get_sub_tics_property(void* _pvCtx, char* pobjUID);
 +void* get_tics_segment_property(void* _pvCtx, char* pobjUID);
 +void* get_labels_font_size_property(void* _pvCtx, char* pobjUID);
 +void* get_labels_font_color_property(void* _pvCtx, char* pobjUID);
 +void* get_labels_font_style_property(void* _pvCtx, char* pobjUID);
 +void* get_format_n_property(void* _pvCtx, char* pobjUID);
 +void* get_xtics_coord_property(void* _pvCtx, char* pobjUID);
 +void* get_ytics_coord_property(void* _pvCtx, char* pobjUID);
 +void* get_tics_labels_property(void* _pvCtx, char* pobjUID);
 +void* get_box_property(void* _pvCtx, char* pobjUID);
 +void* get_grid_property(void* _pvCtx, char* pobjUID);
 +void* get_axes_visible_property(void* _pvCtx, char* pobjUID);
 +void* get_hidden_color_property(void* _pvCtx, char* pobjUID);
 +void* get_isoview_property(void* _pvCtx, char* pobjUID);
 +void* get_cube_scaling_property(void* _pvCtx, char* pobjUID);
 +void* get_arrow_size_property(void* _pvCtx, char* pobjUID);
 +void* get_segs_color_property(void* _pvCtx, char* pobjUID);
 +void* get_colored_property(void* _pvCtx, char* pobjUID);
 +void* get_data_mapping_property(void* _pvCtx, char* pobjUID);
 +void* get_rotation_angles_property(void* _pvCtx, char* pobjUID);
 +void* get_color_mode_property(void* _pvCtx, char* pobjUID);
 +void* get_color_flag_property(void* _pvCtx, char* pobjUID);
 +void* get_cdata_mapping_property(void* _pvCtx, char* pobjUID);
 +void* get_surface_color_property(void* _pvCtx, char* pobjUID);
 +void* get_triangles_property(void* _pvCtx, char* pobjUID);
 +void* get_z_bounds_property(void* _pvCtx, char* pobjUID);
 +void* get_user_data_property(void* _pvCtx, char* pobjUID);
 +void* get_handle_visible_property(void* _pvCtx, char* pobjUID);
 +void* get_callback_type_property(void* _pvCtx, char* pobjUID);
 +void* get_hidden_axis_color_property(void* _pvCtx, char* pobjUID);
 +void* get_x_ticks_property(void* _pvCtx, char* pobjUID);
 +void* get_y_ticks_property(void* _pvCtx, char* pobjUID);
 +void* get_z_ticks_property(void* _pvCtx, char* pobjUID);
 +void* get_viewport_property(void* _pvCtx, char* pobjUID);
 +void* get_info_message_property(void* _pvCtx, char* pobjUID);
 +void* get_screen_position_property(void* _pvCtx, char* pobjUID);
 +void* get_event_handler_enable_property(void* _pvCtx, char* pobjUID);
 +void* get_event_handler_property(void* _pvCtx, char* pobjUID);
 +void* get_arc_drawing_method_property(void* _pvCtx, char* pobjUID);
 +void* get_fractional_font_property(void* _pvCtx, char* pobjUID);
 +void* get_links_property(void* _pvCtx, char* pobjUID);
 +void* get_legend_location_property(void* _pvCtx, char* pobjUID);
 +void* get_filled_property(void* _pvCtx, char* pobjUID);
 +void* get_color_range_property(void* _pvCtx, char* pobjUID);
 +void* get_outside_colors_property(void* _pvCtx, char* pobjUID);
 +void* get_grid_position_property(void* _pvCtx, char* pobjUID);
 +void* get_anti_aliasing_property(void* _pvCtx, char* pobjUID);
 +void* get_tag_property(void* _pvCtx, char* pobjUID);
 +void* get_UID(void* _pvCtx, char *pobjUID);
++void* get_image_type_property(void* _pvCtx, char* pobjUID);
++void* get_video_mode_property(void* _pvCtx, char* pobjUID);
  
  #endif /* _GET_HANDLE_PROPERTY_H_ */
  
  #include "getGraphicObjectProperty.h"
  #include "graphicObjectProperties.h"
+ #include "Matplot.h"
+ #include "returnProperty.h"
+ /*--------------------------------------------------------------------------*/
+ /* the matplot data can have several type */
 -int getmatplotdata(void * _pvCtx, char *pobjUID)
++void* getmatplotdata(void * _pvCtx, char *pobjUID)
+ {
+     int datatype = 0;
+     int * piDataType = &datatype;
+     int numX = 0;
+     int *piNumX = &numX;
+     int numY = 0;
+     int *piNumY = &numY;
+     void * data = NULL;
+     int imagetype = 0;
+     int * piImagetype = &imagetype;
+     int gltype = 0;
+     int * piGltype = &gltype;
 -    int status = SET_PROPERTY_ERROR;
++    void* status = NULL;
+     getGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_NUM_X__, jni_int, (void **)&piNumX);
+     getGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_NUM_Y__, jni_int, (void **)&piNumY);
+     getGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_MATPLOT_DATA_TYPE__, jni_int, (void **)&piDataType);
+     getGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_Z__, jni_double_vector, &data);
+     getGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_MATPLOT_IMAGE_TYPE__, jni_int, (void **)&piImagetype);
+     getGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_MATPLOT_GL_TYPE__, jni_int, (void **)&piGltype);
+     if (!data)
+     {
 -        return sciReturnEmptyMatrix(_pvCtx);
++        return sciReturnEmptyMatrix();
+     }
  
+     switch ((DataType)datatype)
+     {
+         case MATPLOT_HM1_Char :
+         {
+             int dims[3] = {numY - 1, numX - 1, 1};
 -            status = sciReturnHypermatOfInteger8(_pvCtx, dims, 3, (char*)data);
++            status = sciReturnHypermatOfInteger8(dims, 3, (char*)data);
+             break;
+         }
+         case MATPLOT_HM1_UChar :
+         {
+             int dims[3] = {numY - 1, numX - 1, 1};
 -            status = sciReturnHypermatOfUnsignedInteger8(_pvCtx, dims, 3, (unsigned char*)data);
++            status = sciReturnHypermatOfUnsignedInteger8(dims, 3, (unsigned char*)data);
+             break;
+         }
+         case MATPLOT_HM3_Char :
+         {
+             int dims[3] = {numY - 1, numX - 1, 3};
 -            status = sciReturnHypermatOfInteger8(_pvCtx, dims, 3, (char*)data);
++            status = sciReturnHypermatOfInteger8(dims, 3, (char*)data);
+             break;
+         }
+         case MATPLOT_HM3_UChar :
+         {
+             int dims[3] = {numY - 1, numX - 1, 3};
 -            status = sciReturnHypermatOfUnsignedInteger8(_pvCtx, dims, 3, (unsigned char*)data);
++            status = sciReturnHypermatOfUnsignedInteger8(dims, 3, (unsigned char*)data);
+             break;
+         }
+         case MATPLOT_HM1_Double :
+         {
+             int dims[3] = {numY - 1, numX - 1, 1};
 -            status = sciReturnHypermatOfDouble(_pvCtx, dims, 3, (double*)data);
++            status = sciReturnHypermatOfDouble(dims, 3, (double*)data);
+             break;
+         }
+         case MATPLOT_HM3_Double :
+         {
+             int dims[3] = {numY - 1, numX - 1, 3};
 -            status = sciReturnHypermatOfDouble(_pvCtx, dims, 3, (double*)data);
++            status = sciReturnHypermatOfDouble(dims, 3, (double*)data);
+             break;
+         }
+         case MATPLOT_HM4_Char :
+         {
+             int dims[3] = {numY - 1, numX - 1, 4};
 -            status = sciReturnHypermatOfInteger8(_pvCtx, dims, 3, (char*)data);
++            status = sciReturnHypermatOfInteger8(dims, 3, (char*)data);
+             break;
+         }
+         case MATPLOT_HM4_UChar :
+         {
+             int dims[3] = {numY - 1, numX - 1, 4};
 -            status = sciReturnHypermatOfUnsignedInteger8(_pvCtx, dims, 3, (unsigned char*)data);
++            status = sciReturnHypermatOfUnsignedInteger8(dims, 3, (unsigned char*)data);
+             break;
+         }
+         case MATPLOT_HM4_Double :
+         {
+             int dims[3] = {numY - 1, numX - 1, 4};
 -            status = sciReturnHypermatOfDouble(_pvCtx, dims, 3, (double*)data);
++            status = sciReturnHypermatOfDouble(dims, 3, (double*)data);
+             break;
+         }
+         case MATPLOT_Char :
+         {
 -            status = sciReturnMatrixOfInteger8(_pvCtx, (char*)data, numY - 1, numX - 1);
++            status = sciReturnMatrixOfInteger8((char*)data, numY - 1, numX - 1);
+             break;
+         }
+         case MATPLOT_UChar :
+         {
+             if ((ImageType)imagetype == MATPLOT_RGB)
+             {
 -                status = sciReturnMatrixOfUnsignedInteger8(_pvCtx, (unsigned char*)data, 3 * (numY - 1), numX - 1);
++                status = sciReturnMatrixOfUnsignedInteger8((unsigned char*)data, 3 * (numY - 1), numX - 1);
+             }
+             else if ((ImageType)imagetype == MATPLOT_GL_RGBA)
+             {
 -                status = sciReturnMatrixOfUnsignedInteger8(_pvCtx, (unsigned char*)data, 4 * (numY - 1), numX - 1);
++                status = sciReturnMatrixOfUnsignedInteger8((unsigned char*)data, 4 * (numY - 1), numX - 1);
+             }
+             else
+             {
 -                status = sciReturnMatrixOfUnsignedInteger8(_pvCtx, (unsigned char*)data, numY - 1, numX - 1);
++                status = sciReturnMatrixOfUnsignedInteger8((unsigned char*)data, numY - 1, numX - 1);
+             }
+             break;
+         }
+         case MATPLOT_Short :
+         {
 -            status = sciReturnMatrixOfInteger16(_pvCtx, (short*)data, numY - 1, numX - 1);
++            status = sciReturnMatrixOfInteger16((short*)data, numY - 1, numX - 1);
+             break;
+         }
+         case MATPLOT_UShort :
+         {
 -            status = sciReturnMatrixOfUnsignedInteger16(_pvCtx, (unsigned short*)data, numY - 1, numX - 1);
++            status = sciReturnMatrixOfUnsignedInteger16((unsigned short*)data, numY - 1, numX - 1);
+             break;
+         }
+         case MATPLOT_Int :
+         {
 -            status = sciReturnMatrixOfInteger32(_pvCtx, (int*)data, numY - 1, numX - 1);
++            status = sciReturnMatrixOfInteger32((int*)data, numY - 1, numX - 1);
+             break;
+         }
+         case MATPLOT_UInt :
+         {
 -            status = sciReturnMatrixOfUnsignedInteger32(_pvCtx, (unsigned int*)data, numY - 1, numX - 1);
++            status = sciReturnMatrixOfUnsignedInteger32((unsigned int*)data, numY - 1, numX - 1);
+             break;
+         }
+         case MATPLOT_Double :
+         {
 -            status = sciReturnMatrix(_pvCtx, (double*)data, numY - 1, numX - 1);
++            status = sciReturnMatrix((double*)data, numY - 1, numX - 1);
+             break;
+         }
+     }
+     return status;
+ }
  /*--------------------------------------------------------------------------*/
  /* F.Leray 29.04.05 */
  /* the grayplot data is now given as a tlist (like for surface and champ objects) */
  #ifndef _GET_DATA_PROPERTY_H_
  #define _GET_DATA_PROPERTY_H_
  
 -int getmatplotdata (void * _pvCtx, char *pobjUID);
++void* getmatplotdata (void * _pvCtx, char *pobjUID);
  /* the grayplot data is now given as a tlist (like for surface and champ objects) */
  
- void* getgrayplotdata (char *);
 -int getgrayplotdata (char *pobjUID);
++void* getgrayplotdata (char *pobjUID);
  
  /* the champ data is now given as a tlist (like for surface objects) */
 -int getchampdata(char *pobjUID);
 +void* getchampdata(char *pobjUID);
  
 -int get3ddata(char *pobjUID);
 +void* get3ddata(char *pobjUID);
  
  #endif /* _GET_DATA_PROPERTY_H_ */
index 0000000,d460ec5..f6fd8c0
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,76 +1,76 @@@
+ /*
+  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+  * Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+  *
+  * This file must be used under the terms of the CeCILL.
+  * This source file is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution.  The terms
+  * are also available at
+  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+  *
+  */
+ /*------------------------------------------------------------------------*/
+ /* file: get_image_type_property.c                                         */
+ /* desc : function to get in Scilab the image_type field of             */
+ /*        a matplot handle                                                        */
+ /*------------------------------------------------------------------------*/
+ #include "setHandleProperty.h"
+ #include "SetProperty.h"
+ #include "getPropertyAssignedValue.h"
+ #include "Scierror.h"
+ #include "localization.h"
+ #include "SetPropertyStatus.h"
+ #include "getGraphicObjectProperty.h"
+ #include "graphicObjectProperties.h"
+ #include "Matplot.h"
+ /*------------------------------------------------------------------------*/
 -int get_image_type_property(void* _pvCtx, char* pobjUID)
++void* get_image_type_property(void* _pvCtx, char* pobjUID)
+ {
+     int imagetype = 0;
+     int * piImagetype = &imagetype;
+     ImageType itype = (ImageType)imagetype;
+     getGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_MATPLOT_IMAGE_TYPE__, jni_int, (void **)&piImagetype);
+     if (piImagetype == NULL)
+     {
+         Scierror(999, _("'%s' property does not exist for this handle.\n"), "image_type");
 -        return -1;
++        return NULL;
+     }
+     switch (itype)
+     {
+         case MATPLOT_RGB :
 -            return sciReturnString(_pvCtx, "rgb");
++            return sciReturnString("rgb");
+         case MATPLOT_RGBA :
 -            return sciReturnString(_pvCtx, "rgba");
++            return sciReturnString("rgba");
+         case MATPLOT_GRAY :
 -            return sciReturnString(_pvCtx, "gray");
++            return sciReturnString("gray");
+         case MATPLOT_INDEX :
 -            return sciReturnString(_pvCtx, "index");
++            return sciReturnString("index");
+         case MATPLOT_RED :
 -            return sciReturnString(_pvCtx, "red");
++            return sciReturnString("red");
+         case MATPLOT_GREEN :
 -            return sciReturnString(_pvCtx, "green");
++            return sciReturnString("green");
+         case MATPLOT_BLUE :
 -            return sciReturnString(_pvCtx, "blue");
++            return sciReturnString("blue");
+         case MATPLOT_RGB_332 :
 -            return sciReturnString(_pvCtx, "rgb332");
++            return sciReturnString("rgb332");
+         case MATPLOT_RGB_444 :
 -            return sciReturnString(_pvCtx, "rgb444");
++            return sciReturnString("rgb444");
+         case MATPLOT_RGBA_4444 :
 -            return sciReturnString(_pvCtx, "rgba444");
++            return sciReturnString("rgba444");
+         case MATPLOT_RGB_555 :
 -            return sciReturnString(_pvCtx, "rgb555");
++            return sciReturnString("rgb555");
+         case MATPLOT_RGBA_5551 :
 -            return sciReturnString(_pvCtx, "rgba5551");
++            return sciReturnString("rgba5551");
+         default :
+             Scierror(999, _("Wrong value for '%s' property.\n"), "image_type");
 -            return -1;
++            return NULL;
+     }
+ }
+ /*------------------------------------------------------------------------*/
index 0000000,e1fc7e4..83c6960
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,118 +1,119 @@@
+ /*
+  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+  * Copyright (C) 2013 - Scilab Enterprises - Calixte DENIZET
+  *
+  * This file must be used under the terms of the CeCILL.
+  * This source file is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution.  The terms
+  * are also available at
+  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+  *
+  */
+ /*------------------------------------------------------------------------*/
+ /* file: set_image_type_property.c                                         */
+ /* desc : function to modify in Scilab the image_type field of             */
+ /*        a matplot handle                                                        */
+ /*------------------------------------------------------------------------*/
+ #include "setHandleProperty.h"
+ #include "SetProperty.h"
+ #include "getPropertyAssignedValue.h"
+ #include "Scierror.h"
+ #include "localization.h"
+ #include "SetPropertyStatus.h"
++#include "getGraphicObjectProperty.h"
+ #include "setGraphicObjectProperty.h"
+ #include "graphicObjectProperties.h"
+ #include "stricmp.h"
+ #include "Matplot.h"
+ /*------------------------------------------------------------------------*/
+ int set_image_type_property(void* _pvCtx, char* pobjUID, void* _pvData, int valueType, int nbRow, int nbCol)
+ {
+     BOOL status = FALSE;
+     int imagetype = (int)MATPLOT_INDEX;
+     int type = -1;
+     int *piType = &type;
+     if (valueType != sci_strings)
+     {
+         Scierror(999, _("Wrong type for '%s' property: String expected.\n"), "image_type");
+         return SET_PROPERTY_ERROR;
+     }
+     getGraphicObjectProperty(pobjUID, __GO_TYPE__, jni_int, (void **)&piType);
+     if (type != __GO_MATPLOT__)
+     {
+         Scierror(999, _("Incompatible type for property %s.\n"), "image_type");
+         return SET_PROPERTY_ERROR;
+     }
+     if (stricmp((char*)_pvData, "rgb") == 0)
+     {
+         imagetype = (int)MATPLOT_RGB;
+     }
+     else if (stricmp((char*)_pvData, "rgba") == 0)
+     {
+         imagetype = (int)MATPLOT_RGBA;
+     }
+     else if (stricmp((char*)_pvData, "gray") == 0)
+     {
+         imagetype = (int)MATPLOT_GRAY;
+     }
+     else if (stricmp((char*)_pvData, "index") == 0)
+     {
+         imagetype = (int)MATPLOT_INDEX;
+     }
+     else if (stricmp((char*)_pvData, "red") == 0)
+     {
+         imagetype = (int)MATPLOT_RED;
+     }
+     else if (stricmp((char*)_pvData, "green") == 0)
+     {
+         imagetype = (int)MATPLOT_GREEN;
+     }
+     else if (stricmp((char*)_pvData, "blue") == 0)
+     {
+         imagetype = (int)MATPLOT_BLUE;
+     }
+     else if (stricmp((char*)_pvData, "rgb332") == 0)
+     {
+         imagetype = (int)MATPLOT_RGB_332;
+     }
+     else if (stricmp((char*)_pvData, "rgb444") == 0)
+     {
+         imagetype = (int)MATPLOT_RGB_444;
+     }
+     else if (stricmp((char*)_pvData, "rgba4444") == 0)
+     {
+         imagetype = (int)MATPLOT_RGBA_4444;
+     }
+     else if (stricmp((char*)_pvData, "rgb555") == 0)
+     {
+         imagetype = (int)MATPLOT_RGB_555;
+     }
+     else if (stricmp((char*)_pvData, "rgba5551") == 0)
+     {
+         imagetype = (int)MATPLOT_RGBA_5551;
+     }
+     else
+     {
+         Scierror(999, _("Wrong value for '%s' property: Must be in the set {%s}.\n"), "image_type", "rgb, rgba, gray, index");
+         return SET_PROPERTY_ERROR;
+     }
+     status = setGraphicObjectProperty(pobjUID, __GO_DATA_MODEL_MATPLOT_IMAGE_TYPE__, &imagetype, jni_int, 1);
+     if (status == TRUE)
+     {
+         return SET_PROPERTY_SUCCEED;
+     }
+     else
+     {
+         Scierror(999, _("Invalid image type for this handle.\n"));
+         return SET_PROPERTY_ERROR;
+     }
+ }
+ /*------------------------------------------------------------------------*/
index 2424431,0000000..cdb1470
mode 100644,000000..100644
--- /dev/null
@@@ -1,238 -1,0 +1,242 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\dynlib_gui_gw.h" />
 +    <ClInclude Include="..\..\includes\gui_gw.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClCompile Include="gui_gw.cpp" />
 +    <ClCompile Include="sci_helpbrowser.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
 +      <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\ast\ast.vcxproj">
 +      <Project>{0d3fa25b-8116-44ec-a45e-260789daa3d9}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\commons\src\c\commons.vcxproj">
 +      <Project>{eca09a1e-6d12-4a47-92e1-a671c181df77}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\jvm\libjvm.vcxproj">
 +      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\src\c\gui.vcxproj">
 +      <Project>{45ca5b12-7601-4968-ae16-16069fd1a152}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{83C04253-B152-4EF6-BB36-35A7B0FDFB98}</ProjectGuid>
 +    <RootNamespace>gui_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
Simple merge
index ed44a25,0000000..34b1842
mode 100644,000000..100644
--- /dev/null
@@@ -1,294 -1,0 +1,298 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{CE49C183-2ECE-4EA4-B289-D74E2E664164}</ProjectGuid>
 +    <RootNamespace>history_manager_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)</TargetName>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
 +      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="history_manager_gw.cpp" />
 +    <ClCompile Include="sci_addhistory.cpp" />
 +    <ClCompile Include="sci_displayhistory.cpp" />
 +    <ClCompile Include="sci_gethistory.cpp" />
 +    <ClCompile Include="sci_gethistoryfile.cpp" />
 +    <ClCompile Include="sci_historymanager.cpp" />
 +    <ClCompile Include="sci_historysize.cpp" />
 +    <ClCompile Include="sci_loadhistory.cpp" />
 +    <ClCompile Include="sci_removelinehistory.cpp" />
 +    <ClCompile Include="sci_resethistory.cpp" />
 +    <ClCompile Include="sci_saveafterncommands.cpp" />
 +    <ClCompile Include="sci_saveconsecutivecommands.cpp" />
 +    <ClCompile Include="sci_savehistory.cpp" />
 +    <ClCompile Include="sci_sethistoryfile.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\dynlib_history_manager_gw.h" />
 +    <ClInclude Include="..\..\includes\history_manager_gw.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
 +      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\fileio\fileio.vcxproj">
 +      <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\string\src\c\string.vcxproj">
 +      <Project>{8d45767a-9b03-4905-97f6-d2f3f79141ea}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\src\c\history_manager.vcxproj">
 +      <Project>{1b98dc87-44f5-48ae-b5d0-29dd8ad86f5e}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <ItemGroup>
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index d2a06a8,0000000..c65f077
mode 100644,000000..100644
--- /dev/null
@@@ -1,244 -1,0 +1,248 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{215274D7-05EC-4D1E-B7BB-B2C957DA960B}</ProjectGuid>
 +    <RootNamespace>integer_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
++    <PlatformToolset>v110</PlatformToolset>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../dynamic_link/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;INTEGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../dynamic_link/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;INTEGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../dynamic_link/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <IntrinsicFunctions>true</IntrinsicFunctions>
 +      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../dynamic_link/includes;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../console/includes;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;INTEGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <FunctionLevelLinking>true</FunctionLevelLinking>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <Link>
 +      <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +    </Link>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>