Merge remote-tracking branch 'origin/master' into YaSp 29/10729/3
Sylvestre Ledru [Thu, 7 Mar 2013 14:27:15 +0000 (15:27 +0100)]
Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/libs/MALLOC/MALLOC.rc
scilab/libs/MALLOC/MALLOC.vcxproj
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/doublylinkedlist/doublylinkedlist.rc
scilab/libs/doublylinkedlist/doublylinkedlist.vcxproj
scilab/libs/dynamiclibrary/Makefile.am
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/dynamiclibrary/dynamiclibrary.rc
scilab/libs/dynamiclibrary/dynamiclibrary.vcxproj
scilab/libs/dynamiclibrary/dynamiclibrary.vcxproj.filters
scilab/libs/dynamiclibrary/src/dynamiclibrary_windows.c
scilab/libs/hashtable/Makefile.in
scilab/libs/hashtable/hashtable.rc
scilab/libs/hashtable/hashtable.vcxproj.filters
scilab/libs/libst/Makefile.in
scilab/libs/libst/libst.rc
scilab/libs/libst/libst.vcxproj.filters
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/src/c/action_binding.vcxproj
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/core_Import.def
scilab/modules/arnoldi/arnoldi.vcxproj
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/src/c/boolean.vcxproj
scilab/modules/boolean/src/c/core_Import.def
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/src/c/cacsd.vcxproj
scilab/modules/cacsd/src/c/core_Import.def
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/commons/src/c/core_Import.def
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/src/c/completion.vcxproj
scilab/modules/completion/src/c/completion_generic.c
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core.iss
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/data_structures/src/c/data_structures.vcxproj
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/double/src/c/double.vcxproj
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/includes/dynamiclibrary_windows.h
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj
scilab/modules/dynamic_link/src/c/dynamiclibrary_others.c
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/external_objects/external_objects.vcxproj
scilab/modules/fftw/fftw.vcxproj
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/core_Import.def
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/src/c/mget.c
scilab/modules/fileio/src/c/mput.c
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/src/c/functions.vcxproj
scilab/modules/graphic_export/core_Import.def
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/core_Import.def
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/src/nographics/nographics.vcxproj
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/hdf5/src/c/core_Import.def
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/helptools/src/c/core_Import.def
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/src/c/core_Import.def
scilab/modules/history_browser/src/c/history_browser.vcxproj
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/src/c/history_manager.vcxproj
scilab/modules/history_manager/src/cpp/HistoryFile.cpp
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/history_manager/src/cpp/HistoryManager.hxx
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/integer/src/c/integer.vcxproj
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/src/c/interpolation.vcxproj
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/intersci/src/lib/core_Import.def
scilab/modules/intersci/src/lib/intersci.vcxproj
scilab/modules/intersci/src/lib/intersci.vcxproj.filters
scilab/modules/io/src/c/core_Import.def
scilab/modules/io/src/c/io.vcxproj
scilab/modules/javasci/Javasci.vcxproj
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/core_Import.def
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/src/core_Import.def
scilab/modules/localization/src/localization.vcxproj
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/matio/matio.vcxproj
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/mexlib/src/libmat/libmat.vcxproj
scilab/modules/mexlib/src/libmex/libmex.vcxproj
scilab/modules/mexlib/src/libmx/libmx.vcxproj
scilab/modules/optimization/src/c/core_Import.def
scilab/modules/optimization/src/c/optimization.vcxproj
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/src/c/parallel.vcxproj
scilab/modules/parameters/Makefile.am
scilab/modules/parameters/Makefile.in
scilab/modules/parameters/parameters.vcxproj
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/polynomials/src/c/polynomials.vcxproj
scilab/modules/preferences/src/c/core_Import.def
scilab/modules/preferences/src/c/preferences.vcxproj
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/src/c/randlib.vcxproj
scilab/modules/renderer/renderer.vcxproj
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scinotes/src/c/scinotes.vcxproj
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/src/c/signal_processing.vcxproj
scilab/modules/sound/core_Import.def
scilab/modules/sound/sound.vcxproj
scilab/modules/sparse/src/c/sparse.vcxproj
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/src/c/statistics.vcxproj
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/macros/sci2exp.sci
scilab/modules/string/sci_gateway/c/sci_strtod.c
scilab/modules/string/src/c/core_Import.def
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/src/c/symbolic.vcxproj
scilab/modules/tclsci/tclsci.vcxproj
scilab/modules/time/time.vcxproj
scilab/modules/types/types.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/umfpack/src/c/core_Import.def
scilab/modules/umfpack/src/c/umfpack.vcxproj
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/sci_gateway/c/sci_winqueryreg.c
scilab/modules/windows_tools/src/c/core_Import.def
scilab/modules/windows_tools/src/c/scilab_windows/FindScilab.c
scilab/modules/windows_tools/src/c/scilab_windows/SetScilabEnvironmentVariables.c
scilab/modules/windows_tools/src/c/scilab_windows/TextToPrint.c
scilab/modules/windows_tools/src/c/scilab_windows/core_Import.def
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj.filters
scilab/modules/windows_tools/src/c/windows_tools.vcxproj
scilab/modules/xcos/src/c/xcos.vcxproj
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in
scilab/modules/xml/xml.vcxproj

Change-Id: I5430f4563969aa3650c013e34635550563e41f7a

401 files changed:
1  2 
scilab/.gitignore
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/bin/bin.iss
scilab/configure
scilab/configure.ac
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj
scilab/modules/action_binding/src/c/action_binding.vcxproj
scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/InterpreterManagement.java
scilab/modules/action_binding/src/java/org/scilab/modules/action_binding/InterpreterManagementJNI.java
scilab/modules/action_binding/src/jni/InterpreterManagement_wrap.c
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/core_Import.def
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.vcxproj
scilab/modules/arnoldi/arnoldi.vcxproj.filters
scilab/modules/ast/Makefile.am
scilab/modules/ast/Makefile.in
scilab/modules/ast/ast-tools/ast-tools.vcxproj
scilab/modules/ast/ast-tools/ast-tools.vcxproj.filters
scilab/modules/ast/ast-tools/core_Import.def
scilab/modules/ast/ast.vcxproj
scilab/modules/ast/ast.vcxproj.filters
scilab/modules/ast/core_Import.def
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/src/c/boolean.vcxproj
scilab/modules/boolean/src/cpp/boolean_gw.vcxproj
scilab/modules/cacsd/src/c/cacsd.vcxproj
scilab/modules/cacsd/src/c/core_Import.def
scilab/modules/call_scilab/Makefile.am
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/call_scilab/core_Import.def
scilab/modules/commons/Makefile.am
scilab/modules/commons/Makefile.in
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/c/core_Import.def
scilab/modules/commons/src/java/org/scilab/modules/commons/CommonFileUtils.java
scilab/modules/commons/src/java/org/scilab/modules/commons/CommonFileUtilsJNI.java
scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabCommons.java
scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabCommonsJNI.java
scilab/modules/commons/src/jni/CommonFileUtils_wrap.c
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/src/c/completion.vcxproj
scilab/modules/completion/src/c/completion_generic.c
scilab/modules/completion/src/java/org/scilab/modules/completion/Completion.java
scilab/modules/completion/src/java/org/scilab/modules/completion/CompletionJNI.java
scilab/modules/completion/src/jni/Completion_wrap.c
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj
scilab/modules/console/src/c/GetCommandLine.c
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/c/core_Import.def
scilab/modules/console/src/java/org/scilab/modules/console/DropFiles.java
scilab/modules/console/src/java/org/scilab/modules/console/DropFilesJNI.java
scilab/modules/console/src/java/org/scilab/modules/console/GuiManagement.java
scilab/modules/console/src/java/org/scilab/modules/console/GuiManagementJNI.java
scilab/modules/console/src/jni/DropFiles_wrap.c
scilab/modules/console/src/jni/GuiManagement_wrap.c
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core.iss
scilab/modules/core/core_yasp.vcxproj
scilab/modules/core/includes/scilabDefaults.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/cpp/core_gw.vcxproj
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/src/c/data_structures.vcxproj
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/sci_gateway/differential_equations_gw.vcxproj
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/includes/dynamiclibrary_others.h
scilab/modules/dynamic_link/includes/dynamiclibrary_windows.h
scilab/modules/dynamic_link/macros/ilib_compile.sci
scilab/modules/dynamic_link/sci_gateway/cpp/dynamic_link_gw.vcxproj
scilab/modules/dynamic_link/src/c/core_Import.def
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj.filters
scilab/modules/dynamic_link/src/c/dynamiclibrary_others.c
scilab/modules/dynamic_link/src/c/dynamiclibrary_windows.c
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj
scilab/modules/elementary_functions/sci_gateway/cpp/sci_imult.cpp
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/external_objects/Makefile.am
scilab/modules/external_objects/Makefile.in
scilab/modules/external_objects/external_objects.vcxproj
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fftw/fftw.vcxproj
scilab/modules/fftw/fftw.vcxproj.filters
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/core_Import.def
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcxproj
scilab/modules/fileio/src/cpp/mget.cpp
scilab/modules/fileio/src/cpp/mput.cpp
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/sci_gateway/cpp/functions_gw.vcxproj
scilab/modules/functions/src/c/functions.vcxproj
scilab/modules/functions_manager/Makefile.am
scilab/modules/functions_manager/Makefile.in
scilab/modules/functions_manager/functions_manager.vcxproj
scilab/modules/functions_manager/functions_manager.vcxproj.filters
scilab/modules/functions_manager/src/cpp/dynamic_modules.cpp
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/core_Import.def
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_export/graphic_export.vcxproj.filters
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/java/org/scilab/modules/graphic_objects/DataLoader.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoaderJNI.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ScilabNativeView.java
scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/ScilabNativeViewJNI.java
scilab/modules/graphic_objects/src/jni/DataLoader_wrap.c
scilab/modules/graphic_objects/src/jni/ScilabNativeView_wrap.c
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/core_Import.def
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/macros/%h_p.sci
scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj
scilab/modules/graphics/src/nographics/nographics.vcxproj
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj
scilab/modules/gui/src/c/core_Import.def
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/java/org/scilab/modules/gui/ScilabTermination.java
scilab/modules/gui/src/java/org/scilab/modules/gui/ScilabTerminationJNI.java
scilab/modules/gui/src/jni/ScilabTermination_wrap.c
scilab/modules/gui/src/nogui/nogui.vcxproj
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/src/c/core_Import.def
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/src/c/core_Import.def
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/history_browser/src/c/core_Import.def
scilab/modules/history_browser/src/c/history_browser.vcxproj
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/includes/HistoryManager.h
scilab/modules/history_manager/sci_gateway/cpp/history_manager_gw.vcxproj
scilab/modules/history_manager/src/c/core_Import.def
scilab/modules/history_manager/src/c/history_manager.vcxproj
scilab/modules/history_manager/src/cpp/HistoryFile.cpp
scilab/modules/history_manager/src/cpp/HistoryFile.hxx
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/history_manager/src/java/org/scilab/modules/history_manager/HistoryManagement.java
scilab/modules/history_manager/src/java/org/scilab/modules/history_manager/HistoryManagementJNI.java
scilab/modules/history_manager/src/jni/HistoryManagement_wrap.c
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/integer/src/c/integer.vcxproj
scilab/modules/integer/src/cpp/integer_gw.vcxproj
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/src/c/interpolation.vcxproj
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/src/c/core_Import.def
scilab/modules/io/src/c/io.vcxproj
scilab/modules/io/src/cpp/io_gw.vcxproj
scilab/modules/javasci/Javasci.vcxproj
scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
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/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/core_Import.def
scilab/modules/jvm/includes/InitializeJVM.h
scilab/modules/jvm/includes/TerminateJVM.h
scilab/modules/jvm/includes/catchIfJavaException.h
scilab/modules/jvm/includes/getScilabJavaVM.h
scilab/modules/jvm/includes/gw_jvm.h
scilab/modules/jvm/includes/loadBackGroundClassPath.h
scilab/modules/jvm/includes/loadOnUseClassPath.h
scilab/modules/jvm/includes/system_getproperty.h
scilab/modules/jvm/jvm.iss
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/libjvm_export.def
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj
scilab/modules/jvm/src/c/JVM_functions.h
scilab/modules/jvm/src/c/getLibrarypath.h
scilab/modules/jvm/src/c/system_setproperty.h
scilab/modules/jvm/src/nojvm/nojvm.c
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/sci_gateway/cpp/linear_algebra_gw.vcxproj
scilab/modules/linear_algebra/src/c/core_Import.def
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/includes/InitializeLocalization.h
scilab/modules/localization/includes/LanguagePreferences_Windows.h
scilab/modules/localization/includes/gw_localization.h
scilab/modules/localization/includes/setgetlanguage.h
scilab/modules/localization/localization.iss
scilab/modules/localization/sci_gateway/cpp/localization_gw.vcxproj
scilab/modules/localization/src/c/setdefaultlanguage.c
scilab/modules/localization/src/c/setgetlanguage.c
scilab/modules/localization/src/core_Import.def
scilab/modules/localization/src/java/org/scilab/modules/localization/LocaleToLCID.java
scilab/modules/localization/src/java/org/scilab/modules/localization/LocaleToLCIDJNI.java
scilab/modules/localization/src/java/org/scilab/modules/localization/Messages.java
scilab/modules/localization/src/java/org/scilab/modules/localization/MessagesJNI.java
scilab/modules/localization/src/java/org/scilab/modules/localization/WindowsDefaultLanguage.java
scilab/modules/localization/src/java/org/scilab/modules/localization/WindowsDefaultLanguageJNI.java
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/localization/src/localization.vcxproj
scilab/modules/localization/src/localization.vcxproj.filters
scilab/modules/localization/src/localization_export.def
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/matio/includes/matio_gw.hxx
scilab/modules/matio/matio.vcxproj
scilab/modules/matio/sci_gateway/cpp/matio_gw.vcxproj
scilab/modules/matio/src/c/CreateCellVariable.c
scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
scilab/modules/matio/src/c/CreateStructVariable.c
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/mexlib/src/libmat/libmat.vcxproj
scilab/modules/mexlib/src/libmex/libmex.vcxproj
scilab/modules/mexlib/src/libmx/libmx.vcxproj
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/src/c/core_Import.def
scilab/modules/optimization/src/c/optimization.vcxproj
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/sci_gateway/cpp/output_stream_gw/output_stream_gw.vcxproj
scilab/modules/output_stream/src/c/core_Import.def
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/src/c/parallel.vcxproj
scilab/modules/parameters/Makefile.am
scilab/modules/parameters/Makefile.in
scilab/modules/parameters/parameters.vcxproj
scilab/modules/parse/Makefile.am
scilab/modules/parse/Makefile.in
scilab/modules/parse/core_Import.def
scilab/modules/parse/parse.vcxproj
scilab/modules/parse/parse.vcxproj.filters
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/polynomials/src/c/polynomials.vcxproj
scilab/modules/preferences/Makefile.am
scilab/modules/preferences/Makefile.in
scilab/modules/preferences/src/c/core_Import.def
scilab/modules/preferences/src/c/preferences.vcxproj
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/src/c/randlib.vcxproj
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/renderer.vcxproj
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/src/c/core_Import.def
scilab/modules/scinotes/src/c/scinotes.vcxproj
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabKeywords.java
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabKeywordsJNI.java
scilab/modules/scinotes/src/jni/ScilabKeywords_wrap.c
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/sci_gateway/cpp/signal_processing_gw.vcxproj
scilab/modules/signal_processing/src/c/signal_processing.vcxproj
scilab/modules/sound/Makefile.am
scilab/modules/sound/Makefile.in
scilab/modules/sound/sound.vcxproj
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/src/c/sparse.vcxproj
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/src/c/core_Import.def
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/sci_gateway/cpp/statistics_gw.vcxproj
scilab/modules/statistics/src/c/statistics.vcxproj
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/cpp/string_gw.vcxproj
scilab/modules/string/src/c/core_Import.def
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/symbol/Makefile.am
scilab/modules/symbol/Makefile.in
scilab/modules/symbol/symbol.vcxproj
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/src/c/symbolic.vcxproj
scilab/modules/system_env/Makefile.am
scilab/modules/system_env/Makefile.in
scilab/modules/system_env/core_Import.def
scilab/modules/system_env/system_env.vcxproj
scilab/modules/system_env/system_env.vcxproj.filters
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/core_Import.def
scilab/modules/tclsci/tclsci.vcxproj
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/sci_gateway/cpp/time_gw.vcxproj
scilab/modules/time/time.vcxproj
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/core_Import.def
scilab/modules/types/dynamic_link_Import.def
scilab/modules/types/sci_gateway/cpp/types_gw/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/java/org/scilab/modules/types/ScilabIntegerTypeEnum.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabTypeEnum.java
scilab/modules/types/src/jni/getScilabVariable_wrap.c
scilab/modules/types/types.vcxproj
scilab/modules/types/types.vcxproj.filters
scilab/modules/types/typesmacro/typesmacro.vcxproj
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/c/core_Import.def
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/UI_data.java
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/UI_dataJNI.java
scilab/modules/ui_data/src/jni/ui_data_wrap.c
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/umfpack/src/c/umfpack.vcxproj
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/sci_gateway/c/sci_winqueryreg.c
scilab/modules/windows_tools/src/c/core_Import.def
scilab/modules/windows_tools/src/c/registry.c
scilab/modules/windows_tools/src/c/scilab_windows/FilesAssociations.c
scilab/modules/windows_tools/src/c/scilab_windows/FindScilab.c
scilab/modules/windows_tools/src/c/scilab_windows/SetScilabEnvironmentVariables.c
scilab/modules/windows_tools/src/c/scilab_windows/TextToPrint.c
scilab/modules/windows_tools/src/c/scilab_windows/core_Import.def
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj.filters
scilab/modules/windows_tools/src/c/windows_tools.vcxproj
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/src/c/core_Import.def
scilab/modules/xcos/src/c/xcos.vcxproj
scilab/modules/xcos/src/c/xcos.vcxproj.filters
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in
scilab/modules/xml/xml.vcxproj
scilab/tools/innosetup/code.iss

Simple merge
@@@ -45,28 -44,10 +44,28 @@@ if IS_MACOS
  scilab_bin_LDFLAGS            += -framework Cocoa
  endif
  
 -scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/io/includes/ \
 -                    -I$(top_srcdir)/modules/console/includes/ \
 -                    -I$(top_srcdir)/modules/localization/includes/ \
 -                    $(AM_CPPFLAGS)
 +scilab_bin_CPPFLAGS = \
-     -I$(top_srcdir)/modules/console/includes/ \
-       -I$(top_srcdir)/modules/output_stream/includes/ \
-     -I$(top_srcdir)/modules/parse/includes/ \
-     -I$(top_srcdir)/modules/ast/includes/ \
-     -I$(top_srcdir)/modules/symbol/includes/ \
-     -I$(top_srcdir)/modules/functions_manager/includes/ \
-     -I$(top_srcdir)/modules/types/includes/ \
-     -I$(top_srcdir)/modules/system_env/includes/ \
-     -I$(top_srcdir)/modules/operations/includes/ \
-     -I$(top_srcdir)/modules/elementary_functions/includes/ \
-     -I$(top_srcdir)/modules/fileio/includes/ \
-     -I$(top_srcdir)/modules/string/includes/ \
-     -I$(top_srcdir)/modules/history_manager/includes/ \
-     -I$(top_srcdir)/modules/threads/includes/ \
-     -I$(top_srcdir)/modules/api_scilab/includes/ \
-     -I$(top_srcdir)/modules/localization/includes/ \
-     -I$(top_srcdir)/modules/core/src/c/ \
-     -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
-     -I$(top_srcdir)/libs/MALLOC/includes/ \
-     $(EIGEN_CPPFLAGS) \
-       $(AM_CPPFLAGS)
++-I$(top_srcdir)/modules/console/includes/ \
++-I$(top_srcdir)/modules/output_stream/includes/ \
++-I$(top_srcdir)/modules/parse/includes/ \
++-I$(top_srcdir)/modules/ast/includes/ \
++-I$(top_srcdir)/modules/symbol/includes/ \
++-I$(top_srcdir)/modules/functions_manager/includes/ \
++-I$(top_srcdir)/modules/types/includes/ \
++-I$(top_srcdir)/modules/system_env/includes/ \
++-I$(top_srcdir)/modules/operations/includes/ \
++-I$(top_srcdir)/modules/elementary_functions/includes/ \
++-I$(top_srcdir)/modules/fileio/includes/ \
++-I$(top_srcdir)/modules/string/includes/ \
++-I$(top_srcdir)/modules/history_manager/includes/ \
++-I$(top_srcdir)/modules/threads/includes/ \
++-I$(top_srcdir)/modules/api_scilab/includes/ \
++-I$(top_srcdir)/modules/localization/includes/ \
++-I$(top_srcdir)/modules/core/src/c/ \
++-I$(top_srcdir)/modules/dynamic_link/includes/ \
++$(EIGEN_CPPFLAGS) \
++$(AM_CPPFLAGS)
++
  # --no-undefined --relax
  
  # Localization dep already exists because of the `exportLocaleToSystem' symbol
@@@ -648,10 -620,8 +648,9 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
  AUTOMAKE_OPTIONS = 1.11 dist-zip dist-bzip2
- SUBDIRS = libs \
-       modules \
+ SUBDIRS = modules \
        contrib \
        desktop
  
@@@ -668,28 -638,10 +667,28 @@@ bin_SCRIPTS = bin/scilab bin/scilab-adv
        $(am__append_1)
  scilab_bin_LDFLAGS = $(AM_LDFLAGS) $(am__append_2)
  scilab_cli_bin_LDFLAGS = $(AM_LDFLAGS)
 -scilab_bin_CPPFLAGS = -I$(top_srcdir)/modules/io/includes/ \
 -                    -I$(top_srcdir)/modules/console/includes/ \
 -                    -I$(top_srcdir)/modules/localization/includes/ \
 -                    $(AM_CPPFLAGS)
 +scilab_bin_CPPFLAGS = \
-     -I$(top_srcdir)/modules/console/includes/ \
-       -I$(top_srcdir)/modules/output_stream/includes/ \
-     -I$(top_srcdir)/modules/parse/includes/ \
-     -I$(top_srcdir)/modules/ast/includes/ \
-     -I$(top_srcdir)/modules/symbol/includes/ \
-     -I$(top_srcdir)/modules/functions_manager/includes/ \
-     -I$(top_srcdir)/modules/types/includes/ \
-     -I$(top_srcdir)/modules/system_env/includes/ \
-     -I$(top_srcdir)/modules/operations/includes/ \
-     -I$(top_srcdir)/modules/elementary_functions/includes/ \
-     -I$(top_srcdir)/modules/fileio/includes/ \
-     -I$(top_srcdir)/modules/string/includes/ \
-     -I$(top_srcdir)/modules/history_manager/includes/ \
-     -I$(top_srcdir)/modules/threads/includes/ \
-     -I$(top_srcdir)/modules/api_scilab/includes/ \
-     -I$(top_srcdir)/modules/localization/includes/ \
-     -I$(top_srcdir)/modules/core/src/c/ \
-     -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
-     -I$(top_srcdir)/libs/MALLOC/includes/ \
-     $(EIGEN_CPPFLAGS) \
-       $(AM_CPPFLAGS)
++-I$(top_srcdir)/modules/console/includes/ \
++-I$(top_srcdir)/modules/output_stream/includes/ \
++-I$(top_srcdir)/modules/parse/includes/ \
++-I$(top_srcdir)/modules/ast/includes/ \
++-I$(top_srcdir)/modules/symbol/includes/ \
++-I$(top_srcdir)/modules/functions_manager/includes/ \
++-I$(top_srcdir)/modules/types/includes/ \
++-I$(top_srcdir)/modules/system_env/includes/ \
++-I$(top_srcdir)/modules/operations/includes/ \
++-I$(top_srcdir)/modules/elementary_functions/includes/ \
++-I$(top_srcdir)/modules/fileio/includes/ \
++-I$(top_srcdir)/modules/string/includes/ \
++-I$(top_srcdir)/modules/history_manager/includes/ \
++-I$(top_srcdir)/modules/threads/includes/ \
++-I$(top_srcdir)/modules/api_scilab/includes/ \
++-I$(top_srcdir)/modules/localization/includes/ \
++-I$(top_srcdir)/modules/core/src/c/ \
++-I$(top_srcdir)/modules/dynamic_link/includes/ \
++$(EIGEN_CPPFLAGS) \
++$(AM_CPPFLAGS)
++
  
  # --no-undefined --relax
  
@@@ -42,10 -34,8 +42,9 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
                {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
-               {77154919-8A20-4F35-B7C7-6B3B957BDCA1} = {77154919-8A20-4F35-B7C7-6B3B957BDCA1}
                {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
                {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD}
 +              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
                {45ECEB36-A12B-42F5-9D7A-216A0E70601D} = {45ECEB36-A12B-42F5-9D7A-216A0E70601D}
                {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46} = {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46}
                {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
                {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
                {445D3B85-C9B1-498B-9C88-0A3C2390B1CC} = {445D3B85-C9B1-498B-9C88-0A3C2390B1CC}
 +              {D98B0986-14E4-44FD-B006-CACE4B291F38} = {D98B0986-14E4-44FD-B006-CACE4B291F38}
                {1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E} = {1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E}
                {A2207388-FB55-46B2-A24D-D76C0FE796F8} = {A2207388-FB55-46B2-A24D-D76C0FE796F8}
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF} = {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
 +              {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
 +              {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
 +              {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
                {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
                {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76} = {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76}
                {620D8FA7-3704-438E-BB1E-391C84401A2E} = {620D8FA7-3704-438E-BB1E-391C84401A2E}
@@@ -224,12 -210,7 +222,10 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization", "modules\localization\src\localization.vcxproj", "{ECFFEB0C-1EDA-45EE-9A10-B18143852E17}"
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hashtable", "libs\hashtable\hashtable.vcxproj", "{2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}"
- EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjvm", "modules\jvm\libjvm.vcxproj", "{8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
 +      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GetWindowsVersion", "libs\GetWindowsVersion\GetWindowsVersion.vcxproj", "{982BF37F-42C4-4D37-8D14-60521B141503}"
  EndProject
@@@ -42,10 -34,8 +42,9 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
                {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
-               {77154919-8A20-4F35-B7C7-6B3B957BDCA1} = {77154919-8A20-4F35-B7C7-6B3B957BDCA1}
                {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
                {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD}
 +              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
                {45ECEB36-A12B-42F5-9D7A-216A0E70601D} = {45ECEB36-A12B-42F5-9D7A-216A0E70601D}
                {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46} = {C8C13A46-DEB8-44AA-8BF8-C9BBC7FA0B46}
                {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
                {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
                {445D3B85-C9B1-498B-9C88-0A3C2390B1CC} = {445D3B85-C9B1-498B-9C88-0A3C2390B1CC}
 +              {D98B0986-14E4-44FD-B006-CACE4B291F38} = {D98B0986-14E4-44FD-B006-CACE4B291F38}
                {1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E} = {1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E}
                {A2207388-FB55-46B2-A24D-D76C0FE796F8} = {A2207388-FB55-46B2-A24D-D76C0FE796F8}
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF} = {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
 +              {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
 +              {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
 +              {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
                {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
                {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76} = {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76}
                {620D8FA7-3704-438E-BB1E-391C84401A2E} = {620D8FA7-3704-438E-BB1E-391C84401A2E}
@@@ -224,12 -210,7 +222,10 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization", "modules\localization\src\localization.vcxproj", "{ECFFEB0C-1EDA-45EE-9A10-B18143852E17}"
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hashtable", "libs\hashtable\hashtable.vcxproj", "{2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}"
- EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjvm", "modules\jvm\libjvm.vcxproj", "{8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
 +      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GetWindowsVersion", "libs\GetWindowsVersion\GetWindowsVersion.vcxproj", "{982BF37F-42C4-4D37-8D14-60521B141503}"
  EndProject
@@@ -47,23 -43,8 +43,21 @@@ Source: bin\libintl.dll; DestDir: {app}
  Source: bin\libintl.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\GNU_gettext.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
 +
 +;YaSp files
 +Source: bin\ast.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\ast-tools.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\operations.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\functions_manager.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\symbol.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\types.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\system_env.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\parse.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +Source: bin\YaSp.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +;
 +
  Source: bin\zlib1.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\GetWindowsVersion.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
- Source: bin\hashtable.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
- Source: bin\doublylinkedlist.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\lapack.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\libf2c.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\scilab_windows.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
@@@ -76,12 -56,13 +69,13 @@@ Source: bin\pcreposix.dll; DestDir: {ap
  Source: bin\libf2c.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\lapack.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
+ Source: bin\MALLOC.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ Source: bin\MALLOC.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+ ;
  Source: bin\scilab_windows.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
- Source: bin\hashtable.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
 -Source: bin\Scilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 -Source: bin\WScilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
 +;Source: bin\YaSpScilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 +;Source: bin\WScilex.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB} and {#COMPN_JVM_MODULE}
  Source: bin\Dumpexts.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  Source: bin\f2c.exe; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
  ;
@@@ -39835,7 -39219,7 +39835,7 @@@ SCI_LDFLAGS=$(echo  $LARGEFILE_LDFLAG
  
  
  
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/threads/Makefile modules/ast/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/operations/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
 -ac_config_files="$ac_config_files contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
++ac_config_files="$ac_config_files contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/threads/Makefile modules/ast/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/operations/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
  
  
  # Detection of the module for the future version of Scilab 6
Simple merge
@@@ -121,18 -112,11 +121,13 @@@ libscilab_la_rootdir = $(mydatadir
  # libscilab-cli is for scilab-cli (without GUI)
  pkglib_LTLIBRARIES = libscilab-cli.la libscilab.la
  libscilab_la_SOURCES =
 +#libscilab_cli_la_SOURCES =
  
  libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS)
 +#libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) -lstdc++
  
- EXTERNAL_LIBS = $(top_builddir)/libs/hashtable/libscihashtable.la \
- $(top_builddir)/libs/MALLOC/libscimalloc.la  \
- $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la  \
- $(top_builddir)/libs/libst/libscilibst.la
  
 -GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
 +GUI_LIBS =    $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/renderer/libscirenderer.la \
        $(top_builddir)/modules/graphics/libscigraphics.la \
        $(top_builddir)/modules/graphic_export/libscigraphic_export.la \
@@@ -187,24 -172,11 +182,23 @@@ ENGINE_LIBS =   $(top_builddir)/modules/f
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
 +      $(top_builddir)/modules/threads/libscithreads.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 +      $(top_builddir)/modules/ast/libsciast.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/system_env/libscisystem_env.la \
 +      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
 +      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/parallel/libsciparallel.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
 -      $(top_builddir)/modules/statistics/libscistatistics.la \
 +      $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
 +      $(top_builddir)/modules/matio/libscimatio.la \
 +      $(top_builddir)/modules/operations/libscioperations.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-       $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la \
 +      $(top_builddir)/modules/statistics/libscistatistics.la \
        $(top_builddir)/modules/xml/libscixml.la \
 +      $(top_builddir)/modules/types/libscitypes.la \
        $(top_builddir)/modules/external_objects/libsciexternal_objects.la \
        $(top_builddir)/modules/preferences/libscipreferences-cli.la
  
@@@ -508,14 -501,7 +506,9 @@@ libscilab_la_rootdir = $(mydatadir
  # libscilab-cli is for scilab-cli (without GUI)
  pkglib_LTLIBRARIES = libscilab-cli.la libscilab.la
  libscilab_la_SOURCES = 
 +#libscilab_cli_la_SOURCES =
  libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) $(AM_LDFLAGS)
 +#libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) -lstdc++
- EXTERNAL_LIBS = $(top_builddir)/libs/hashtable/libscihashtable.la \
- $(top_builddir)/libs/MALLOC/libscimalloc.la  \
- $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la  \
- $(top_builddir)/libs/libst/libscilibst.la
  GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
        $(top_builddir)/modules/renderer/libscirenderer.la \
        $(top_builddir)/modules/graphics/libscigraphics.la \
@@@ -570,24 -557,11 +563,23 @@@ ENGINE_LIBS = $(top_builddir)/modules/f
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
 +      $(top_builddir)/modules/threads/libscithreads.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 +      $(top_builddir)/modules/ast/libsciast.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/system_env/libscisystem_env.la \
 +      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
 +      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/parallel/libsciparallel.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
 -      $(top_builddir)/modules/statistics/libscistatistics.la \
 +      $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
 +      $(top_builddir)/modules/matio/libscimatio.la \
 +      $(top_builddir)/modules/operations/libscioperations.la \
        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
-       $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la \
 +      $(top_builddir)/modules/statistics/libscistatistics.la \
        $(top_builddir)/modules/xml/libscixml.la \
 +      $(top_builddir)/modules/types/libscitypes.la \
        $(top_builddir)/modules/external_objects/libsciexternal_objects.la \
        $(top_builddir)/modules/preferences/libscipreferences-cli.la
  
@@@ -52,7 -45,7 +52,8 @@@ libsciaction_binding_disable_la_CPPFLAG
                                                                                        $(AM_CPPFLAGS)
  
  # Includes need for the compilation
--libsciaction_binding_la_CPPFLAGS=     $(JAVA_JNI_INCLUDE) \
++libsciaction_binding_la_CPPFLAGS = \
++$(JAVA_JNI_INCLUDE) \
  -I$(srcdir)/includes/ \
  -I$(srcdir)/src/c/ \
  -I$(srcdir)/src/jni/ \
  -I$(top_srcdir)/modules/commons/src/jni/ \
  -I$(top_srcdir)/modules/localization/includes/ \
  -I$(top_srcdir)/modules/output_stream/includes \
 +-I$(top_srcdir)/modules/symbol/includes \
 +-I$(top_srcdir)/modules/functions_manager/includes \
 +-I$(top_srcdir)/modules/ast/includes \
 +-I$(top_srcdir)/modules/system_env/includes \
 +-I$(top_srcdir)/modules/types/includes \
- -I$(top_srcdir)/libs/dynamiclibrary/includes \
++-I$(top_srcdir)/modules/dynamic_link/includes \
  $(AM_CPPFLAGS)
  
  # Name of the future library (.la will be replace by .so, .a, etc regarding
@@@ -507,7 -488,7 +507,8 @@@ libsciaction_binding_disable_la_CPPFLAG
  
  
  # Includes need for the compilation
--libsciaction_binding_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
++libsciaction_binding_la_CPPFLAGS = \
++$(JAVA_JNI_INCLUDE) \
  -I$(srcdir)/includes/ \
  -I$(srcdir)/src/c/ \
  -I$(srcdir)/src/jni/ \
  -I$(top_srcdir)/modules/commons/src/jni/ \
  -I$(top_srcdir)/modules/localization/includes/ \
  -I$(top_srcdir)/modules/output_stream/includes \
 +-I$(top_srcdir)/modules/symbol/includes \
 +-I$(top_srcdir)/modules/functions_manager/includes \
 +-I$(top_srcdir)/modules/ast/includes \
 +-I$(top_srcdir)/modules/system_env/includes \
 +-I$(top_srcdir)/modules/types/includes \
- -I$(top_srcdir)/libs/dynamiclibrary/includes \
++-I$(top_srcdir)/modules/dynamic_link/includes \
  $(AM_CPPFLAGS)
  
  
index 3f57faf,0000000..25d2dd0
mode 100644,000000..100644
--- /dev/null
@@@ -1,295 -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>{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>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +  </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;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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="..\..\..\..\libs\MALLOC\MALLOC.vcxproj">
-       <Project>{6a84ad8c-ba18-4a3f-9c72-ec3df0939e9e}</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\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>
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../../commons/src/jni/;../../includes;../jni;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
 -      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -122,15 -112,11 +122,15 @@@ lib /DEF:"$(ProjectDir)core_f_Import.de
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../../commons/src/jni/;../../includes;../jni;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
 -      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -159,12 -140,9 +159,12 @@@ lib /DEF:"$(ProjectDir)core_f_Import.de
    </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;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../../commons/src/jni/;../../includes;../jni;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -209,11 -177,9 +209,11 @@@ lib /DEF:"$(ProjectDir)core_f_Import.de
        <TargetEnvironment>X64</TargetEnvironment>
      </Midl>
      <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../../commons/src/jni/;../../includes;../jni;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -1,6 -1,6 +1,6 @@@
  /* ----------------------------------------------------------------------------
   * This file was automatically generated by SWIG (http://www.swig.org).
-- * Version 2.0.7
++ * Version 2.0.4
   *
   * Do not make changes to this file unless you know what you are doing--modify
   * the SWIG interface file instead.
@@@ -9,52 -9,52 +9,52 @@@
  package org.scilab.modules.action_binding;
  
  
-- /**
--   * All Scilab interpreter management used in Java console
--   * @author Vincent COUVERT
--   * @copyright INRIA
--   */
++/**
++  * All Scilab interpreter management used in Java console
++  * @author Vincent COUVERT
++  * @copyright INRIA
++  */
  public class InterpreterManagement {
  
-- /**
--   * Constructor
--   */
-- protected InterpreterManagement() {
--    throw new UnsupportedOperationException();
-- }
--  
-- /**
--   * Put a command in Scilab command queue so that Scilab executes it
--   * The command is displayed in Scilab Window
--   *
--   * @param command the command to execute
--   * @return execution status
--   */
--public  static int putCommandInScilabQueue(String command) {
--    return InterpreterManagementJNI.putCommandInScilabQueue(command);
--  }
--
--  
-- /**
--   * Put a command in Scilab command queue so that Scilab executes it
--   * The command is executed as soon as possible and may not be interrupted by another one.
--   * WARNING : if the command is taking some time, scilab will not do anything else
--   * before the command returns.
--   *
--   * @param command the command to execute
--   * @return execution status
--   */
--public  static int requestScilabExec(String command) {
--    return InterpreterManagementJNI.requestScilabExec(command);
--  }
--
--  
-- /**
--  * Stop Scilab current work
--  * @return execution status
--  */
--public  static int interruptScilab() {
--    return InterpreterManagementJNI.interruptScilab();
--  }
++    /**
++      * Constructor
++      */
++    protected InterpreterManagement() {
++        throw new UnsupportedOperationException();
++    }
++
++    /**
++      * Put a command in Scilab command queue so that Scilab executes it
++      * The command is displayed in Scilab Window
++      *
++      * @param command the command to execute
++      * @return execution status
++      */
++    public  static int putCommandInScilabQueue(String command) {
++        return InterpreterManagementJNI.putCommandInScilabQueue(command);
++    }
++
++
++    /**
++      * Put a command in Scilab command queue so that Scilab executes it
++      * The command is executed as soon as possible and may not be interrupted by another one.
++      * WARNING : if the command is taking some time, scilab will not do anything else
++      * before the command returns.
++      *
++      * @param command the command to execute
++      * @return execution status
++      */
++    public  static int requestScilabExec(String command) {
++        return InterpreterManagementJNI.requestScilabExec(command);
++    }
++
++
++    /**
++     * Stop Scilab current work
++     * @return execution status
++     */
++    public  static int interruptScilab() {
++        return InterpreterManagementJNI.interruptScilab();
++    }
  
  }
@@@ -1,6 -1,6 +1,6 @@@
  /* ----------------------------------------------------------------------------
   * This file was automatically generated by SWIG (http://www.swig.org).
-- * Version 2.0.7
++ * Version 2.0.4
   *
   * Do not make changes to this file unless you know what you are doing--modify
   * the SWIG interface file instead.
@@@ -11,35 -11,35 +11,35 @@@ package org.scilab.modules.action_bindi
  
  /* It is generated code. Disable checkstyle */
  //CHECKSTYLE:OFF
-- /**
--   * All Scilab interpreter management used in Java console
--   * @author Vincent COUVERT
--   * @copyright INRIA
--   */
++/**
++  * All Scilab interpreter management used in Java console
++  * @author Vincent COUVERT
++  * @copyright INRIA
++  */
  class InterpreterManagementJNI {
  
--  /**
--    * Constructor
--    */
--  protected InterpreterManagementJNI() {
--    throw new UnsupportedOperationException();
--  }
++    /**
++      * Constructor
++      */
++    protected InterpreterManagementJNI() {
++        throw new UnsupportedOperationException();
++    }
  
--  static {
--    try {
--        System.loadLibrary("sciaction_binding");
--    } catch (SecurityException e) {
--        System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
--        System.err.println(e.getLocalizedMessage());
--        e.printStackTrace(System.err);
--    } catch (UnsatisfiedLinkError e)    {
--        System.err.println("The native library sciaction_binding does not exist or cannot be found.");
--        System.err.println(e.getLocalizedMessage());
--        e.printStackTrace(System.err);
++    static {
++        try {
++            System.loadLibrary("sciaction_binding");
++        } catch (SecurityException e) {
++            System.err.println("A security manager exists and does not allow the loading of the specified dynamic library.");
++            System.err.println(e.getLocalizedMessage());
++            e.printStackTrace(System.err);
++        } catch (UnsatisfiedLinkError e)    {
++            System.err.println("The native library sciaction_binding does not exist or cannot be found.");
++            System.err.println(e.getLocalizedMessage());
++            e.printStackTrace(System.err);
++        }
      }
--  }
  
--  public final static native int putCommandInScilabQueue(String jarg1);
--  public final static native int requestScilabExec(String jarg1);
--  public final static native int interruptScilab();
++    public final static native int putCommandInScilabQueue(String jarg1);
++    public final static native int requestScilabExec(String jarg1);
++    public final static native int interruptScilab();
  }
@@@ -1,6 -1,6 +1,6 @@@
  /* ----------------------------------------------------------------------------
   * This file was automatically generated by SWIG (http://www.swig.org).
-- * Version 2.0.7
++ * Version 2.0.4
   * 
   * This file is not intended to be easily readable and contains a number of 
   * coding conventions designed to improve portability and efficiency. Do not make
@@@ -18,31 -18,19 +18,30 @@@ src/cpp/api_string.cpp 
  src/cpp/api_pointer.cpp \
  src/cpp/api_handle.cpp \
  src/cpp/api_error.cpp \
 +src/cpp/overload.cpp \
 +src/cpp/returnProperty.cpp \
 +src/cpp/returnPropertyList.cpp \
  src/cpp/api_optional.cpp
  
 -
 -libsciapi_scilab_la_CPPFLAGS=-I$(srcdir)/includes/ \
 +libsciapi_scilab_la_CPPFLAGS= \
 +-I$(srcdir)/includes/ \
  -I$(srcdir)/src/cpp/ \
 --I$(top_srcdir)/modules/core/includes/ \
 --I$(top_srcdir)/modules/call_scilab/includes/ \
 --I$(top_srcdir)/modules/localization/includes/ \
 --I$(top_srcdir)/modules/output_stream/includes/ \
 --I$(top_srcdir)/modules/string/includes/ \
 +-I$(srcdir)/src/c/ \
 +-I$(top_srcdir)/modules/core/includes \
 +-I$(top_srcdir)/modules/call_scilab/includes \
- -I$(top_srcdir)/libs/MALLOC/includes/ \
 +-I$(top_srcdir)/modules/localization/includes \
 +-I$(top_srcdir)/modules/output_stream/includes \
 +-I$(top_srcdir)/modules/operations/includes \
 +-I$(top_srcdir)/modules/types/includes \
 +-I$(top_srcdir)/modules/symbol/includes \
 +-I$(top_srcdir)/modules/types/includes \
 +-I$(top_srcdir)/modules/ast/includes \
 +-I$(top_srcdir)/modules/elementary_functions/includes \
 +-I$(top_srcdir)/modules/string/includes \
- -I$(top_srcdir)/libs/dynamiclibrary/includes \
++-I$(top_srcdir)/modules/dynamic_link/includes \
 +$(EIGEN_CPPFLAGS) \
  $(AM_CPPFLAGS)
  
 -
  if MAINTAINER_MODE
  pkglib_LTLIBRARIES = libsciapi_scilab.la
  else
@@@ -464,29 -450,15 +464,28 @@@ src/cpp/api_string.cpp 
  src/cpp/api_pointer.cpp \
  src/cpp/api_handle.cpp \
  src/cpp/api_error.cpp \
 +src/cpp/overload.cpp \
 +src/cpp/returnProperty.cpp \
 +src/cpp/returnPropertyList.cpp \
  src/cpp/api_optional.cpp
  
 -libsciapi_scilab_la_CPPFLAGS = -I$(srcdir)/includes/ \
 +libsciapi_scilab_la_CPPFLAGS = \
 +-I$(srcdir)/includes/ \
  -I$(srcdir)/src/cpp/ \
 --I$(top_srcdir)/modules/core/includes/ \
 --I$(top_srcdir)/modules/call_scilab/includes/ \
 --I$(top_srcdir)/modules/localization/includes/ \
 --I$(top_srcdir)/modules/output_stream/includes/ \
 --I$(top_srcdir)/modules/string/includes/ \
 +-I$(srcdir)/src/c/ \
 +-I$(top_srcdir)/modules/core/includes \
 +-I$(top_srcdir)/modules/call_scilab/includes \
- -I$(top_srcdir)/libs/MALLOC/includes/ \
 +-I$(top_srcdir)/modules/localization/includes \
 +-I$(top_srcdir)/modules/output_stream/includes \
 +-I$(top_srcdir)/modules/operations/includes \
 +-I$(top_srcdir)/modules/types/includes \
 +-I$(top_srcdir)/modules/symbol/includes \
 +-I$(top_srcdir)/modules/types/includes \
 +-I$(top_srcdir)/modules/ast/includes \
 +-I$(top_srcdir)/modules/elementary_functions/includes \
 +-I$(top_srcdir)/modules/string/includes \
- -I$(top_srcdir)/libs/dynamiclibrary/includes \
++-I$(top_srcdir)/modules/dynamic_link/includes \
 +$(EIGEN_CPPFLAGS) \
  $(AM_CPPFLAGS)
  
  @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libsciapi_scilab.la
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../../libs/dynamiclibrary/includes;../system_env/includes;../Threads/includes;../console/includes;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes;../elementary_functions/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../system_env/includes;../Threads/includes;../console/includes;../../libs/Eigen/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(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>
@@@ -130,15 -119,10 +130,15 @@@ cd .. &gt;nu
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../../libs/dynamiclibrary/includes;../system_env/includes;../Threads/includes;../console/includes;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes;../elementary_functions/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../system_env/includes;../Threads/includes;../console/includes;../../libs/Eigen/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(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>
@@@ -179,12 -158,9 +179,12 @@@ cd .. &gt;nu
    </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;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../../libs/dynamiclibrary/includes;../system_env/includes;../Threads/includes;../console/includes;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes;../elementary_functions/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../system_env/includes;../Threads/includes;../console/includes;../../libs/Eigen/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -243,11 -207,9 +243,11 @@@ cd .. &gt;nu
        <TargetEnvironment>X64</TargetEnvironment>
      </Midl>
      <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../../libs/dynamiclibrary/includes;../system_env/includes;../Threads/includes;../console/includes;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../output_stream/includes;../localization/includes;../../libs/intl;../windows_tools/includes;../elementary_functions/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../system_env/includes;../Threads/includes;../console/includes;../../libs/Eigen/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -7,4 -18,8 +7,6 @@@ getExecMod
  freeArrayOfString
  isopt_
  numopt_
+ SciToF77
+ MyHeapAlloc
+ MyHeapFree
 -
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 DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
      <ProjectConfiguration Include="Debug|Win32">
@@@ -76,7 -76,7 +76,7 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../operations/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../operations/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../operations/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../operations/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -87,5 -87,5 +87,6 @@@
      <None Include="locales\arnoldi.pot">
        <Filter>localization</Filter>
      </None>
++    <None Include="locales\arnoldi.pot" />
    </ItemGroup>
  </Project>
index c272886,0000000..df4378f
mode 100644,000000..100644
--- /dev/null
@@@ -1,85 -1,0 +1,84 @@@
 +##
 +##  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +##  Copyright (C) 2007-2008 - DIGITEO - Bruno JOFRET
 +##  Copyright (C) 2007-2008 - DIGITEO - Antoine ELIAS
 +##
 +##  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
 +##
 +##
 +
 +pkglib_LTLIBRARIES    = libsciast.la
 +
 +libsciast_la_SOURCES = \
 +      src/cpp/libAst.cpp \
 +      src/cpp/visitor_common.cpp \
 +      src/cpp/printvisitor.cpp \
 +      src/cpp/debugvisitor.cpp \
 +      src/cpp/mutevisitor.cpp \
 +      src/cpp/shortcutvisitor.cpp \
 +      src/cpp/scilabexception.cpp
 +
 +libsciast_la_CPPFLAGS = \
 +      -Iincludes \
 +      -Isrc/cpp \
-     -I$(top_srcdir)/libs/dynamiclibrary/includes \
-     -I$(top_srcdir)/libs/MALLOC/includes \
++    -I$(top_srcdir)/modules/dynamic_link/includes \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +      -I$(top_srcdir)/modules/types/includes \
 +      -I$(top_srcdir)/modules/functions_manager/includes \
 +      -I$(top_srcdir)/modules/console/includes \
 +      -I$(top_srcdir)/modules/elementary_functions/includes \
 +      -I$(top_srcdir)/modules/operations/includes \
 +      -I$(top_srcdir)/modules/output_stream/includes \
 +      -I$(top_srcdir)/modules/system_env/includes \
 +      -I$(top_srcdir)/modules/api_scilab/includes \
 +      -I$(top_srcdir)/modules/string/includes \
 +      -I$(top_srcdir)/modules/threads/includes \
 +      -I$(top_srcdir)/modules/localization/includes \
 +    $(EIGEN_CPPFLAGS) \
 +      $(AM_CPPFLAGS)
 +
 +
 +libsciast_la_includedir=$(pkgincludedir)
 +libsciast_la_include_HEADERS =
 +
 +####################
 +## Automated test ##
 +####################
 +check_INCLUDES = \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +      -Iincludes/ \
 +      -Isrc/cpp
 +
 +check_LDADD   = \
 +    $(top_builddir)/modules/symbol/libsciSymbol.la \
 +      $(top_builddir)/modules/ast/libsciast.la \
 +      $(top_builddir)/modules/types/libsciTypes.la
 +
 +check_PROGRAMS = \
 +    testConstExp \
 +      testVarExp \
 +                                                                                      testControlExp
 +
 +TESTS = \
 +    testConstExp \
 +      testVarExp \
 +      testControlExp
 +
 +testConstExp_SOURCES  = src/cpp/testConstExp.cpp
 +testConstExp_CXXFLAGS         = $(check_INCLUDES)
 +testConstExp_LDADD    = $(check_LDADD)
 +
 +testVarExp_SOURCES    = src/cpp/testVarExp.cpp
 +testVarExp_CXXFLAGS   = $(check_INCLUDES)
 +testVarExp_LDADD      = $(check_LDADD)
 +
 +testControlExp_SOURCES        = src/cpp/testControlExp.cpp
 +testControlExp_CXXFLAGS = $(check_INCLUDES)
 +testControlExp_LDADD  = $(check_LDADD)
 +
 +include $(top_srcdir)/Makefile.incl.am
 +
index 3f67685,0000000..b6c74e1
mode 100644,000000..100644
--- /dev/null
@@@ -1,1338 -1,0 +1,1337 @@@
 +# Makefile.in generated by automake 1.11.6 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 +# Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 +# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
 +# Copyright (C) 2008      - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
 +#
 +# 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
 +#
 +
 +##########
 +### Makefile included stuff
 +### Target, variable, suffixes which are supposed to be useful in every makefile.am
 +##########
 +
 +
 +VPATH = @srcdir@
 +am__make_dryrun = \
 +  { \
 +    am__dry=no; \
 +    case $$MAKEFLAGS in \
 +      *\\[\ \ ]*) \
 +        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 +          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 +      *) \
 +        for am__flg in $$MAKEFLAGS; do \
 +          case $$am__flg in \
 +            *=*|--*) ;; \
 +            *n*) am__dry=yes; break;; \
 +          esac; \
 +        done;; \
 +    esac; \
 +    test $$am__dry = yes; \
 +  }
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +check_PROGRAMS = testConstExp$(EXEEXT) testVarExp$(EXEEXT) \
 +      testControlExp$(EXEEXT)
 +TESTS = testConstExp$(EXEEXT) testVarExp$(EXEEXT) \
 +      testControlExp$(EXEEXT)
 +DIST_COMMON = $(libsciast_la_include_HEADERS) $(srcdir)/Makefile.am \
 +      $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
 +@NEED_JAVA_TRUE@am__append_1 = java
 +subdir = modules/ast
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/backtrace.m4 \
 +      $(top_srcdir)/m4/compiler.m4 $(top_srcdir)/m4/curl.m4 \
 +      $(top_srcdir)/m4/docbook.m4 $(top_srcdir)/m4/doxygen.m4 \
 +      $(top_srcdir)/m4/eigen.m4 $(top_srcdir)/m4/fftw.m4 \
 +      $(top_srcdir)/m4/fortran.m4 $(top_srcdir)/m4/giws.m4 \
 +      $(top_srcdir)/m4/hdf5.m4 $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
 +      $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lib-ld.m4 \
 +      $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
 +      $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ltoptions.m4 \
 +      $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 +      $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/macosx.m4 \
 +      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 +      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/relocatable.m4 \
 +      $(top_srcdir)/m4/swig.m4 $(top_srcdir)/m4/symlinks.m4 \
 +      $(top_srcdir)/m4/tcltk.m4 $(top_srcdir)/m4/umfpack.m4 \
 +      $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__uninstall_files_from_dir = { \
 +  test -z "$$files" \
 +    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
 +    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
 +         $(am__cd) "$$dir" && rm -f $$files; }; \
 +  }
 +am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 +      "$(DESTDIR)$(libsciast_la_includedir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libsciast_la_LIBADD =
 +am_libsciast_la_OBJECTS = libsciast_la-libAst.lo \
 +      libsciast_la-visitor_common.lo libsciast_la-printvisitor.lo \
 +      libsciast_la-debugvisitor.lo libsciast_la-mutevisitor.lo \
 +      libsciast_la-shortcutvisitor.lo \
 +      libsciast_la-scilabexception.lo
 +libsciast_la_OBJECTS = $(am_libsciast_la_OBJECTS)
 +am_testConstExp_OBJECTS = testConstExp-testConstExp.$(OBJEXT)
 +testConstExp_OBJECTS = $(am_testConstExp_OBJECTS)
 +testConstExp_DEPENDENCIES = $(check_LDADD)
 +testConstExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(testConstExp_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testControlExp_OBJECTS = testControlExp-testControlExp.$(OBJEXT)
 +testControlExp_OBJECTS = $(am_testControlExp_OBJECTS)
 +testControlExp_DEPENDENCIES = $(check_LDADD)
 +testControlExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(testControlExp_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +am_testVarExp_OBJECTS = testVarExp-testVarExp.$(OBJEXT)
 +testVarExp_OBJECTS = $(am_testVarExp_OBJECTS)
 +testVarExp_DEPENDENCIES = $(check_LDADD)
 +testVarExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(testVarExp_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libsciast_la_SOURCES) $(testConstExp_SOURCES) \
 +      $(testControlExp_SOURCES) $(testVarExp_SOURCES)
 +DIST_SOURCES = $(libsciast_la_SOURCES) $(testConstExp_SOURCES) \
 +      $(testControlExp_SOURCES) $(testVarExp_SOURCES)
 +am__can_run_installinfo = \
 +  case $$AM_UPDATE_INFO_DIR in \
 +    n|no|NO) false;; \
 +    *) (install-info --version) >/dev/null 2>&1;; \
 +  esac
 +HEADERS = $(libsciast_la_include_HEADERS)
 +ETAGS = etags
 +CTAGS = ctags
 +am__tty_colors = \
 +red=; grn=; lgn=; blu=; std=
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +ALL_LINGUAS_DOC = @ALL_LINGUAS_DOC@
 +AMTAR = @AMTAR@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +ARPACK_LIBS = @ARPACK_LIBS@
 +ASM3 = @ASM3@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +CC = @CC@
 +CCACHE = @CCACHE@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COBERTURA = @COBERTURA@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CURL_CFLAGS = @CURL_CFLAGS@
 +CURL_CONFIG = @CURL_CONFIG@
 +CURL_LIBS = @CURL_LIBS@
 +CURL_VERSION = @CURL_VERSION@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DOXYGEN_BIN = @DOXYGEN_BIN@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EIGEN_CPPFLAGS = @EIGEN_CPPFLAGS@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
 +GENHTML = @GENHTML@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN2_RT = @GLUEGEN2_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
 +JAVAC_DEBUG = @JAVAC_DEBUG@
 +JAVADOC = @JAVADOC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL2 = @JOGL2@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT4 = @JUNIT4@
 +LAPACK_LIBS = @LAPACK_LIBS@
 +LCOV = @LCOV@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOGGING_LEVEL = @LOGGING_LEVEL@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
 +OPENMP_CFLAGS = @OPENMP_CFLAGS@
 +OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 +OPENMP_ENABLE = @OPENMP_ENABLE@
 +OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
 +PYTHON = @PYTHON@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
 +SCILAB_BINARY_VERSION = @SCILAB_BINARY_VERSION@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
 +SCILAB_VERSION_MAINTENANCE = @SCILAB_VERSION_MAINTENANCE@
 +SCILAB_VERSION_MAJOR = @SCILAB_VERSION_MAJOR@
 +SCILAB_VERSION_MINOR = @SCILAB_VERSION_MINOR@
 +SCIRENDERER = @SCIRENDERER@
 +SCI_CFLAGS = @SCI_CFLAGS@
 +SCI_CXXFLAGS = @SCI_CXXFLAGS@
 +SCI_FFLAGS = @SCI_FFLAGS@
 +SCI_LDFLAGS = @SCI_LDFLAGS@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
 +XCOS_ENABLE = @XCOS_ENABLE@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +YACC = @YACC@
 +YFLAGS = @YFLAGS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
 +pkglib_LTLIBRARIES = libsciast.la
 +libsciast_la_SOURCES = \
 +      src/cpp/libAst.cpp \
 +      src/cpp/visitor_common.cpp \
 +      src/cpp/printvisitor.cpp \
 +      src/cpp/debugvisitor.cpp \
 +      src/cpp/mutevisitor.cpp \
 +      src/cpp/shortcutvisitor.cpp \
 +      src/cpp/scilabexception.cpp
 +
 +libsciast_la_CPPFLAGS = \
 +      -Iincludes \
 +      -Isrc/cpp \
-     -I$(top_srcdir)/libs/dynamiclibrary/includes \
-     -I$(top_srcdir)/libs/MALLOC/includes \
++    -I$(top_srcdir)/modules/dynamic_link/includes \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +      -I$(top_srcdir)/modules/types/includes \
 +      -I$(top_srcdir)/modules/functions_manager/includes \
 +      -I$(top_srcdir)/modules/console/includes \
 +      -I$(top_srcdir)/modules/elementary_functions/includes \
 +      -I$(top_srcdir)/modules/operations/includes \
 +      -I$(top_srcdir)/modules/output_stream/includes \
 +      -I$(top_srcdir)/modules/system_env/includes \
 +      -I$(top_srcdir)/modules/api_scilab/includes \
 +      -I$(top_srcdir)/modules/string/includes \
 +      -I$(top_srcdir)/modules/threads/includes \
 +      -I$(top_srcdir)/modules/localization/includes \
 +    $(EIGEN_CPPFLAGS) \
 +      $(AM_CPPFLAGS)
 +
 +libsciast_la_includedir = $(pkgincludedir)
 +libsciast_la_include_HEADERS = 
 +
 +####################
 +####################
 +check_INCLUDES = \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +      -Iincludes/ \
 +      -Isrc/cpp
 +
 +check_LDADD = \
 +    $(top_builddir)/modules/symbol/libsciSymbol.la \
 +      $(top_builddir)/modules/ast/libsciast.la \
 +      $(top_builddir)/modules/types/libsciTypes.la
 +
 +testConstExp_SOURCES = src/cpp/testConstExp.cpp
 +testConstExp_CXXFLAGS = $(check_INCLUDES)
 +testConstExp_LDADD = $(check_LDADD)
 +testVarExp_SOURCES = src/cpp/testVarExp.cpp
 +testVarExp_CXXFLAGS = $(check_INCLUDES)
 +testVarExp_LDADD = $(check_LDADD)
 +testControlExp_SOURCES = src/cpp/testControlExp.cpp
 +testControlExp_CXXFLAGS = $(check_INCLUDES)
 +testControlExp_LDADD = $(check_LDADD)
 +
 +# Where all the Scilab stuff is installed (macros, help, ...)
 +mydatadir = $(pkgdatadir)/modules/$(modulename)
 +
 +# Set AM_* SCI detected settings
 +AM_CPPFLAGS = $(SCI_CPPFLAGS)
 +AM_CFLAGS = $(SCI_CFLAGS)
 +AM_CXXFLAGS = $(SCI_CXXFLAGS)
 +# append includes to AM_FFLAGS to manage fortran includes
 +AM_FFLAGS = $(SCI_FFLAGS) -I$(top_srcdir)/modules/core/includes/
 +
 +# Tag shared libraries with the Scilab version
 +AM_LDFLAGS = $(SCI_LDFLAGS) -version-number $(SCILAB_LIBRARY_VERSION)
 +
 +# splint options
 +SPLINT_OPTIONS = -weak -booltype BOOL
 +
 +########################### JAVA ######################################
 +#### We are delegating java compilation to ant... Thanks to that
 +#### the procedure will be the same with Microsoft Windows (C)
 +#### and Linux/Unix
 +#######################################################################
 +TARGETS_ALL = $(am__append_1)
 +
 +################ MACROS ######################
 +# Rule to build a macro
 +# NOT USED  AT THE MOMENT
 +SUFFIXES = .sci 
 +
 +########### INSTALL DOCUMENTATION ###################
 +
 +# Install documentation files into the right target
 +# We do not use the automake mechanism (libxxxx_la_help_fr_DATA) because
 +# automake needs the html files to be present which is not the case when
 +# we are building Scilab
 +
 +# Where it should be installed
 +pkgdocdir = $(mydatadir)
 +
 +# What is the mask of the help source
 +DOCMASKXML = *.xml
 +
 +# What is the mask of the MathML sources
 +DOCMASKMML = *.mml
 +
 +########### INSTALL DATA ###################
 +# Install macros, help & demos
 +# Where it should be installed
 +pkgmacrosdir = $(mydatadir)
 +# Which directory we process
 +MACRODIRS = macros/
 +# Mask of the Scilab sources macros
 +MACROMASK = *.sci
 +# Mask of the Scilab executable sources macros
 +MACROBUILDMASK = *.sce
 +# Mask of the Scilab compiled macros
 +MACROBINMASK = *.bin
 +# List of the standard directory for tests
 +TESTS_DIR = tests/benchmarks tests/nonreg_tests tests/unit_tests tests/java
 +# Where the demos should be installed
 +pkgdemosdir = $(mydatadir)
 +# List of the standard directory for demos
 +DEMOS_DIR = demos
 +# List of the standard directory for examples
 +EXAMPLES_DIR = examples
 +# Where to export JAVA archives (.jar)
 +JARDIR = jar/
 +# JAR files mask
 +JARMASK = *.jar
 +# Chapter file 
 +HELP_CHAPTERDIR = help/
 +HELP_CHAPTERFILE = addchapter.sce
 +HELP_CHAPTERLANG = en_US fr_FR pt_BR
 +all: all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .sci .bin .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.incl.am $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/ast/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/ast/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +      @case '$?' in \
 +        *config.status*) \
 +          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +        *) \
 +          echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +          cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +      esac;
 +$(top_srcdir)/Makefile.incl.am:
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
 +        $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
 +libsciast.la: $(libsciast_la_OBJECTS) $(libsciast_la_DEPENDENCIES) $(EXTRA_libsciast_la_DEPENDENCIES) 
 +      $(CXXLINK) -rpath $(pkglibdir) $(libsciast_la_OBJECTS) $(libsciast_la_LIBADD) $(LIBS)
 +
 +clean-checkPROGRAMS:
 +      @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list || exit $$?; \
 +      test -n "$(EXEEXT)" || exit 0; \
 +      list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list
 +testConstExp$(EXEEXT): $(testConstExp_OBJECTS) $(testConstExp_DEPENDENCIES) $(EXTRA_testConstExp_DEPENDENCIES) 
 +      @rm -f testConstExp$(EXEEXT)
 +      $(testConstExp_LINK) $(testConstExp_OBJECTS) $(testConstExp_LDADD) $(LIBS)
 +testControlExp$(EXEEXT): $(testControlExp_OBJECTS) $(testControlExp_DEPENDENCIES) $(EXTRA_testControlExp_DEPENDENCIES) 
 +      @rm -f testControlExp$(EXEEXT)
 +      $(testControlExp_LINK) $(testControlExp_OBJECTS) $(testControlExp_LDADD) $(LIBS)
 +testVarExp$(EXEEXT): $(testVarExp_OBJECTS) $(testVarExp_DEPENDENCIES) $(EXTRA_testVarExp_DEPENDENCIES) 
 +      @rm -f testVarExp$(EXEEXT)
 +      $(testVarExp_LINK) $(testVarExp_OBJECTS) $(testVarExp_LDADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciast_la-debugvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciast_la-libAst.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciast_la-mutevisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciast_la-printvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciast_la-scilabexception.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciast_la-shortcutvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciast_la-visitor_common.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testConstExp-testConstExp.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testControlExp-testControlExp.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testVarExp-testVarExp.Po@am__quote@
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LTCXXCOMPILE) -c -o $@ $<
 +
 +libsciast_la-libAst.lo: src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciast_la-libAst.lo -MD -MP -MF $(DEPDIR)/libsciast_la-libAst.Tpo -c -o libsciast_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciast_la-libAst.Tpo $(DEPDIR)/libsciast_la-libAst.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/libAst.cpp' object='libsciast_la-libAst.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciast_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +
 +libsciast_la-visitor_common.lo: src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciast_la-visitor_common.lo -MD -MP -MF $(DEPDIR)/libsciast_la-visitor_common.Tpo -c -o libsciast_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciast_la-visitor_common.Tpo $(DEPDIR)/libsciast_la-visitor_common.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/visitor_common.cpp' object='libsciast_la-visitor_common.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciast_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +
 +libsciast_la-printvisitor.lo: src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciast_la-printvisitor.lo -MD -MP -MF $(DEPDIR)/libsciast_la-printvisitor.Tpo -c -o libsciast_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciast_la-printvisitor.Tpo $(DEPDIR)/libsciast_la-printvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/printvisitor.cpp' object='libsciast_la-printvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciast_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +
 +libsciast_la-debugvisitor.lo: src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciast_la-debugvisitor.lo -MD -MP -MF $(DEPDIR)/libsciast_la-debugvisitor.Tpo -c -o libsciast_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciast_la-debugvisitor.Tpo $(DEPDIR)/libsciast_la-debugvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/debugvisitor.cpp' object='libsciast_la-debugvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciast_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +
 +libsciast_la-mutevisitor.lo: src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciast_la-mutevisitor.lo -MD -MP -MF $(DEPDIR)/libsciast_la-mutevisitor.Tpo -c -o libsciast_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciast_la-mutevisitor.Tpo $(DEPDIR)/libsciast_la-mutevisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/mutevisitor.cpp' object='libsciast_la-mutevisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciast_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +
 +libsciast_la-shortcutvisitor.lo: src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciast_la-shortcutvisitor.lo -MD -MP -MF $(DEPDIR)/libsciast_la-shortcutvisitor.Tpo -c -o libsciast_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciast_la-shortcutvisitor.Tpo $(DEPDIR)/libsciast_la-shortcutvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/shortcutvisitor.cpp' object='libsciast_la-shortcutvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciast_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +
 +libsciast_la-scilabexception.lo: src/cpp/scilabexception.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciast_la-scilabexception.lo -MD -MP -MF $(DEPDIR)/libsciast_la-scilabexception.Tpo -c -o libsciast_la-scilabexception.lo `test -f 'src/cpp/scilabexception.cpp' || echo '$(srcdir)/'`src/cpp/scilabexception.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciast_la-scilabexception.Tpo $(DEPDIR)/libsciast_la-scilabexception.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/scilabexception.cpp' object='libsciast_la-scilabexception.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciast_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciast_la-scilabexception.lo `test -f 'src/cpp/scilabexception.cpp' || echo '$(srcdir)/'`src/cpp/scilabexception.cpp
 +
 +testConstExp-testConstExp.o: src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -MT testConstExp-testConstExp.o -MD -MP -MF $(DEPDIR)/testConstExp-testConstExp.Tpo -c -o testConstExp-testConstExp.o `test -f 'src/cpp/testConstExp.cpp' || echo '$(srcdir)/'`src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testConstExp-testConstExp.Tpo $(DEPDIR)/testConstExp-testConstExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testConstExp.cpp' object='testConstExp-testConstExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -c -o testConstExp-testConstExp.o `test -f 'src/cpp/testConstExp.cpp' || echo '$(srcdir)/'`src/cpp/testConstExp.cpp
 +
 +testConstExp-testConstExp.obj: src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -MT testConstExp-testConstExp.obj -MD -MP -MF $(DEPDIR)/testConstExp-testConstExp.Tpo -c -o testConstExp-testConstExp.obj `if test -f 'src/cpp/testConstExp.cpp'; then $(CYGPATH_W) 'src/cpp/testConstExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testConstExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testConstExp-testConstExp.Tpo $(DEPDIR)/testConstExp-testConstExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testConstExp.cpp' object='testConstExp-testConstExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -c -o testConstExp-testConstExp.obj `if test -f 'src/cpp/testConstExp.cpp'; then $(CYGPATH_W) 'src/cpp/testConstExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testConstExp.cpp'; fi`
 +
 +testControlExp-testControlExp.o: src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -MT testControlExp-testControlExp.o -MD -MP -MF $(DEPDIR)/testControlExp-testControlExp.Tpo -c -o testControlExp-testControlExp.o `test -f 'src/cpp/testControlExp.cpp' || echo '$(srcdir)/'`src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testControlExp-testControlExp.Tpo $(DEPDIR)/testControlExp-testControlExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testControlExp.cpp' object='testControlExp-testControlExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -c -o testControlExp-testControlExp.o `test -f 'src/cpp/testControlExp.cpp' || echo '$(srcdir)/'`src/cpp/testControlExp.cpp
 +
 +testControlExp-testControlExp.obj: src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -MT testControlExp-testControlExp.obj -MD -MP -MF $(DEPDIR)/testControlExp-testControlExp.Tpo -c -o testControlExp-testControlExp.obj `if test -f 'src/cpp/testControlExp.cpp'; then $(CYGPATH_W) 'src/cpp/testControlExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testControlExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testControlExp-testControlExp.Tpo $(DEPDIR)/testControlExp-testControlExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testControlExp.cpp' object='testControlExp-testControlExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -c -o testControlExp-testControlExp.obj `if test -f 'src/cpp/testControlExp.cpp'; then $(CYGPATH_W) 'src/cpp/testControlExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testControlExp.cpp'; fi`
 +
 +testVarExp-testVarExp.o: src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -MT testVarExp-testVarExp.o -MD -MP -MF $(DEPDIR)/testVarExp-testVarExp.Tpo -c -o testVarExp-testVarExp.o `test -f 'src/cpp/testVarExp.cpp' || echo '$(srcdir)/'`src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testVarExp-testVarExp.Tpo $(DEPDIR)/testVarExp-testVarExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testVarExp.cpp' object='testVarExp-testVarExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -c -o testVarExp-testVarExp.o `test -f 'src/cpp/testVarExp.cpp' || echo '$(srcdir)/'`src/cpp/testVarExp.cpp
 +
 +testVarExp-testVarExp.obj: src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -MT testVarExp-testVarExp.obj -MD -MP -MF $(DEPDIR)/testVarExp-testVarExp.Tpo -c -o testVarExp-testVarExp.obj `if test -f 'src/cpp/testVarExp.cpp'; then $(CYGPATH_W) 'src/cpp/testVarExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testVarExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testVarExp-testVarExp.Tpo $(DEPDIR)/testVarExp-testVarExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testVarExp.cpp' object='testVarExp-testVarExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -c -o testVarExp-testVarExp.obj `if test -f 'src/cpp/testVarExp.cpp'; then $(CYGPATH_W) 'src/cpp/testVarExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testVarExp.cpp'; fi`
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +install-libsciast_la_includeHEADERS: $(libsciast_la_include_HEADERS)
 +      @$(NORMAL_INSTALL)
 +      @list='$(libsciast_la_include_HEADERS)'; test -n "$(libsciast_la_includedir)" || list=; \
 +      if test -n "$$list"; then \
 +        echo " $(MKDIR_P) '$(DESTDIR)$(libsciast_la_includedir)'"; \
 +        $(MKDIR_P) "$(DESTDIR)$(libsciast_la_includedir)" || exit 1; \
 +      fi; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciast_la_includedir)'"; \
 +        $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciast_la_includedir)" || exit $$?; \
 +      done
 +
 +uninstall-libsciast_la_includeHEADERS:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libsciast_la_include_HEADERS)'; test -n "$(libsciast_la_includedir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      dir='$(DESTDIR)$(libsciast_la_includedir)'; $(am__uninstall_files_from_dir)
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +      list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      set x; \
 +      here=`pwd`; \
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      shift; \
 +      if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +        test -n "$$unique" || unique=$$empty_fix; \
 +        if test $$# -gt 0; then \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            "$$@" $$unique; \
 +        else \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            $$unique; \
 +        fi; \
 +      fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      test -z "$(CTAGS_ARGS)$$unique" \
 +        || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +           $$unique
 +
 +GTAGS:
 +      here=`$(am__cd) $(top_builddir) && pwd` \
 +        && $(am__cd) $(top_srcdir) \
 +        && gtags -i $(GTAGS_ARGS) "$$here"
 +
 +distclean-tags:
 +      -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +check-TESTS: $(TESTS)
 +      @failed=0; all=0; xfail=0; xpass=0; skip=0; \
 +      srcdir=$(srcdir); export srcdir; \
 +      list=' $(TESTS) '; \
 +      $(am__tty_colors); \
 +      if test -n "$$list"; then \
 +        for tst in $$list; do \
 +          if test -f ./$$tst; then dir=./; \
 +          elif test -f $$tst; then dir=; \
 +          else dir="$(srcdir)/"; fi; \
 +          if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xpass=`expr $$xpass + 1`; \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=XPASS; \
 +            ;; \
 +            *) \
 +              col=$$grn; res=PASS; \
 +            ;; \
 +            esac; \
 +          elif test $$? -ne 77; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xfail=`expr $$xfail + 1`; \
 +              col=$$lgn; res=XFAIL; \
 +            ;; \
 +            *) \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=FAIL; \
 +            ;; \
 +            esac; \
 +          else \
 +            skip=`expr $$skip + 1`; \
 +            col=$$blu; res=SKIP; \
 +          fi; \
 +          echo "$${col}$$res$${std}: $$tst"; \
 +        done; \
 +        if test "$$all" -eq 1; then \
 +          tests="test"; \
 +          All=""; \
 +        else \
 +          tests="tests"; \
 +          All="All "; \
 +        fi; \
 +        if test "$$failed" -eq 0; then \
 +          if test "$$xfail" -eq 0; then \
 +            banner="$$All$$all $$tests passed"; \
 +          else \
 +            if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
 +            banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 +          fi; \
 +        else \
 +          if test "$$xpass" -eq 0; then \
 +            banner="$$failed of $$all $$tests failed"; \
 +          else \
 +            if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
 +            banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 +          fi; \
 +        fi; \
 +        dashes="$$banner"; \
 +        skipped=""; \
 +        if test "$$skip" -ne 0; then \
 +          if test "$$skip" -eq 1; then \
 +            skipped="($$skip test was not run)"; \
 +          else \
 +            skipped="($$skip tests were not run)"; \
 +          fi; \
 +          test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$skipped"; \
 +        fi; \
 +        report=""; \
 +        if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
 +          report="Please report to $(PACKAGE_BUGREPORT)"; \
 +          test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$report"; \
 +        fi; \
 +        dashes=`echo "$$dashes" | sed s/./=/g`; \
 +        if test "$$failed" -eq 0; then \
 +          col="$$grn"; \
 +        else \
 +          col="$$red"; \
 +        fi; \
 +        echo "$${col}$$dashes$${std}"; \
 +        echo "$${col}$$banner$${std}"; \
 +        test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
 +        test -z "$$report" || echo "$${col}$$report$${std}"; \
 +        echo "$${col}$$dashes$${std}"; \
 +        test "$$failed" -eq 0; \
 +      else :; fi
 +
 +distdir: $(DISTFILES)
 +      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      list='$(DISTFILES)'; \
 +        dist_files=`for file in $$list; do echo $$file; done | \
 +        sed -e "s|^$$srcdirstrip/||;t" \
 +            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +      case $$dist_files in \
 +        */*) $(MKDIR_P) `echo "$$dist_files" | \
 +                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +                         sort -u` ;; \
 +      esac; \
 +      for file in $$dist_files; do \
 +        if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +        if test -d $$d/$$file; then \
 +          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +          if test -d "$(distdir)/$$file"; then \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 +            cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 +        else \
 +          test -f "$(distdir)/$$file" \
 +          || cp -p $$d/$$file "$(distdir)/$$file" \
 +          || exit 1; \
 +        fi; \
 +      done
 +check-am: all-am
 +      $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 +      $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
 +check: check-am
 +all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciast_la_includedir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: install-am
 +install-exec: install-exec-am
 +install-data: install-data-am
 +uninstall: uninstall-am
 +
 +install-am: all-am
 +      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-am
 +install-strip:
 +      if test -z '$(STRIP)'; then \
 +        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +            install; \
 +      else \
 +        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +          "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 +      fi
 +mostlyclean-generic:
 +
 +clean-generic:
 +
 +distclean-generic:
 +      -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +      -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +clean: clean-am
 +
 +clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +      distclean-local distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +html-am:
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-data-local \
 +      install-libsciast_la_includeHEADERS
 +
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
 +
 +install-exec-am: install-pkglibLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-html-am: install-html-local
 +
 +install-info: install-info-am
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-am
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-libsciast_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: check-am install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
 +      check-local clean clean-checkPROGRAMS clean-generic \
 +      clean-libtool clean-local clean-pkglibLTLIBRARIES ctags \
 +      distclean distclean-compile distclean-generic \
 +      distclean-libtool distclean-local distclean-tags distdir dvi \
 +      dvi-am html html-am info info-am install install-am \
 +      install-data install-data-am install-data-local install-dvi \
 +      install-dvi-am install-exec install-exec-am install-html \
 +      install-html-am install-html-local install-info \
 +      install-info-am install-libsciast_la_includeHEADERS \
 +      install-man install-pdf install-pdf-am \
 +      install-pkglibLTLIBRARIES install-ps install-ps-am \
 +      install-strip installcheck installcheck-am installdirs \
 +      maintainer-clean maintainer-clean-generic mostlyclean \
 +      mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 +      pdf pdf-am ps ps-am tags uninstall uninstall-am \
 +      uninstall-libsciast_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +
 +# This target enables tests for Scilab
 +check-local: $(top_builddir)/scilab-bin test
 +      if test -d $(mydatadir)/tests; then \
 +        @COMMAND="try test_run('$(modulename)');catch exit(-1);end;exit(0)"; export LANG=C; $(top_builddir)/bin/scilab -nwni -nb -e "$$COMMAND"; \
 +      fi
 +check-code:
 +      if test -f build.xml; then \
 +              $(ANT) checkstyle; \
 +      fi
 +      if test -x "$(SPLINT)"; then \
 +              $(SPLINT) $(SPLINT_OPTIONS) -I$(top_srcdir)/modules/core/includes/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/localization/includes/ $(INCLUDE_FLAGS) $(CHECK_SRC); \
 +      fi
 +@NEED_JAVA_TRUE@java:
 +# Some configurations needs to export JAVA_HOME in the current env
 +@NEED_JAVA_TRUE@      @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
 +@NEED_JAVA_TRUE@      if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +@NEED_JAVA_TRUE@      if test -f build.xml -a $$USEANT -eq 1; then \
 +@NEED_JAVA_TRUE@              $(ANT); \
 +@NEED_JAVA_TRUE@      fi
 +
 +@NEED_JAVA_TRUE@clean-java:
 +# Some configurations needs to export JAVA_HOME in the current env
 +@NEED_JAVA_TRUE@      @if test "$(JAVA_HOME)"; then export JAVA_HOME=$(JAVA_HOME); fi; \
 +@NEED_JAVA_TRUE@      if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +@NEED_JAVA_TRUE@      if test -f build.xml -a $$USEANT -eq 1; then \
 +@NEED_JAVA_TRUE@              $(ANT) clean; \
 +@NEED_JAVA_TRUE@      fi;
 +
 +# If the user request for the SWIG generation of the wrappers Java => C/C++ 
 +# We call the target swig-build on the variable SWIG_WRAPPERS
 +
 +@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
 +@SWIG_TRUE@   @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
 +@SWIG_TRUE@   SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
 +@SWIG_TRUE@   if test -n "$(SWIG_WRAPPERS)"; then \
 +@SWIG_TRUE@           for file in $(SWIG_WRAPPERS) ; do \
 +@SWIG_TRUE@                   echo "Swig process of $$file ..."; \
 +@SWIG_TRUE@                   $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME  -outdir $$SWIG_OUTDIR $$file; \
 +@SWIG_TRUE@           done; \
 +@SWIG_TRUE@   fi
 +
 +# If the user request for the SWIG generation of the wrappers Java => C/C++ 
 +# We call the target swig-build on the variable SWIG_WRAPPERS
 +
 +@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
 +@GIWS_TRUE@   @GIWS_OUTPUTDIR=src/jni/;\
 +@GIWS_TRUE@   if test -n "$(GIWS_WRAPPERS)"; then \
 +@GIWS_TRUE@           for file in $(GIWS_WRAPPERS) ; do \
 +@GIWS_TRUE@                   echo "GIWS process of $$file ..."; \
 +@GIWS_TRUE@                   $(GIWS_BIN) --disable-return-size-array --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
 +@GIWS_TRUE@           done; \
 +@GIWS_TRUE@   fi
 +
 +@GIWS_TRUE@giws-exception:
 +@GIWS_TRUE@   @GIWS_OUTPUTDIR=src/jni/;\
 +@GIWS_TRUE@   echo "GIWS: Generation of exception class ..."; \
 +@GIWS_TRUE@   $(GIWS_BIN) --generate-exception-class --output-dir $$GIWS_OUTPUTDIR 
 +
 +macros:
 +      -@( if test ! -x $(top_builddir)/scilab-bin; then \
 +              echo "Error : Cannot build $< : Scilab has not been built"; \
 +      else \
 +              $(top_builddir)/bin/scilab -ns -nwni -e "exec('macros/buildmacros.sce');quit;";\
 +      fi)
 +
 +# Removes the macros
 +clean-macros:
 +# Removes macros (*.bin generated from .sci)
 +      @for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
 +              echo "rm -f $(builddir)/$$dir/$(MACROBINMASK)"; \
 +              rm -f $(builddir)/$$dir/$(MACROBINMASK); \
 +      done
 +
 +test:
 +# More tests could be added here
 +      @if test -z "$(USEANT)"; then USEANT=0; else USEANT=1; fi; \
 +      if test -f build.xml -a $$USEANT -eq 1; then \
 +              $(ANT) test; \
 +      fi
 +
 +all-local: $(TARGETS_ALL)
 +
 +.sci.bin:
 +      -@( if test ! -x $(top_builddir)/scilab-bin; then \
 +      echo "Error : Cannot build $< : Scilab has not been build"; \
 +      else \
 +      echo "Creating $@"; \
 +      $(top_builddir)/bin/scilab -ns -nwni -e "exec('$(abs_srcdir)/$<');save('$(abs_srcdir)/$@');exit;"; \
 +      fi )
 +
 +install-html-local:
 +
 +install-data-local-local:
 +# Mainly for javasci
 +      @if test -d $(srcdir)/javadoc; then \
 +              cp -R $(srcdir)/javadoc $(DESTDIR)/$(mydatadir)/; \
 +      fi
 +# If the user wants the help sources to be installed
 +@INSTALL_HELP_XML_TRUE@       @echo "-------- Install of XML sources of help files --------"; \
 +@INSTALL_HELP_XML_TRUE@       for lang in $(ALL_LINGUAS); do \
 +@INSTALL_HELP_XML_TRUE@        if test -d $(srcdir)/help/$$lang; then \
 +@INSTALL_HELP_XML_TRUE@         $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/$$lang && \
 +@INSTALL_HELP_XML_TRUE@               if ls -lLd $(srcdir)/help/$$lang/$(DOCMASKXML) >/dev/null 2>&1; then \
 +@INSTALL_HELP_XML_TRUE@                 for file in $(srcdir)/help/$$lang/$(DOCMASKXML) ; do \
 +@INSTALL_HELP_XML_TRUE@                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/$$lang" ; \
 +@INSTALL_HELP_XML_TRUE@               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/$$lang ; \
 +@INSTALL_HELP_XML_TRUE@                 done ; \
 +@INSTALL_HELP_XML_TRUE@               fi; \
 +@INSTALL_HELP_XML_TRUE@        fi; \
 +@INSTALL_HELP_XML_TRUE@       done; \
 +@INSTALL_HELP_XML_TRUE@       @echo "-------- Install of MathML sources --------"; \
 +@INSTALL_HELP_XML_TRUE@        if test -d $(srcdir)/help/mml/; then \
 +@INSTALL_HELP_XML_TRUE@         $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/help/mml/ && \
 +@INSTALL_HELP_XML_TRUE@               if ls -lLd $(srcdir)/help/mml/$(DOCMASKMML) >/dev/null 2>&1; then \
 +@INSTALL_HELP_XML_TRUE@                 for file in $(srcdir)/help/mml/$(DOCMASKMML) ; do \
 +@INSTALL_HELP_XML_TRUE@                   echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/help/mml" ; \
 +@INSTALL_HELP_XML_TRUE@               $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/help/mml ; \
 +@INSTALL_HELP_XML_TRUE@                 done ; \
 +@INSTALL_HELP_XML_TRUE@               fi; \
 +@INSTALL_HELP_XML_TRUE@       fi
 +install-data-local:
 +# Install the tests
 +      @echo "-------- Install tests (if any) --------"; \
 +      for dir in $(TESTS_DIR) $(TESTS_DIREXT) ; do \
 +        if test -d $(srcdir)/$$dir/; then \
 +          $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
 +                for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
 +                  if test -d "$(srcdir)/$$dir/$$file"; then \
 +                        echo $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir/$$file; \
 +                        $(mkinstalldirs) "$(DESTDIR)$(pkgmacrosdir)/$$dir/$$file"; \
 +                  else \
 +                    echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
 +                $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgmacrosdir)/`dirname $$dir/$$file`" ; \
 +                  fi \
 +                done; \
 +        fi; \
 +      done
 +# Install the help chapter
 +      @echo "-------- Install the help chapter (if any) --------"; \
 +      for lang in $(HELP_CHAPTERLANG); do \
 +              HELPFILE=$(srcdir)/$(HELP_CHAPTERDIR)$$lang/$(HELP_CHAPTERFILE); \
 +              if test -f $$HELPFILE; then \
 +                      echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
 +                      $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(HELP_CHAPTERDIR)/$$lang/; \
 +                      echo $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
 +                      $(INSTALL_DATA) $$HELPFILE $(DESTDIR)$(pkgdocdir)/$$HELPFILE; \
 +              fi; \
 +      done
 +# Install the demos & examples
 +      @echo "-------- Install demos & examples (if any) --------"; \
 +      for dir in $(DEMOS_DIR) $(DEMOS_DIREXT) $(EXAMPLES_DIR) $(EXAMPLES_DIREXT) ; do \
 +        if test -d $(srcdir)/$$dir/; then \
 +          $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir && \
 +                for file in `find $(srcdir)/$$dir | sed "s|^$(srcdir)/$$dir||" 2>/dev/null`; do \
 +                  if test -d "$(srcdir)/$$dir/$$file"; then \
 +                        echo $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$$dir/$$file; \
 +                        $(mkinstalldirs) "$(DESTDIR)$(pkgdocdir)/$$dir/$$file"; \
 +                  else \
 +                    echo "$(INSTALL_DATA) $(srcdir)/$$dir/$$file $(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
 +                $(INSTALL_DATA) "$(srcdir)/$$dir/$$file" "$(DESTDIR)$(pkgdocdir)/`dirname $$dir/$$file`" ; \
 +                  fi \
 +                done; \
 +        fi; \
 +      done
 +# Install the macros
 +      @echo "-------- Install macros (if any) --------"; \
 +      for dir in $(MACRODIRS) $(MACROSDIRSEXT) ; do \
 +        $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
 +              if test -d $(srcdir)/$$dir/; then \
 +                      FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
 +                      if test -n "$(MACROSSPECIALEXT)"; then \
 +                              specialExtDir=""; \
 +                              for specialExt in $(MACROSSPECIALEXT); do \
 +                                      specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
 +                              done; \
 +                              FILELIST="$$FILELIST $$specialExtDir"; \
 +                      fi; \
 +                for file in `ls -1 $$FILELIST 2>/dev/null`; do \
 +                  echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
 +              $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
 +                done; \
 +              fi; \
 +      done
 +# Install java files (.jar)
 +      @if ls -lLd $(srcdir)/$(JARDIR)$(JARMASK) >/dev/null 2>&1; then \
 +      echo "-------- Install jar files --------"; \
 +    $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)/$(JARDIR); \
 +        for file in $(srcdir)/$(JARDIR)$(JARMASK); do\
 +                  echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdocdir)/$(JARDIR)" ; \
 +              $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgdocdir)/$(JARDIR) ; \
 +        done ; \
 +      fi
 +
 +########### CLEAN ###################
 +# Clean help (generated automatically by Scilab)
 +# It used to clean the macro (clean-macros) but this was causing
 +# make clean && make to fail Scilab startup
 +@NEED_JAVA_TRUE@clean-local: clean-java
 +@NEED_JAVA_FALSE@clean-local:
 +
 +distclean-local:
 +      rm -f $(builddir)/help/*/.last_successful_build_javaHelp $(builddir)/help/*/.list_*
 +
 +.PHONY: macros java swig giws
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
index 8c58928,0000000..bbc669d
mode 100644,000000..100644
--- /dev/null
@@@ -1,206 -1,0 +1,206 @@@
 +<?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>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +  </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;../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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>system_env.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <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;../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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>system_env.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <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;../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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>system_env.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <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;../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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>system_env.lib;scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <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>
-   <ItemGroup>
-     <ProjectReference Include="..\..\..\libs\MALLOC\MALLOC.vcxproj">
-       <Project>{6a84ad8c-ba18-4a3f-9c72-ec3df0939e9e}</Project>
-     </ProjectReference>
-   </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
index e5ca4bc,0000000..aa74c4e
mode 100644,000000..100644
--- /dev/null
@@@ -1,39 -1,0 +1,42 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup>
 +    <ClInclude Include="..\includes\dynlib_ast_tools.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="..\includes\scilabexception.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <None Include="system_env_Import .def">
 +      <Filter>Library Dependencies</Filter>
 +    </None>
 +    <None Include="Localization_Import.def">
 +      <Filter>Library Dependencies</Filter>
 +    </None>
++    <None Include="core_Import.def">
++      <Filter>Library Dependencies</Filter>
++    </None>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\..\bin\lapack.lib" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Filter Include="Header Files">
 +      <UniqueIdentifier>{5f9da064-c98b-45d2-ba10-24d31d194fc5}</UniqueIdentifier>
 +    </Filter>
 +    <Filter Include="Source Files">
 +      <UniqueIdentifier>{a091f5ed-821b-47f9-9825-01ee741cefc6}</UniqueIdentifier>
 +    </Filter>
 +    <Filter Include="Library Dependencies">
 +      <UniqueIdentifier>{6cc3761a-7d14-4f75-b24c-59147115e513}</UniqueIdentifier>
 +    </Filter>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClCompile Include="..\src\cpp\scilabexception.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +  </ItemGroup>
 +</Project>
index 0000000,0000000..229efe9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,5 @@@
++LIBRARY    core.dll
++
++
++EXPORTS
++MyHeapFree
index 0009362,0000000..956c077
mode 100644,000000..100644
--- /dev/null
@@@ -1,289 -1,0 +1,301 @@@
 +<?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>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +    <WholeProgramOptimization>true</WholeProgramOptimization>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>Unicode</CharacterSet>
 +  </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/dynamiclibrary/includes;../../libs/Eigen/includes;../console/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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>$(SolutionDir)bin\types.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <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/dynamiclibrary/includes;../../libs/Eigen/includes;../console/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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>$(SolutionDir)bin\types.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <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/dynamiclibrary/includes;../../libs/Eigen/includes;../console/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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>$(SolutionDir)bin\types.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <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/dynamiclibrary/includes;../../libs/Eigen/includes;../console/includes;../graphic_objects/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <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>$(SolutionDir)bin\types.lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <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\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\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="..\..\libs\MALLOC\MALLOC.vcxproj">
-       <Project>{6a84ad8c-ba18-4a3f-9c72-ec3df0939e9e}</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="..\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="..\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 fc59d5e,0000000..7abdf0f
mode 100644,000000..100644
--- /dev/null
@@@ -1,240 -1,0 +1,248 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup>
 +    <ClCompile Include="src\cpp\debugvisitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="src\cpp\libAst.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="src\cpp\mutevisitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="src\cpp\printvisitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="src\cpp\shortcutvisitor.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +    <ClCompile Include="src\cpp\visitor_common.cpp">
 +      <Filter>Source Files</Filter>
 +    </ClCompile>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="includes\all.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\ast.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\alldec.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\allexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\allvar.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\anydecs.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\arraylistexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\arraylistvar.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\assignexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\assignlistexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\boolexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\controlexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\breakexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\callexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\caseexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\cellcallexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\cellexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\colonvar.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\commentexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\constexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\continueexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\debugvisitor.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\intexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\dec.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\decls.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\decs.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\dollarvar.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\doubleexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\dummyvisitor.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\execvisitor.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\exp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\fieldexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\floatexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\forexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\functiondec.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\ifexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\listexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\whileexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\logicalopexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\mathexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\matrixexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\matrixlineexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\mutevisitor.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\nilexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\notexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\opexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\printvisitor.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\returnexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\run_AssignExp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\run_CallExp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\run_MatrixExp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\run_OpExp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\runvisitor.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\selectexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\seqexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\shortcutvisitor.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\simplevar.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\stringexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\timedvisitor.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\token.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\transposeexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\trycatchexp.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\var.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\vardec.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\visitor.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\visitor_common.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="src\cpp\libAst.hxx">
 +      <Filter>Header Files</Filter>
 +    </ClInclude>
 +    <ClInclude Include="includes\stepvisitor.hxx" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\bin\blasplus.lib" />
 +    <Library Include="..\..\bin\lapack.lib" />
 +    <Library Include="..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Filter Include="Header Files">
 +      <UniqueIdentifier>{cb9b58ce-c856-48a4-bd7a-313c179422ac}</UniqueIdentifier>
 +    </Filter>
 +    <Filter Include="Source Files">
 +      <UniqueIdentifier>{0499815e-56d2-4ff4-bb90-dd57cf2c6cd0}</UniqueIdentifier>
 +    </Filter>
++    <Filter Include="Libraries Dependencies">
++      <UniqueIdentifier>{31bac480-5190-44fd-8c11-aa2cf27d3069}</UniqueIdentifier>
++    </Filter>
++  </ItemGroup>
++  <ItemGroup>
++    <None Include="core_Import.def">
++      <Filter>Libraries Dependencies</Filter>
++    </None>
 +  </ItemGroup>
 +</Project>
index 0000000,0000000..229efe9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,5 @@@
++LIBRARY    core.dll
++
++
++EXPORTS
++MyHeapFree
@@@ -15,35 -11,21 +15,34 @@@ BOOLEAN_C_SOURCES = 
  BOOLEAN_FORTRAN_SOURCES = src/fortran/logic.f \
  src/fortran/find.f
  
 -GATEWAY_C_SOURCES = sci_gateway/c/sci_and.c \
 -sci_gateway/c/sci_or.c \
 -sci_gateway/c/sci_find.c \
 -sci_gateway/c/sci_bool2s.c \
 -sci_gateway/c/gw_boolean.c
 +GATEWAY_CPP_SOURCES = \
 +    sci_gateway/cpp/sci_bool2s.cpp \
 +    sci_gateway/cpp/sci_find.cpp
  
 -GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/sci_f_bool2s.f \
 -sci_gateway/fortran/sci_f_find.f
 -
 -libsciboolean_la_CPPFLAGS= -I$(srcdir)/includes/ \
 -                              -I$(srcdir)/src/c/ \
 -                              -I$(top_srcdir)/modules/api_scilab/includes/ \
 -                              -I$(top_srcdir)/modules/localization/includes/ \
 -                              -I$(top_srcdir)/modules/output_stream/includes/ \
 -                              $(AM_CPPFLAGS)
 +GATEWAY_C_SOURCES = sci_gateway/c/sci_and.c \
 +    sci_gateway/c/sci_or.c
 +
 +GATEWAY_FORTRAN_SOURCES =
 +
 +libsciboolean_la_CPPFLAGS = \
 +    -I$(srcdir)/includes/ \
-     -I$(top_srcdir)/libs/MALLOC/includes \
-     -I$(top_srcdir)/libs/dynamiclibrary/includes \
++    -I$(top_srcdir)/modules/dynamic_link/includes \
 +    -I$(top_srcdir)/modules/functions_manager/includes \
 +    -I$(top_srcdir)/modules/types/includes \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +    -I$(top_srcdir)/modules/ast/includes \
 +    -I$(top_srcdir)/modules/elementary_functions/includes \
 +    -I$(top_srcdir)/modules/console/includes \
 +    -I$(top_srcdir)/modules/core/includes \
 +    -I$(top_srcdir)/modules/operations/includes \
 +    -I$(top_srcdir)/modules/output_stream/includes \
 +    -I$(top_srcdir)/modules/api_scilab/includes \
 +    -I$(top_srcdir)/modules/system_env/includes \
 +    -I$(top_srcdir)/modules/threads/includes \
 +    -I$(top_srcdir)/modules/localization/includes \
 +    -I$(top_srcdir)/modules/string/includes \
 +    $(EIGEN_CPPFLAGS) \
 +    $(AM_CPPFLAGS)
  
  if MAINTAINER_MODE
  pkglib_LTLIBRARIES = libsciboolean.la
@@@ -468,34 -448,21 +468,33 @@@ BOOLEAN_C_SOURCES = 
  BOOLEAN_FORTRAN_SOURCES = src/fortran/logic.f \
  src/fortran/find.f
  
 -GATEWAY_C_SOURCES = sci_gateway/c/sci_and.c \
 -sci_gateway/c/sci_or.c \
 -sci_gateway/c/sci_find.c \
 -sci_gateway/c/sci_bool2s.c \
 -sci_gateway/c/gw_boolean.c
 -
 -GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/sci_f_bool2s.f \
 -sci_gateway/fortran/sci_f_find.f
 +GATEWAY_CPP_SOURCES = \
 +    sci_gateway/cpp/sci_bool2s.cpp \
 +    sci_gateway/cpp/sci_find.cpp
  
 -libsciboolean_la_CPPFLAGS = -I$(srcdir)/includes/ \
 -                              -I$(srcdir)/src/c/ \
 -                              -I$(top_srcdir)/modules/api_scilab/includes/ \
 -                              -I$(top_srcdir)/modules/localization/includes/ \
 -                              -I$(top_srcdir)/modules/output_stream/includes/ \
 -                              $(AM_CPPFLAGS)
 +GATEWAY_C_SOURCES = sci_gateway/c/sci_and.c \
 +    sci_gateway/c/sci_or.c
 +
 +GATEWAY_FORTRAN_SOURCES = 
 +libsciboolean_la_CPPFLAGS = \
 +    -I$(srcdir)/includes/ \
-     -I$(top_srcdir)/libs/MALLOC/includes \
-     -I$(top_srcdir)/libs/dynamiclibrary/includes \
++    -I$(top_srcdir)/modules/dynamic_link/includes \
 +    -I$(top_srcdir)/modules/functions_manager/includes \
 +    -I$(top_srcdir)/modules/types/includes \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +    -I$(top_srcdir)/modules/ast/includes \
 +    -I$(top_srcdir)/modules/elementary_functions/includes \
 +    -I$(top_srcdir)/modules/console/includes \
 +    -I$(top_srcdir)/modules/core/includes \
 +    -I$(top_srcdir)/modules/operations/includes \
 +    -I$(top_srcdir)/modules/output_stream/includes \
 +    -I$(top_srcdir)/modules/api_scilab/includes \
 +    -I$(top_srcdir)/modules/system_env/includes \
 +    -I$(top_srcdir)/modules/threads/includes \
 +    -I$(top_srcdir)/modules/localization/includes \
 +    -I$(top_srcdir)/modules/string/includes \
 +    $(EIGEN_CPPFLAGS) \
 +    $(AM_CPPFLAGS)
  
  @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libsciboolean.la
  @MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libsciboolean-algo.la libsciboolean.la
@@@ -76,7 -76,7 +76,7 @@@
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;BOOLEAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
@@@ -116,7 -118,7 +116,7 @@@ cd .
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;BOOLEAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
        <WarningLevel>Level3</WarningLevel>
@@@ -154,7 -158,7 +154,7 @@@ cd .
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;BOOLEAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@@ -199,7 -205,7 +199,7 @@@ cd .
      <ClCompile>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>.;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;BOOLEAN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>