remove wrong dependencies on elementary_functions + fix build on windows 53/953/4
Allan CORNET [Thu, 10 Jun 2010 08:17:59 +0000 (10:17 +0200)]
Change-Id: Ieb853803af9fddec4e47b0f3aece4d525486f6b7

82 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/libs/ExplicitExportsLibScilab.vcdef
scilab/libs/LibScilab/DllmainLibscilab.c
scilab/libs/cleanvcdef.bat
scilab/modules/boolean/src/fortran/LibScilab_Import.def
scilab/modules/cacsd/src/slicot/slicot_f/Libscilab_Import.def
scilab/modules/double/src/fortran/LibScilab_Import.def
scilab/modules/dynamic_link/src/fortran/LibScilab_Import.def
scilab/modules/elementary_functions/.gitignore
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/elementary_functions.iss
scilab/modules/elementary_functions/sci_gateway/c/sci_expm.c
scilab/modules/elementary_functions/src/c/DllmainElementary_functions.c [new file with mode: 0644]
scilab/modules/elementary_functions/src/c/IsEqualVar.c
scilab/modules/elementary_functions/src/c/IsEqualVar.h
scilab/modules/elementary_functions/src/c/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/c/elementary_functions.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/c/elementary_functions.rc [new file with mode: 0644]
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/elementary_functions/src/c/elementary_functions_f_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/c/elementary_functions_header.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/fortran/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/fortran/coef.f
scilab/modules/elementary_functions/src/fortran/dexpm1.f
scilab/modules/elementary_functions/src/fortran/eispack/LibScilab_Import.def
scilab/modules/elementary_functions/src/fortran/elementary_functions_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc [new file with mode: 0644]
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f_header.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/fortran/linpack/Elementary_functions_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/fortran/linpack/Elementary_functions_f_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/fortran/linpack/LibScilab_Import.def
scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.vfproj
scilab/modules/elementary_functions/src/fortran/linpack/linpack_f2c.vcproj
scilab/modules/elementary_functions/src/fortran/slatec/Elementary_functions_f_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/fortran/slatec/LibScilab_Import.def
scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.vfproj
scilab/modules/elementary_functions/src/fortran/slatec/slatec_f2c.vcproj
scilab/modules/elementary_functions/src/fortran/wexpm1.f
scilab/modules/fftw/LibScilab_Import.def
scilab/modules/functions/src/fortran/LibScilab_Import.def
scilab/modules/graphics/LibScilab_Import.def
scilab/modules/integer/src/fortran/Elementary_functions_f_Import.def [new file with mode: 0644]
scilab/modules/integer/src/fortran/LibScilab_Import.def
scilab/modules/integer/src/fortran/integer_f.vfproj
scilab/modules/integer/src/fortran/integer_f2c.vcproj
scilab/modules/interpolation/src/c/LibScilab_Import.def
scilab/modules/interpolation/src/fortran/LibScilab_Import.def
scilab/modules/io/src/fortran/Elementary_functions_f_Import.def [new file with mode: 0644]
scilab/modules/io/src/fortran/LibScilab_Import.def
scilab/modules/io/src/fortran/io_f.vfproj
scilab/modules/io/src/fortran/io_f2c.vcproj
scilab/modules/linear_algebra/src/c/LibScilab_Import.def
scilab/modules/linear_algebra/src/fortran/LibScilab_Import.def
scilab/modules/optimization/src/fortran/LibScilab_Import.def
scilab/modules/output_stream/src/c/LibScilab_Import.def
scilab/modules/output_stream/src/c/floor_f2c.c [new file with mode: 0644]
scilab/modules/output_stream/src/fortran/Elementary_functions_Import.def [new file with mode: 0644]
scilab/modules/output_stream/src/fortran/Elementary_functions_f_Import.def [new file with mode: 0644]
scilab/modules/output_stream/src/fortran/LibScilab_Import.def
scilab/modules/output_stream/src/fortran/output_stream_f.vfproj
scilab/modules/output_stream/src/fortran/output_stream_f2c.vcproj
scilab/modules/polynomials/src/fortran/Elementary_functions_Import.def [new file with mode: 0644]
scilab/modules/polynomials/src/fortran/Elementary_functions_f_Import.def [new file with mode: 0644]
scilab/modules/polynomials/src/fortran/LibScilab_Import.def
scilab/modules/polynomials/src/fortran/polynomials_f.vfproj
scilab/modules/polynomials/src/fortran/polynomials_f2c.vcproj
scilab/modules/randlib/src/c/LibScilab_Import.def
scilab/modules/scicos/src/c/LibScilab_Import.def
scilab/modules/scicos/src/fortran/LibScilab_Import.def
scilab/modules/scicos_blocks/src/c/LibScilab_Import.def
scilab/modules/scicos_blocks/src/fortran/LibScilab_Import.def
scilab/modules/signal_processing/src/fortran/LibScilab_Import.def
scilab/modules/sparse/src/fortran/Elementary_functions_f_Import.def [new file with mode: 0644]
scilab/modules/sparse/src/fortran/LibScilab_Import.def
scilab/modules/sparse/src/fortran/sparse_f.vfproj
scilab/modules/sparse/src/fortran/sparse_f2c.vcproj
scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f2c.vcproj [moved from scilab/modules/statistics/src/dcdflib/dcd_f/dcd_DLL_f2c.vcproj with 100% similarity]
scilab/modules/string/src/fortran/LibScilab_Import.def

index c42b7b9..fb1d582 100644 (file)
@@ -18,12 +18,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildMacros", "modules\func
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementary_functions", "modules\elementary_functions\src\c\elementary_functions.vcproj", "{5B110267-7C18-437C-B87D-DBA2B50729E9}"
        ProjectSection(ProjectDependencies) = postProject
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "elementary_functions_f", "modules\elementary_functions\src\fortran\elementary_functions_f.vfproj", "{DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}"
        ProjectSection(ProjectDependencies) = postProject
+               {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
+               {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8}
+               {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
+               {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
+               {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
+               {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "statistics", "modules\statistics\src\c\statistics.vcproj", "{FE9EB721-B3C1-41D8-B585-3FB3A0083CEC}"
@@ -132,6 +142,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "modules\graphics\graphics.vcproj", "{8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD} = {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D} = {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}
@@ -155,6 +166,7 @@ EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "integer_f", "modules\integer\src\fortran\integer_f.vfproj", "{FD0F48D8-9D0B-42A8-A743-B57198FAB41E}"
        ProjectSection(ProjectDependencies) = postProject
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -206,6 +218,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization", "modules\opt
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "optimization_f", "modules\optimization\src\fortran\optimization_f.vfproj", "{1D219098-007C-4F76-9AE6-271ABBB7D393}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -229,6 +243,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib", "modules\randlib\src\c\randlib.vcproj", "{34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
@@ -244,7 +259,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos", "modules\scicos\src\c\scicos.vcproj", "{B7A0273E-8E71-4663-8497-0895945ED54D}"
        ProjectSection(ProjectDependencies) = postProject
                {05D8F60B-332A-4161-B946-B8AB30ED439C} = {05D8F60B-332A-4161-B946-B8AB30ED439C}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {566E524B-D327-4416-A865-9C83503FAB7B} = {566E524B-D327-4416-A865-9C83503FAB7B}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
                {C781737A-7C97-4CF9-ACBC-F68C2BBF0FFA} = {C781737A-7C97-4CF9-ACBC-F68C2BBF0FFA}
                {2F7B6080-8D84-43A7-A967-13FC8AA83DEB} = {2F7B6080-8D84-43A7-A967-13FC8AA83DEB}
@@ -255,17 +272,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos", "modules\scicos\sr
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "scicos_f", "modules\scicos\src\fortran\scicos_f.vfproj", "{566E524B-D327-4416-A865-9C83503FAB7B}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "signal_processing_f", "modules\signal_processing\src\fortran\signal_processing_f.vfproj", "{959384FC-016C-4B01-B848-1B18D26B6CC4}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606} = {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "slicot_f", "modules\cacsd\src\slicot\slicot_f\slicot_f.vfproj", "{C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -283,6 +305,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileio", "modules\fileio\fi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparse", "modules\sparse\src\c\sparse.vcproj", "{51240B08-5E4E-439B-B745-C870D5B513BF}"
        ProjectSection(ProjectDependencies) = postProject
+               {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
                {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -290,6 +313,7 @@ EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "sparse_f", "modules\sparse\src\fortran\sparse_f.vfproj", "{13082624-97F9-47DB-A9A1-AD7D6BF3856A}"
        ProjectSection(ProjectDependencies) = postProject
                {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -308,6 +332,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmex", "modules\mexlib\src\libmex\libmex.vcproj", "{0AEC8745-BB5B-4E66-A59A-7251412C3605}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
@@ -320,6 +345,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmx", "modules\mexlib\src\libmx\libmx.vcproj", "{CEF88C5F-6820-46D4-BCCD-44D5581481C5}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
@@ -332,6 +358,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmat", "modules\mexlib\src\libmat\libmat.vcproj", "{8A508625-C2AA-4295-AA76-16E4E456D13D}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
@@ -438,6 +465,7 @@ EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "io_f", "modules\io\src\fortran\io_f.vfproj", "{C2EDD447-BB60-41A1-973B-8213FCA9ECD4}"
        ProjectSection(ProjectDependencies) = postProject
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -457,6 +485,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string", "modules\string\sr
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "string_f", "modules\string\src\fortran\string_f.vfproj", "{FAF6A7EB-8A36-4278-B34E-34EA89E55304}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
@@ -517,6 +547,8 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "dcd", "modules\statistics\s
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "linear_algebra_f", "modules\linear_algebra\src\fortran\linear_algebra_f.vfproj", "{3735EFF9-925B-45B1-82CF-762658E69E70}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -524,7 +556,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_algebra", "modules\linear_algebra\src\c\linear_algebra.vcproj", "{BC462A57-C5B3-4F93-8067-80363827DCDA}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -563,7 +597,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double", "modules\double\sr
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "double_f", "modules\double\src\fortran\double_f.vfproj", "{97B3664E-1186-400A-AEC0-AC3F23087689}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {BC462A57-C5B3-4F93-8067-80363827DCDA} = {BC462A57-C5B3-4F93-8067-80363827DCDA}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
@@ -579,6 +615,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean", "modules\boolean\
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "boolean_f", "modules\boolean\src\fortran\boolean_f.vfproj", "{45ECEB36-A12B-42F5-9D7A-216A0E70601D}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
@@ -587,6 +625,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interpolation", "modules\interpolation\src\c\interpolation.vcproj", "{22F14F8F-67C6-49B1-A730-CE70FFE9EB61}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {D98B0986-14E4-44FD-B006-CACE4B291F38} = {D98B0986-14E4-44FD-B006-CACE4B291F38}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
@@ -608,6 +647,7 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "data_structures_f", "module
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "interpolation_f", "modules\interpolation\src\fortran\interpolation_f.vfproj", "{D98B0986-14E4-44FD-B006-CACE4B291F38}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -622,6 +662,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fftw", "modules\fftw\fftw.vcproj", "{13B86307-5A11-48D6-94BE-71F77BCB82D1}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {77154919-8A20-4F35-B7C7-6B3B957BDCA1} = {77154919-8A20-4F35-B7C7-6B3B957BDCA1}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
@@ -638,6 +679,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noscicos", "modules\scicos\
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "slatec_f", "modules\elementary_functions\src\fortran\slatec\slatec_f.vfproj", "{EAF0949C-28D2-497C-954F-FC13B32FF2F3}"
        ProjectSection(ProjectDependencies) = postProject
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -897,6 +939,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_export-Ant", "modul
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "dynamic_link_f", "modules\dynamic_link\src\fortran\dynamic_link_f.vfproj", "{9BC28602-73B4-4FBB-9583-478D2F047CA4}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -912,7 +956,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks", "modules\scicos_blocks\src\c\scicos_blocks.vcproj", "{70F677F1-B535-4D0F-A16F-5093B799A540}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
-               {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
                {C781737A-7C97-4CF9-ACBC-F68C2BBF0FFA} = {C781737A-7C97-4CF9-ACBC-F68C2BBF0FFA}
@@ -926,6 +970,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks", "modules\sc
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "scicos_blocks_f", "modules\scicos_blocks\src\fortran\scicos_blocks_f.vfproj", "{2F7B6080-8D84-43A7-A967-13FC8AA83DEB}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
 EndProject
@@ -1012,6 +1058,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions", "modules\functi
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "functions_f", "modules\functions\src\fortran\functions_f.vfproj", "{E6552427-01DD-4C12-823C-09AD46F77FAD}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
index 1f94099..f6c5f0e 100644 (file)
@@ -3,27 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex", "modules\windows_tools\src\c\WScilex\WScilex.vcproj", "{CCD80549-EB9C-42AA-9B86-D687377E94F6}"
        ProjectSection(ProjectDependencies) = postProject
                {66F2FB48-5D68-4445-A856-119F685A371B} = {66F2FB48-5D68-4445-A856-119F685A371B}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
                {6880D4DF-BC7A-411F-AD9B-20A14429A92F} = {6880D4DF-BC7A-411F-AD9B-20A14429A92F}
                {9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77} = {9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildMacros", "modules\functions\scripts\buildmacros\BuildMacros.vcproj", "{66F2FB48-5D68-4445-A856-119F685A371B}"
        ProjectSection(ProjectDependencies) = postProject
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77} = {9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementary_functions", "modules\elementary_functions\src\c\elementary_functions.vcproj", "{5B110267-7C18-437C-B87D-DBA2B50729E9}"
        ProjectSection(ProjectDependencies) = postProject
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementary_functions_f", "modules\elementary_functions\src\fortran\elementary_functions_f2c.vcproj", "{DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}"
        ProjectSection(ProjectDependencies) = postProject
+               {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
+               {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8}
+               {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
+               {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
+               {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
+               {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "statistics", "modules\statistics\src\c\statistics.vcproj", "{FE9EB721-B3C1-41D8-B585-3FB3A0083CEC}"
@@ -34,7 +44,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "statistics", "modules\stati
                {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0} = {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab\LibScilab_f2c.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab\LibScilab.vcproj", "{64BC155E-292F-484F-9404-76EE6AE67A43}"
        ProjectSection(ProjectDependencies) = postProject
                {9BC28602-73B4-4FBB-9583-478D2F047CA4} = {9BC28602-73B4-4FBB-9583-478D2F047CA4}
                {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA} = {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA}
@@ -132,6 +142,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "modules\graphics\graphics.vcproj", "{8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD} = {2DAEC214-B0B4-4BC3-96B2-77C6AD1450CD}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D} = {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}
@@ -155,6 +166,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer_f", "modules\integer\src\fortran\integer_f2c.vcproj", "{FD0F48D8-9D0B-42A8-A743-B57198FAB41E}"
        ProjectSection(ProjectDependencies) = postProject
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -206,6 +218,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization", "modules\opt
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization_f", "modules\optimization\src\fortran\optimization_f2c.vcproj", "{1D219098-007C-4F76-9AE6-271ABBB7D393}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -229,6 +243,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib", "modules\randlib\src\c\randlib.vcproj", "{34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
@@ -244,7 +259,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos", "modules\scicos\src\c\scicos.vcproj", "{B7A0273E-8E71-4663-8497-0895945ED54D}"
        ProjectSection(ProjectDependencies) = postProject
                {05D8F60B-332A-4161-B946-B8AB30ED439C} = {05D8F60B-332A-4161-B946-B8AB30ED439C}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {566E524B-D327-4416-A865-9C83503FAB7B} = {566E524B-D327-4416-A865-9C83503FAB7B}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
                {C781737A-7C97-4CF9-ACBC-F68C2BBF0FFA} = {C781737A-7C97-4CF9-ACBC-F68C2BBF0FFA}
                {2F7B6080-8D84-43A7-A967-13FC8AA83DEB} = {2F7B6080-8D84-43A7-A967-13FC8AA83DEB}
@@ -255,17 +272,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos", "modules\scicos\sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_f", "modules\scicos\src\fortran\scicos_f2c.vcproj", "{566E524B-D327-4416-A865-9C83503FAB7B}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signal_processing_f", "modules\signal_processing\src\fortran\signal_processing_f2c.vcproj", "{959384FC-016C-4B01-B848-1B18D26B6CC4}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606} = {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slicot_f", "modules\cacsd\src\slicot\slicot_f\slicot_f2c.vcproj", "{C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -291,6 +313,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparse_f", "modules\sparse\src\fortran\sparse_f2c.vcproj", "{13082624-97F9-47DB-A9A1-AD7D6BF3856A}"
        ProjectSection(ProjectDependencies) = postProject
                {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -299,9 +322,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparse_f", "modules\sparse\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scilex", "modules\windows_tools\src\c\CScilex\CScilex.vcproj", "{9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77}"
        ProjectSection(ProjectDependencies) = postProject
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildHelp", "modules\helptools\src\BuildHelp.vcproj", "{BFE3C796-D755-4BB2-840A-89A98D2A4AC1}"
@@ -309,11 +332,12 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmex", "modules\mexlib\src\libmex\libmex.vcproj", "{0AEC8745-BB5B-4E66-A59A-7251412C3605}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -321,11 +345,12 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmx", "modules\mexlib\src\libmx\libmx.vcproj", "{CEF88C5F-6820-46D4-BCCD-44D5581481C5}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -333,11 +358,12 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmat", "modules\mexlib\src\libmat\libmat.vcproj", "{8A508625-C2AA-4295-AA76-16E4E456D13D}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -357,11 +383,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tclsci", "modules\tclsci\tc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "javasci", "modules\javasci\Javasci.vcproj", "{0BD503EF-5CB6-4277-BAC4-8955C97F247D}"
        ProjectSection(ProjectDependencies) = postProject
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
                {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604} = {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
                {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33} = {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -439,6 +465,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io_f", "modules\io\src\fortran\io_f2c.vcproj", "{C2EDD447-BB60-41A1-973B-8213FCA9ECD4}"
        ProjectSection(ProjectDependencies) = postProject
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -458,6 +485,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string", "modules\string\sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string_f", "modules\string\src\fortran\string_f2c.vcproj", "{FAF6A7EB-8A36-4278-B34E-34EA89E55304}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
@@ -511,13 +540,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacsd", "modules\cacsd\src\
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dcd", "modules\statistics\src\dcdflib\dcd_f\dcd_DLL_f2c.vcproj", "{18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dcd", "modules\statistics\src\dcdflib\dcd_f\dcd_f2c.vcproj", "{18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_algebra_f", "modules\linear_algebra\src\fortran\linear_algebra_f2c.vcproj", "{3735EFF9-925B-45B1-82CF-762658E69E70}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -525,7 +556,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_algebra", "modules\linear_algebra\src\c\linear_algebra.vcproj", "{BC462A57-C5B3-4F93-8067-80363827DCDA}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -564,7 +597,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double", "modules\double\sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double_f", "modules\double\src\fortran\double_f2c.vcproj", "{97B3664E-1186-400A-AEC0-AC3F23087689}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {BC462A57-C5B3-4F93-8067-80363827DCDA} = {BC462A57-C5B3-4F93-8067-80363827DCDA}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
@@ -580,6 +615,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean", "modules\boolean\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean_f", "modules\boolean\src\fortran\boolean_f2c.vcproj", "{45ECEB36-A12B-42F5-9D7A-216A0E70601D}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
@@ -588,6 +625,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interpolation", "modules\interpolation\src\c\interpolation.vcproj", "{22F14F8F-67C6-49B1-A730-CE70FFE9EB61}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {D98B0986-14E4-44FD-B006-CACE4B291F38} = {D98B0986-14E4-44FD-B006-CACE4B291F38}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
@@ -609,6 +647,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "data_structures_f", "module
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interpolation_f", "modules\interpolation\src\fortran\interpolation_f2c.vcproj", "{D98B0986-14E4-44FD-B006-CACE4B291F38}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -623,6 +662,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fftw", "modules\fftw\fftw.vcproj", "{13B86307-5A11-48D6-94BE-71F77BCB82D1}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {77154919-8A20-4F35-B7C7-6B3B957BDCA1} = {77154919-8A20-4F35-B7C7-6B3B957BDCA1}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
@@ -639,6 +679,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noscicos", "modules\scicos\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slatec_f", "modules\elementary_functions\src\fortran\slatec\slatec_f2c.vcproj", "{EAF0949C-28D2-497C-954F-FC13B32FF2F3}"
        ProjectSection(ProjectDependencies) = postProject
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -707,7 +748,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographics", "modules\graphics\src\nographics\nographics.vcproj", "{0AC1142C-0EFF-4406-9E5D-6111A7A8F614}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} = {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}
+               {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -898,6 +939,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_export-Ant", "modul
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_link_f", "modules\dynamic_link\src\fortran\dynamic_link_f2c.vcproj", "{9BC28602-73B4-4FBB-9583-478D2F047CA4}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -913,6 +956,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks", "modules\scicos_blocks\src\c\scicos_blocks.vcproj", "{70F677F1-B535-4D0F-A16F-5093B799A540}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
                {C781737A-7C97-4CF9-ACBC-F68C2BBF0FFA} = {C781737A-7C97-4CF9-ACBC-F68C2BBF0FFA}
@@ -926,6 +970,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks", "modules\sc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks_f", "modules\scicos_blocks\src\fortran\scicos_blocks_f2c.vcproj", "{2F7B6080-8D84-43A7-A967-13FC8AA83DEB}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
 EndProject
@@ -1012,6 +1058,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions", "modules\functi
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_f", "modules\functions\src\fortran\functions_f2c.vcproj", "{E6552427-01DD-4C12-823C-09AD46F77FAD}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
@@ -1044,7 +1092,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\sr
        ProjectSection(ProjectDependencies) = postProject
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
                {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
-               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
                {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
        EndProjectSection
 EndProject
@@ -1122,19 +1169,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-java-tests", "modules
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-java-tests", "modules\xcos\tests\java\xcos-JAVA-tests.vcproj", "{DABDF840-2A2F-4B38-90B2-A4393E6DF38B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-java-tests", "modules\hdf5\tests\java\hdf5-JAVA-tests.vcproj", "{78D46B73-ADD7-40CF-8436-B66897B18D9A}"
        ProjectSection(ProjectDependencies) = postProject
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
-               {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
-               {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D} = {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-java-tests", "modules\hdf5\tests\java\hdf5-JAVA-tests.vcproj", "{78D46B73-ADD7-40CF-8436-B66897B18D9A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-java-tests", "modules\xcos\tests\java\xcos-JAVA-tests.vcproj", "{DABDF840-2A2F-4B38-90B2-A4393E6DF38B}"
        ProjectSection(ProjectDependencies) = postProject
                {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
                {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
-               {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
+               {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D} = {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}
        EndProjectSection
 EndProject
 Global
@@ -1185,14 +1232,14 @@ Global
                {FE9EB721-B3C1-41D8-B585-3FB3A0083CEC}.Release|Win32.Build.0 = Release|Win32
                {FE9EB721-B3C1-41D8-B585-3FB3A0083CEC}.Release|x64.ActiveCfg = Release|x64
                {FE9EB721-B3C1-41D8-B585-3FB3A0083CEC}.Release|x64.Build.0 = Release|x64
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.ActiveCfg = Debug|Win32
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|Win32.Build.0 = Debug|Win32
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|x64.ActiveCfg = Debug|x64
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Debug|x64.Build.0 = Debug|x64
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.ActiveCfg = Release|Win32
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|Win32.Build.0 = Release|Win32
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|x64.ActiveCfg = Release|x64
-               {8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}.Release|x64.Build.0 = Release|x64
+               {64BC155E-292F-484F-9404-76EE6AE67A43}.Debug|Win32.ActiveCfg = Debug|Win32
+               {64BC155E-292F-484F-9404-76EE6AE67A43}.Debug|Win32.Build.0 = Debug|Win32
+               {64BC155E-292F-484F-9404-76EE6AE67A43}.Debug|x64.ActiveCfg = Debug|x64
+               {64BC155E-292F-484F-9404-76EE6AE67A43}.Debug|x64.Build.0 = Debug|x64
+               {64BC155E-292F-484F-9404-76EE6AE67A43}.Release|Win32.ActiveCfg = Release|Win32
+               {64BC155E-292F-484F-9404-76EE6AE67A43}.Release|Win32.Build.0 = Release|Win32
+               {64BC155E-292F-484F-9404-76EE6AE67A43}.Release|x64.ActiveCfg = Release|x64
+               {64BC155E-292F-484F-9404-76EE6AE67A43}.Release|x64.Build.0 = Release|x64
                {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}.Debug|Win32.ActiveCfg = Debug|Win32
                {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}.Debug|Win32.Build.0 = Debug|Win32
                {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}.Debug|x64.ActiveCfg = Debug|x64
@@ -2220,14 +2267,13 @@ Global
                {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|Win32.ActiveCfg = Debug|Win32
                {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|x64.ActiveCfg = Debug|x64
                {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.ActiveCfg = Release|Win32
-               {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.Build.0 = Release|Win32
                {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|x64.ActiveCfg = Release|x64
                {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|Win32.ActiveCfg = Debug|Win32
                {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Debug|x64.ActiveCfg = Debug|x64
                {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.ActiveCfg = Release|Win32
-               {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|Win32.Build.0 = Release|Win32
                {7CF15086-6DED-4F83-9C40-C4951FD373B3}.Release|x64.ActiveCfg = Release|x64
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|Win32.Build.0 = Debug|Win32
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|x64.ActiveCfg = Debug|x64
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Debug|x64.Build.0 = Debug|x64
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD}.Release|Win32.ActiveCfg = Release|Win32
@@ -2267,18 +2313,17 @@ Global
                {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.ActiveCfg = Release|x64
                {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.Build.0 = Release|x64
                {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Debug|Win32.ActiveCfg = Debug|Win32
-               {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Debug|Win32.Build.0 = Debug|Win32
                {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Debug|x64.ActiveCfg = Debug|x64
                {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Release|Win32.ActiveCfg = Release|Win32
                {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Release|x64.ActiveCfg = Release|x64
-               {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Debug|Win32.ActiveCfg = Debug|Win32
-               {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Debug|x64.ActiveCfg = Debug|x64
-               {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Release|Win32.ActiveCfg = Release|Win32
-               {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Release|x64.ActiveCfg = Release|x64
                {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Debug|Win32.ActiveCfg = Debug|Win32
                {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Debug|x64.ActiveCfg = Debug|x64
                {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Release|Win32.ActiveCfg = Release|Win32
                {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Release|x64.ActiveCfg = Release|x64
+               {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Debug|Win32.ActiveCfg = Debug|Win32
+               {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Debug|x64.ActiveCfg = Debug|x64
+               {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Release|Win32.ActiveCfg = Release|Win32
+               {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Release|x64.ActiveCfg = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 7c85e27..7b6272e 100644 (file)
@@ -35,8 +35,5 @@ LaunchScilab
 LaunchScilabLock
 ;
 ;
-; defined for expm (elementary functions)
-;
-dcoeff_
-;
-BuildWithVS8ExpressF2C
\ No newline at end of file
+BuildWithVS8ExpressF2C
+
index 51c8425..c442e68 100644 (file)
@@ -25,7 +25,6 @@
 #pragma comment(lib, "../../libs/core_f.lib")
 #pragma comment(lib, "../../libs/cacsd_f.lib")
 #pragma comment(lib, "../../libs/differential_equations_f.lib")
-#pragma comment(lib, "../../libs/elementary_functions_f.lib")
 #pragma comment(lib, "../../libs/data_structures_f.lib")
 #pragma comment(lib, "../../libs/special_functions_f.lib")
 /*-----------------------------------------------------------------------------------*/
index e6ecbd3..8ed6926 100644 (file)
@@ -8,8 +8,6 @@
 @del /Q data_structures_f.vcdef
 @del /Q differential_equations.vcdef
 @del /Q differential_equations_f.vcdef
-@del /Q elementary_functions.vcdef
-@del /Q elementary_functions_f.vcdef
 @del /Q sparse.vcdef
 @del /Q special_functions.vcdef
 @del /Q special_functions_f.vcdef
index ad09849..b356344 100644 (file)
@@ -17,28 +17,9 @@ mtlbc_
 errgst_
 cremat_
 isanan_
-idcmp_
-dset_
 indxg_
-unsfdcopy_
-mtran_
 cvname_
-dvmul_
-wvmul_
 setref_
-dmcopy_
 indxgc_
 isany_
-wwrdiv_
-dwrdiv_
-ddrdiv_
 putlhsvar_
-wdrdiv_
-wmmul_
-wscal_
-dadd_
-wwpow1_
-dwpow1_
-wdpow1_
-ddpow1_
-ddif_
index 92f5269..b466899 100644 (file)
@@ -19,7 +19,6 @@ stackc2i_
 cresmat2_
 stackr2d_
 stacki2d_
-unsfdcopy_
 objvide_
 interf_
 createvar_
@@ -35,5 +34,4 @@ checkval_
 gettype_
 setinterf_
 getsmat_
-iset_
 ref2val_
index f94b489..e339251 100644 (file)
@@ -4,6 +4,7 @@
 src/fortran/eispack/eispack_f.def
 src/fortran/linpack/linpack_f.def
 src/fortran/slatec/slatec_f.def
+src/fortran/elementary_functions_f.def
 
 #
 # F2C conversion
index d758fbc..5054ac5 100644 (file)
@@ -400,6 +400,7 @@ libscielementary_functions_la_CPPFLAGS =    -I$(srcdir)/includes/ \
 libscielementary_functions_la_CFLAGS=  -I$(srcdir)/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(srcdir)/src/c/ \
+-I$(top_srcdir)/modules/core/src/c/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
index 08a41db..e99d35d 100644 (file)
@@ -1157,6 +1157,7 @@ libscielementary_functions_la_CPPFLAGS = -I$(srcdir)/includes/ \
 libscielementary_functions_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(srcdir)/src/c/ \
+-I$(top_srcdir)/modules/core/src/c/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
index 8fada96..752c158 100644 (file)
@@ -22,6 +22,8 @@ Source: bin\slatec_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\linpack_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\linpack_f.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\eispack_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\elementary_functions_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\elementary_functions.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#ELEMFUNCTIONS}\VERSION.xml; DestDir: {app}\modules\{#ELEMFUNCTIONS}; Components: {#COMPN_SCILAB}
 Source: modules\{#ELEMFUNCTIONS}\readme.txt; DestDir: {app}\modules\{#ELEMFUNCTIONS}; Components: {#COMPN_SCILAB}
index 3574965..7b360cb 100644 (file)
@@ -22,7 +22,7 @@ typedef struct {
        int ndng;
 } DCOEFF_struct;
 
-DCOEFF_struct C2F(dcoeff);
+__declspec(dllexport) DCOEFF_struct C2F(dcoeff);
 
 #endif
 
diff --git a/scilab/modules/elementary_functions/src/c/DllmainElementary_functions.c b/scilab/modules/elementary_functions/src/c/DllmainElementary_functions.c
new file mode 100644 (file)
index 0000000..2342e0b
--- /dev/null
@@ -0,0 +1,34 @@
+
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet@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
+ *
+ */
+
+#include <windows.h> 
+/*--------------------------------------------------------------------------*/ 
+#pragma comment(lib,"../../../../bin/libintl.lib")
+/*--------------------------------------------------------------------------*/ 
+int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
+{
+  switch (reason) 
+    {
+    case DLL_PROCESS_ATTACH:
+      break;
+    case DLL_PROCESS_DETACH:
+      break;
+    case DLL_THREAD_ATTACH:
+      break;
+    case DLL_THREAD_DETACH:
+      break;
+    }
+  return 1;
+}
+/*--------------------------------------------------------------------------*/ 
+
index 51c1913..ab0e48c 100644 (file)
 
 #include "IsEqualVar.h"
 #include "Scierror.h"
+#include "BOOL.h"
+#include "parse.h"
+
+/* Scilab parser recursion data and functions*/
+static int *Ids     = NULL;
+static int *Rstk    = NULL;
+static int *Pstk    = NULL;
+#define Pt (C2F(recu).pt)
+
+static void initStackParameters(void)
+{
+    Ids     = C2F(recu).ids - nsiz - 1;
+    Rstk    = C2F(recu).rstk - 1;
+    Pstk    = C2F(recu).pstk - 1;
+}
 
 /**intisequalvar
- * Gateway for isequalbitwise and isequal builtins
- * @param char * fname: the Scilab code of the function name
- * @param int * job: if *job==0 the floating point numbers are compared bitwize ,
- *      if *job==1 the comparison is made numerically,
- *      so NaN elements are not equal
- *      elements of with differents data types are raised to the upper types before comparison (to be done)
- * @return 0 in any cases
- * @author Serge Steer
- * @see isequal
- */
+* Gateway for isequalbitwise and isequal builtins
+* @param char * fname: the Scilab code of the function name
+* @param int * job: if *job==0 the floating point numbers are compared bitwize ,
+*      if *job==1 the comparison is made numerically,
+*      so NaN elements are not equal
+*      elements of with differents data types are raised to the upper types before comparison (to be done)
+* @return 0 in any cases
+* @author Serge Steer
+* @see isequal
+*/
 
 int C2F(intisequalvar)(char * fname, int *job, long int fl)
 {
-  int topk, top1, srhs, k,kmin, l;
-  int res = 42; /* Bruno : @TODO initialisation !!! */
-  int one = 1;
-  int l1,lk, il1,ilk;
-  int n1,nk; //memory size used by the variable, only used for overloaded comparison
-
-  /*DEBUG_OVERLOADING("entering intisequal Top=%d, Rhs=%d, Rstk[pt]=%d\n",Top,Rhs,Rstk[Pt]);*/
-
-
-  SetDoubleCompMode(*job); /* floating point numbers are compared bitwize */
-  if (Rstk[Pt]==914||Rstk[Pt]==915) { /* coming back after evaluation of overloading function */
-    /*DEBUG_OVERLOADING("intisequal called back by the parser Top=%d, Rhs=%d, Pt=%d\n",Top,Rhs,Pt);*/
-
-    /* Restore context */
-    kmin = Ids[1 + Pt * nsiz];
-    srhs = Ids[2 + Pt * nsiz];
-    topk = Ids[3 + Pt * nsiz];
-    top1 = Top-1-srhs+1;/* Top-1 because Top has been increased to store the result of overloading function */
-  }
-  else {
-    CheckRhs(2,2000000);
-    CheckLhs(1,1);
-    srhs = Rhs;
-    top1 = Top-srhs+1;
-    topk = top1 + 1;
-    kmin = 2;
-    MaxRec = 0;
-    Rrec = NULL;
-  }
-
-  l1 = *Lstk(top1);il1 = iadr(l1);
-  n1 = *Lstk(top1+1)-l1;
-  if (*istk(il1) < 0) {
-    l1 = *istk(il1+1);
-    n1 = *istk(il1+3);
-  }
-  for (k = kmin; k <= srhs; k++) {
-
-    lk = *Lstk(topk);ilk=iadr(lk);
-    nk = *Lstk(topk+1)-lk;
-    if (*istk(ilk) < 0) {
-      lk= *istk(ilk+1);
-      nk = *istk(ilk+3);
-    }
+    int topk, top1, srhs, k,kmin, l;
+    int res = 42; /* Bruno : @TODO initialisation !!! */
+    int one = 1;
+    int l1,lk, il1,ilk;
+    int n1,nk; //memory size used by the variable, only used for overloaded comparison
 
-    res = IsEqualVar(stk(l1),n1,stk(lk),nk);
-    if (res==-1) { /* overloading function evaluation required */
-      /* save context */
-      Ids[1 + Pt * nsiz] = k;
-      Ids[2 + Pt * nsiz] = srhs;
-      Ids[3 + Pt * nsiz] = topk;
-      return 0;
+    initStackParameters();
+
+    /*DEBUG_OVERLOADING("entering intisequal Top=%d, Rhs=%d, Rstk[pt]=%d\n",Top,Rhs,Rstk[Pt]);*/
+
+
+    SetDoubleCompMode(*job); /* floating point numbers are compared bitwize */
+    if (Rstk[Pt]==914||Rstk[Pt]==915) { /* coming back after evaluation of overloading function */
+        /*DEBUG_OVERLOADING("intisequal called back by the parser Top=%d, Rhs=%d, Pt=%d\n",Top,Rhs,Pt);*/
+
+        /* Restore context */
+        kmin = Ids[1 + Pt * nsiz];
+        srhs = Ids[2 + Pt * nsiz];
+        topk = Ids[3 + Pt * nsiz];
+        top1 = Top-1-srhs+1;/* Top-1 because Top has been increased to store the result of overloading function */
     }
-    else if (res == -2) {/* Memory allocation failed */
-      SciError(112);
-      FreeRec();
-      return 0;
+    else {
+        CheckRhs(2,2000000);
+        CheckLhs(1,1);
+        srhs = Rhs;
+        top1 = Top-srhs+1;
+        topk = top1 + 1;
+        kmin = 2;
+        MaxRec = 0;
+        Rrec = NULL;
     }
-    /*DEBUG_OVERLOADING("k=%d, res=%d\n", k,res);*/
-
-    if (res == 0) {
-      /* goto END; */
-      Top = top1;
-      C2F(crebmat)(fname, &top1, &one, &one, &l, (unsigned long)strlen(fname));
-      *istk(l)=res;
-      FreeRec();
 
-      return 0;
+    l1 = *Lstk(top1);il1 = iadr(l1);
+    n1 = *Lstk(top1+1)-l1;
+    if (*istk(il1) < 0) {
+        l1 = *istk(il1+1);
+        n1 = *istk(il1+3);
+    }
+    for (k = kmin; k <= srhs; k++) {
+
+        lk = *Lstk(topk);ilk=iadr(lk);
+        nk = *Lstk(topk+1)-lk;
+        if (*istk(ilk) < 0) {
+            lk= *istk(ilk+1);
+            nk = *istk(ilk+3);
+        }
+
+        res = IsEqualVar(stk(l1),n1,stk(lk),nk);
+        if (res==-1) { /* overloading function evaluation required */
+            /* save context */
+            Ids[1 + Pt * nsiz] = k;
+            Ids[2 + Pt * nsiz] = srhs;
+            Ids[3 + Pt * nsiz] = topk;
+            return 0;
+        }
+        else if (res == -2) {/* Memory allocation failed */
+            SciError(112);
+            FreeRec();
+            return 0;
+        }
+        /*DEBUG_OVERLOADING("k=%d, res=%d\n", k,res);*/
+
+        if (res == 0) {
+            /* goto END; */
+            Top = top1;
+            C2F(crebmat)(fname, &top1, &one, &one, &l, (unsigned long)strlen(fname));
+            *istk(l)=res;
+            FreeRec();
+
+            return 0;
+        }
+        topk++;
     }
-    topk++;
-  }
 
 
-  /* END:*/
-  Top = top1;
-  C2F(crebmat)(fname, &top1, &one, &one, &l, (unsigned long)strlen(fname));
-  *istk(l)=res;
-  FreeRec();
+    /* END:*/
+    Top = top1;
+    C2F(crebmat)(fname, &top1, &one, &one, &l, (unsigned long)strlen(fname));
+    *istk(l)=res;
+    FreeRec();
 
-  return 0;
+    return 0;
 }
 
 /**IsEqualOverloaded
- * Used to call the overloading function when testing unknown data type  for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param int n1: memory size used by the first variable, only used for overloading
- * @param double *d2: pointer on the beginning of the first variable structure
- * @param int n2: memory size used by the second variable, only used for overloading
- * @return 0 is the variables differ and 1 if they are identical, -1 for recursion purpose
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to call the overloading function when testing unknown data type  for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param int n1: memory size used by the first variable, only used for overloading
+* @param double *d2: pointer on the beginning of the first variable structure
+* @param int n2: memory size used by the second variable, only used for overloading
+* @return 0 is the variables differ and 1 if they are identical, -1 for recursion purpose
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualOverloaded(double *d1, int n1, double *d2, int n2)
 {
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
-  int il,lw;
-  int l1,l2;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
+    int il,lw;
+    int l1,l2;
+
+    initStackParameters();
+
+    if (Rstk[Pt]==914||Rstk[Pt]==915) { /* coming back after evaluation of overloading function */
+        /* Get the computed value */
+        il = iadr(*Lstk(Top));
+        Top--;
+        Pt--;
+        return  *istk(il+3);
+    }
+
+    /* Prepare stack for calling overloading function */
+    /* put references to d1 and d2 variable at the top of the stack */
+    l1=*Lstk(1) + (int)(d1-stk(*Lstk(1)));/*compute index in stk from absolute adress value */
+    l2=*Lstk(1) + (int)(d2-stk(*Lstk(1)));/*compute index in stk from absolute adress value */
+
+    Top = Top+1;
 
-  if (Rstk[Pt]==914||Rstk[Pt]==915) { /* coming back after evaluation of overloading function */
-    /* Get the computed value */
     il = iadr(*Lstk(Top));
-    Top--;
-    Pt--;
-    return  *istk(il+3);
-  }
-
-  /* Prepare stack for calling overloading function */
-  /* put references to d1 and d2 variable at the top of the stack */
-  l1=*Lstk(1) + (int)(d1-stk(*Lstk(1)));/*compute index in stk from absolute adress value */
-  l2=*Lstk(1) + (int)(d2-stk(*Lstk(1)));/*compute index in stk from absolute adress value */
-
-  Top = Top+1;
-
-  il = iadr(*Lstk(Top));
-  *istk(il) = -id1[0];
-  *istk(il+1)= l1; /* index othe first element of the variable in stk */
-  *istk(il+2) = 0; /* variable number unknown */
-  *istk(il+3) = n1; /* variable memory size  */
-  *Lstk(Top+1) = *Lstk(Top)+2;
-
-  Top = Top+1;
-  il = iadr(*Lstk(Top));
-  *istk(il)=-id2[0];
-  *istk(il+1)= l2;  /* index othe first element of the variable in stk */
-  *istk(il+2)=0; /*variable number unknown */
-  *istk(il+3)=n2; /*variable memory size */
-  *Lstk(Top+1)=*Lstk(Top)+2;
-
-  Ptover(1);
-  Rhs = 2;
-  lw = Top - 1;
-
-  if( GetDoubleCompMode()==0) {
-    C2F(overload)(&lw,"isequalbitwise",14L);
-    Rstk[Pt]=914;
-  }
-  else {
-    C2F(overload)(&lw,"isequal",7L);
-    Rstk[Pt]=915;
-  }
-
-  /*DEBUG_OVERLOADING("IsEqualVar Overloaded calls the parser Top=%d, Rhs=%d, Pt=%d\n",Top,Rhs,Pt);*/
-
-  return -1;
+    *istk(il) = -id1[0];
+    *istk(il+1)= l1; /* index othe first element of the variable in stk */
+    *istk(il+2) = 0; /* variable number unknown */
+    *istk(il+3) = n1; /* variable memory size  */
+    *Lstk(Top+1) = *Lstk(Top)+2;
+
+    Top = Top+1;
+    il = iadr(*Lstk(Top));
+    *istk(il)=-id2[0];
+    *istk(il+1)= l2;  /* index othe first element of the variable in stk */
+    *istk(il+2)=0; /*variable number unknown */
+    *istk(il+3)=n2; /*variable memory size */
+    *Lstk(Top+1)=*Lstk(Top)+2;
+
+    Ptover(1);
+    Rhs = 2;
+    lw = Top - 1;
+
+    if( GetDoubleCompMode()==0) {
+        C2F(overload)(&lw,"isequalbitwise",14L);
+        Rstk[Pt]=914;
+    }
+    else {
+        C2F(overload)(&lw,"isequal",7L);
+        Rstk[Pt]=915;
+    }
+
+    /*DEBUG_OVERLOADING("IsEqualVar Overloaded calls the parser Top=%d, Rhs=%d, Pt=%d\n",Top,Rhs,Pt);*/
+
+    return -1;
 }
 
 /**IsEqualVar
- * Driver used to test a couple of Scilab variable for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param int n1: memory size used by the first variable, only used for overloading
- * @param double *d2: pointer on the beginning of the first variable structure
- * @param int n2: memory size used by the second variable, only used for overloading
- * @return 0 is the variables differ and 1 if they are identical, -1 for recursion purpose, -2 for allocatopn problem
- * @author Serge Steer
- * @see intisequal
- */
+* Driver used to test a couple of Scilab variable for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param int n1: memory size used by the first variable, only used for overloading
+* @param double *d2: pointer on the beginning of the first variable structure
+* @param int n2: memory size used by the second variable, only used for overloading
+* @return 0 is the variables differ and 1 if they are identical, -1 for recursion purpose, -2 for allocatopn problem
+* @author Serge Steer
+* @see intisequal
+*/
 int IsEqualVar(double *d1, int n1, double *d2, int n2)
 {
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
-  int res;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
+    int res;
 
-  /*DEBUG_BASE("IsEqualVar %d %d\n",id1[0],id2[0]);*/
+    /*DEBUG_BASE("IsEqualVar %d %d\n",id1[0],id2[0]);*/
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  switch (id1[0]) {
+    switch (id1[0]) {
   case 0: /* null */
-    return 1;
+      return 1;
   case sci_matrix: /* matrix of double precision floating point numbers */
-    if ( !IsEqualDoubleMat(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualDoubleMat(d1, d2) )  return 0;
+      break;
   case sci_poly:/* matrix of polynomials */
-    if ( !IsEqualPolyMat(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualPolyMat(d1, d2) )  return 0;
+      break;
   case sci_boolean:/* matrix of booleans */
-    if ( !IsEqualBoolMat(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualBoolMat(d1, d2) )  return 0;
+      break;
   case sci_sparse:/* sparse matrix of double */
-    if ( !IsEqualDoubleSparseMat(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualDoubleSparseMat(d1, d2) )  return 0;
+      break;
   case sci_boolean_sparse:/* sparse matrix of booleans */
-    if ( !IsEqualBoolSparseMat(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualBoolSparseMat(d1, d2) )  return 0;
+      break;
   case sci_matlab_sparse:/* matlab sparse matrix  */
-    if ( !IsEqualMatlabSparseMat(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualMatlabSparseMat(d1, d2) )  return 0;
+      break;
   case sci_ints : /* matrix of short integers */
-    if ( !IsEqualIntegerMat(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualIntegerMat(d1, d2) )  return 0;
+      break;
   case sci_handles : /* matrix of graphic handles */
-    if ( !IsEqualDoubleMat(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualDoubleMat(d1, d2) )  return 0;
+      break;
   case sci_strings:/* matrix of strings */
-    if ( !IsEqualStringMat(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualStringMat(d1, d2) )  return 0;
+      break;
   case sci_u_function:/* Uncompiled function */
   case sci_c_function:/* compiled function */
-    if ( !IsEqualFunction(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualFunction(d1, d2) )  return 0;
+      break;
   case sci_lib:/* library */
-    if ( !IsEqualLib(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualLib(d1, d2) )  return 0;
+      break;
   case sci_list: /* list */
   case sci_tlist: /* tlist */
   case sci_mlist: /* mlist */
-    res = IsEqualList(d1, d2);
-    if ( !res )  return 0;
-    if (res < 0) return res;
-    break;
+      res = IsEqualList(d1, d2);
+      if ( !res )  return 0;
+      if (res < 0) return res;
+      break;
   case sci_lufact_pointer: /* lufact pointer */
-    if ( !IsEqualLUPtr(d1, d2) )  return 0;
-    break;
+      if ( !IsEqualLUPtr(d1, d2) )  return 0;
+      break;
   default :
-    res = IsEqualOverloaded(d1, n1, d2, n2);
-    if ( !res )  return 0;
-    if (res == -1) return -1;
-  }
+      res = IsEqualOverloaded(d1, n1, d2, n2);
+      if ( !res )  return 0;
+      if (res == -1) return -1;
+    }
 
-  return 1;
+    return 1;
 }
 
 
 /**IsEqualList
- * Used to test a couple of Scilab variable of type list, tlist or mlist for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical, -1 for recursion purpose, -2 for allocatopn problem
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type list, tlist or mlist for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical, -1 for recursion purpose, -2 for allocatopn problem
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualList(double *d1, double *d2)
 {
-  /* This code does not use simple recursion, because of possible need of
-   * call to Scilab for evaluation of overloading function
-   * The redusion is emulated using the Rrec data structure to memorize the path
-   * to the current element.
-   */
-  int l,k,res,nelt;
-  int *id1, *id2;
-  int *ip1, *ip2;
-  double *p1, *p2;
-  int krec;
-
-  if (Rstk[Pt]==914||Rstk[Pt]==915) { /* coming back after evaluation of overloading function */
-    /* Restore context */
-    krec = Pstk[Pt];
-    MaxRec = Ids[4 + Pt * nsiz] ;
-    memcpy(&Rrec,&(Ids[5 + Pt * nsiz]),sizeof(RecursionRecordPtr)); /* recover Rrec pointer */
-    k = Rrec[krec].k;
-    d1 = Rrec[krec].d1;     /* pointer on the sub-level list 1*/
-    d2 = Rrec[krec].d2;     /* pointer on the sub-level list 2*/
+    /* This code does not use simple recursion, because of possible need of
+    * call to Scilab for evaluation of overloading function
+    * The redusion is emulated using the Rrec data structure to memorize the path
+    * to the current element.
+    */
+    int l,k,res,nelt;
+    int *id1, *id2;
+    int *ip1, *ip2;
+    double *p1, *p2;
+    int krec;
+
+    initStackParameters();
+
+    if (Rstk[Pt]==914||Rstk[Pt]==915) { /* coming back after evaluation of overloading function */
+        /* Restore context */
+        krec = Pstk[Pt];
+        MaxRec = Ids[4 + Pt * nsiz] ;
+        memcpy(&Rrec,&(Ids[5 + Pt * nsiz]),sizeof(RecursionRecordPtr)); /* recover Rrec pointer */
+        k = Rrec[krec].k;
+        d1 = Rrec[krec].d1;     /* pointer on the sub-level list 1*/
+        d2 = Rrec[krec].d2;     /* pointer on the sub-level list 2*/
+        id1 = (int *) d1;
+        id2 = (int *) d2;
+        nelt = id1[1];
+        goto SETLEVEL;
+    }
+    else { /* regular entry */
+        krec = 0;
+
+    }
+
+STARTLEVEL:
+    /* the objects pointed to by d1 and d2 are lists */
+    /* set current level context */
+    if (AllocRecIfRequired(krec)==-2) return -2;
+
+    Rrec[krec].d1 = d1;
+    Rrec[krec].d2 = d2;
+    Rrec[krec].k  = 0;
+
+    /* check the type */
     id1 = (int *) d1;
     id2 = (int *) d2;
+    if ((id1[0] != id2[0])) return 0;
+    /* check the number of elements */
+    if (id1[1] != id2[1]) return 0;
     nelt = id1[1];
-    goto SETLEVEL;
-  }
-  else { /* regular entry */
-    krec = 0;
-
-  }
-
- STARTLEVEL:
-  /* the objects pointed to by d1 and d2 are lists */
-  /* set current level context */
-  if (AllocRecIfRequired(krec)==-2) return -2;
-
-  Rrec[krec].d1 = d1;
-  Rrec[krec].d2 = d2;
-  Rrec[krec].k  = 0;
-
-  /* check the type */
-  id1 = (int *) d1;
-  id2 = (int *) d2;
-  if ((id1[0] != id2[0])) return 0;
-  /* check the number of elements */
-  if (id1[1] != id2[1]) return 0;
-  nelt = id1[1];
-
-  /* check the array of "pointers" on list elements*/
-  if (!IsEqualIntegerArray(nelt+1, id1+2, id2+2)) return 0;
-
-  /*DEBUG_LIST("STARTLEVEL nelt=%d\n",nelt);*/
-
-  k = 0;
- SETLEVEL:
-  /* check the list elements */
-  ip1=id1+2;
-  ip2=id2+2;
-
-  l = (nelt + 4)/2; /* the beginning of first field in the double array */
-  p1=d1+l;
-  p2=d2+l;
-
- ELEMENT:
-  if (k >= nelt) { /* no more element to compare */
-    if (krec > 0 ) { /* end of a sub-level */
-      /* restore upper level context*/
-      krec--;
-      /*DEBUG_LIST("Sublist ELEMENT  index=%d finished, previous restored from krec=%d\n",k+1,krec);*/
-
-      d1 = Rrec[krec].d1;
-      d2 = Rrec[krec].d2;
-      k =  Rrec[krec].k+1;
-      /* rebuild pointers */
-      id1 = (int *) d1;
-      id2 = (int *) d2;
-      nelt = id1[1];
-      /*DEBUG_LIST("back to lower level nelt=%d  index=%d krec=%d\n",nelt,k+1,krec);*/
-
-      goto  SETLEVEL;
+
+    /* check the array of "pointers" on list elements*/
+    if (!IsEqualIntegerArray(nelt+1, id1+2, id2+2)) return 0;
+
+    /*DEBUG_LIST("STARTLEVEL nelt=%d\n",nelt);*/
+
+    k = 0;
+SETLEVEL:
+    /* check the list elements */
+    ip1=id1+2;
+    ip2=id2+2;
+
+    l = (nelt + 4)/2; /* the beginning of first field in the double array */
+    p1=d1+l;
+    p2=d2+l;
+
+ELEMENT:
+    if (k >= nelt) { /* no more element to compare */
+        if (krec > 0 ) { /* end of a sub-level */
+            /* restore upper level context*/
+            krec--;
+            /*DEBUG_LIST("Sublist ELEMENT  index=%d finished, previous restored from krec=%d\n",k+1,krec);*/
+
+            d1 = Rrec[krec].d1;
+            d2 = Rrec[krec].d2;
+            k =  Rrec[krec].k+1;
+            /* rebuild pointers */
+            id1 = (int *) d1;
+            id2 = (int *) d2;
+            nelt = id1[1];
+            /*DEBUG_LIST("back to lower level nelt=%d  index=%d krec=%d\n",nelt,k+1,krec);*/
+
+            goto  SETLEVEL;
+        }
+        else /* end of main level */
+            return 1;
     }
-    else /* end of main level */
-      return 1;
-  }
-  /* compare next element */
-  if (ip1[k]==ip1[k+1]) {/* undefined element nothing to check */
-    k++;
-    goto ELEMENT;
-  }
-  d1 = p1+ip1[k]-1;
-  d2 = p2+ip2[k]-1;
-  id1=(int *)d1;
-  id2=(int *)d2;
-
-  if (id1[0]!=15 && id1[0]!=16&& id1[0]!=17) { /* elements which are not lists */
-    res = IsEqualVar(d1, ip1[k+1]-ip1[k], d2, ip2[k+1]-ip2[k]);
-    /*DEBUG_LIST("Regular ELEMENT  index=%d res=%d\n",k+1,res);*/
-    if (!res) return 0;
-    if (res == -1) { /*overloading function evaluation required */
-      /* preserve context */
-      Pstk[Pt] = krec;
-      Ids[4 + Pt * nsiz] = MaxRec;
-      /* Store Rrec pointer into Ids[5 + Pt * nsiz] and Ids[6 + Pt * nsiz] */
-      memcpy(&(Ids[5 + Pt * nsiz]),&Rrec,sizeof(RecursionRecordPtr));
-      return -1;
+    /* compare next element */
+    if (ip1[k]==ip1[k+1]) {/* undefined element nothing to check */
+        k++;
+        goto ELEMENT;
     }
-    k++;
-    goto ELEMENT;
+    d1 = p1+ip1[k]-1;
+    d2 = p2+ip2[k]-1;
+    id1=(int *)d1;
+    id2=(int *)d2;
+
+    if (id1[0]!=15 && id1[0]!=16&& id1[0]!=17) { /* elements which are not lists */
+        res = IsEqualVar(d1, ip1[k+1]-ip1[k], d2, ip2[k+1]-ip2[k]);
+        /*DEBUG_LIST("Regular ELEMENT  index=%d res=%d\n",k+1,res);*/
+        if (!res) return 0;
+        if (res == -1) { /*overloading function evaluation required */
+            /* preserve context */
+            Pstk[Pt] = krec;
+            Ids[4 + Pt * nsiz] = MaxRec;
+            /* Store Rrec pointer into Ids[5 + Pt * nsiz] and Ids[6 + Pt * nsiz] */
+            memcpy(&(Ids[5 + Pt * nsiz]),&Rrec,sizeof(RecursionRecordPtr));
+            return -1;
+        }
+        k++;
+        goto ELEMENT;
 
-  }
-  else { /* sub list found*/
-    /*DEBUG_LIST("Sublist ELEMENT  index=%d started, previous stored in krec=%d\n",k+1,krec);*/
+    }
+    else { /* sub list found*/
+        /*DEBUG_LIST("Sublist ELEMENT  index=%d started, previous stored in krec=%d\n",k+1,krec);*/
 
-    Rrec[krec].k  = k;
-    krec++;
+        Rrec[krec].k  = k;
+        krec++;
 
-    goto STARTLEVEL;
-  }
+        goto STARTLEVEL;
+    }
 }
 
 
 /**IsEqualLib
- * Used to test a couple of Scilab variable of type library (14) for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type library (14) for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualLib(double *d1, double *d2)
 {
-  int n,l;
-  int nclas=29;
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
+    int n,l;
+    int nclas=29;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  /* Check the path length */
-  if (id1[1] != id2[1]) return 0;
+    /* Check the path length */
+    if (id1[1] != id2[1]) return 0;
 
-  /* Check the path" */
-  n = id1[1];
-  if (!IsEqualIntegerArray(n, id1+2, id2+2)) return 0;
-  l = n+2;
+    /* Check the path" */
+    n = id1[1];
+    if (!IsEqualIntegerArray(n, id1+2, id2+2)) return 0;
+    l = n+2;
 
-  /* Check the number of names */
-  if (id1[l] != id2[l]) return 0;
-  n = id1[l];l++;
+    /* Check the number of names */
+    if (id1[l] != id2[l]) return 0;
+    n = id1[l];l++;
 
-  /* check the table */
-  if (!IsEqualIntegerArray(nclas, id1+l, id2+l)) return 0;
-  l += nclas;
-  /* Check the sequence of names */
-  if (!IsEqualIntegerArray(n*nsiz, id1+l, id2+l)) return 0;
+    /* check the table */
+    if (!IsEqualIntegerArray(nclas, id1+l, id2+l)) return 0;
+    l += nclas;
+    /* Check the sequence of names */
+    if (!IsEqualIntegerArray(n*nsiz, id1+l, id2+l)) return 0;
 
-  return 1;
+    return 1;
 }
 
 /**IsEqualDoubleMat
- * Used to test a couple of Scilab variable of type 1 (matrix of floating point numbers)
- * or 9 (graphic handles) for equality*
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type 1 (matrix of floating point numbers)
+* or 9 (graphic handles) for equality*
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualDoubleMat(double *d1, double *d2)
 {
-  int n;
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
+    int n;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  /* Check the number of rows */
-  if (id1[1] != id2[1]) return 0;
+    /* Check the number of rows */
+    if (id1[1] != id2[1]) return 0;
 
-  /* Check the number of columns */
-  if (id1[2] != id2[2]) return 0;
+    /* Check the number of columns */
+    if (id1[2] != id2[2]) return 0;
 
-  /* Check the real/complex flag */
-  if (id1[3] != id2[3]) return 0;
+    /* Check the real/complex flag */
+    if (id1[3] != id2[3]) return 0;
 
 
-  n = id1[1]*id1[2]*(id1[3]+1); /* number of double precision floating point numbers */
-  /* check the array of numbers */
-  if (!IsEqualDoubleArray(n, d1+2, d2+2)) return 0;
+    n = id1[1]*id1[2]*(id1[3]+1); /* number of double precision floating point numbers */
+    /* check the array of numbers */
+    if (!IsEqualDoubleArray(n, d1+2, d2+2)) return 0;
 
-  return 1;
+    return 1;
 }
 /**IsEqualIntegerMat
- * Used to test a couple of Scilab variable of type 8 (int)  for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type 8 (int)  for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualIntegerMat(double *d1, double *d2)
 {
-  int n;
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
+    int n;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  /* Check the number of rows */
-  if (id1[1] != id2[1]) return 0;
+    /* Check the number of rows */
+    if (id1[1] != id2[1]) return 0;
 
-  /* Check the number of columns */
-  if (id1[2] != id2[2]) return 0;
+    /* Check the number of columns */
+    if (id1[2] != id2[2]) return 0;
 
-  /* Check the subtype */
-  if (id1[3] != id2[3]) return 0;
+    /* Check the subtype */
+    if (id1[3] != id2[3]) return 0;
 
 
-  n = id1[1]*id1[2]; /* number of double precision floating point numbers */
-  /* check the array of numbers */
-  if (!IsEqualShortIntegerArray(id1[3], n, id1+4, id2+4)) return 0;
+    n = id1[1]*id1[2]; /* number of double precision floating point numbers */
+    /* check the array of numbers */
+    if (!IsEqualShortIntegerArray(id1[3], n, id1+4, id2+4)) return 0;
 
-  return 1;
+    return 1;
 }
 
 /**IsEqualBoolMat
- * Used to test a couple of Scilab variable of type 4 (boolean) for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type 4 (boolean) for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualBoolMat(double *d1, double *d2)
 {
-  int n;
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
+    int n;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  /* Check the number of rows */
-  if (id1[1] != id2[1]) return 0;
+    /* Check the number of rows */
+    if (id1[1] != id2[1]) return 0;
 
-  /* Check the number of columns */
-  if (id1[2] != id2[2]) return 0;
+    /* Check the number of columns */
+    if (id1[2] != id2[2]) return 0;
 
-  /* Check the data */
-  n = id1[1]*id1[2]; /* number of double precision floating point numbers */
-  /* check the array of numbers */
-  if (!IsEqualIntegerArray(n, id1+3, id2+3)) return 0;
-  return 1;
+    /* Check the data */
+    n = id1[1]*id1[2]; /* number of double precision floating point numbers */
+    /* check the array of numbers */
+    if (!IsEqualIntegerArray(n, id1+3, id2+3)) return 0;
+    return 1;
 }
 /**IsEqualStringMat
- * Used to test a couple of Scilab variable of type 10 (string) for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type 10 (string) for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualStringMat(double *d1, double *d2)
 {
-  int n;
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
+    int n;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  /* Check the number of rows */
-  if (id1[1] != id2[1]) return 0;
+    /* Check the number of rows */
+    if (id1[1] != id2[1]) return 0;
 
-  /* Check the number of columns */
-  if (id1[2] != id2[2]) return 0;
+    /* Check the number of columns */
+    if (id1[2] != id2[2]) return 0;
 
-  /* Check the array of "pointers" */
-  n = id1[1]*id1[2];
-  if ( !IsEqualIntegerArray(n+1, id1+4, id2+4) ) return 0;
+    /* Check the array of "pointers" */
+    n = id1[1]*id1[2];
+    if ( !IsEqualIntegerArray(n+1, id1+4, id2+4) ) return 0;
 
-  /* Check the array of character codes (int)  */
-  if (!IsEqualIntegerArray(id1[4+n]-1, id1+5+n, id2+5+n)) return 0;
-  return 1;
+    /* Check the array of character codes (int)  */
+    if (!IsEqualIntegerArray(id1[4+n]-1, id1+5+n, id2+5+n)) return 0;
+    return 1;
 }
 
 
 /**IsEqualPolyMat
- * Used to test a couple of Scilab variable of type 2 (matrix of polynomials) for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type 2 (matrix of polynomials) for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualPolyMat(double *d1, double *d2)
 {
-  int l,n;
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
+    int l,n;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  /* Check the number of rows */
-  if (id1[1] != id2[1]) return 0;
+    /* Check the number of rows */
+    if (id1[1] != id2[1]) return 0;
 
-  /* Check the number of columns */
-  if (id1[2] != id2[2]) return 0;
+    /* Check the number of columns */
+    if (id1[2] != id2[2]) return 0;
 
-  /* Check the real/complex flag */
-  if (id1[3] != id2[3]) return 0;
-  /* Check the formal variable name */
-  if ( !IsEqualIntegerArray(4, id1+4, id2+4) ) return 0;
+    /* Check the real/complex flag */
+    if (id1[3] != id2[3]) return 0;
+    /* Check the formal variable name */
+    if ( !IsEqualIntegerArray(4, id1+4, id2+4) ) return 0;
 
 
-  /* Check the array of "pointers" */
-  n = id1[1]*id1[2];
-  if ( !IsEqualIntegerArray(n, id1+8, id2+8) ) return 0;
+    /* Check the array of "pointers" */
+    n = id1[1]*id1[2];
+    if ( !IsEqualIntegerArray(n, id1+8, id2+8) ) return 0;
 
-  /* Check the array of double precision numbers */
-  l = (n + 10)/2;/* the beginning of first field in th double array */
+    /* Check the array of double precision numbers */
+    l = (n + 10)/2;/* the beginning of first field in th double array */
 
-  /* check the array of numbers */
-  if ( !IsEqualDoubleArray(id1[8+n]-1, d1+l, d2+l) ) return 0;
+    /* check the array of numbers */
+    if ( !IsEqualDoubleArray(id1[8+n]-1, d1+l, d2+l) ) return 0;
 
-  return 1;
+    return 1;
 }
 
 /**IsEqualDoubleSparseMat
- * Used to test a couple of Scilab variable of type 5 (sparse matrix) for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type 5 (sparse matrix) for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualDoubleSparseMat(double *d1, double *d2) /* a faire */
 {
-  int l,nel;
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
+    int l,nel;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  /* Check the number of rows */
-  if (id1[1] != id2[1]) return 0;
+    /* Check the number of rows */
+    if (id1[1] != id2[1]) return 0;
 
-  /* Check the number of columns */
-  if (id1[2] != id2[2]) return 0;
+    /* Check the number of columns */
+    if (id1[2] != id2[2]) return 0;
 
-  /* Check the real/complex flag */
-  if (id1[3] != id2[3]) return 0;
+    /* Check the real/complex flag */
+    if (id1[3] != id2[3]) return 0;
 
-  /* Check the number of non zero elements */
-  if (id1[4] != id2[4]) return 0;
-  nel = id1[4];
-  l = 5;
-  /* Check the array of number of non zero element per row */
-  if ( !IsEqualIntegerArray(id1[1], id1+l, id2+l) ) return 0;
-  l += id1[1];
+    /* Check the number of non zero elements */
+    if (id1[4] != id2[4]) return 0;
+    nel = id1[4];
+    l = 5;
+    /* Check the array of number of non zero element per row */
+    if ( !IsEqualIntegerArray(id1[1], id1+l, id2+l) ) return 0;
+    l += id1[1];
 
-  /* Check the column index of non zero elements */
-  if ( !IsEqualIntegerArray(nel, id1+l, id2+l) ) return 0;
-  l += nel;
+    /* Check the column index of non zero elements */
+    if ( !IsEqualIntegerArray(nel, id1+l, id2+l) ) return 0;
+    l += nel;
 
-  /* Check the non zero elements */
-  l = (l+1)/2;
-  if ( !IsEqualDoubleArray(nel*(id1[3]+1), d1+l, d2+l) ) return 0;
+    /* Check the non zero elements */
+    l = (l+1)/2;
+    if ( !IsEqualDoubleArray(nel*(id1[3]+1), d1+l, d2+l) ) return 0;
 
-  return 1;
+    return 1;
 }
 
 /**IsEqualMatlabSparseMat
- * Used to test a couple of Scilab variable of type 7 (Matlab sparse matrix) for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type 7 (Matlab sparse matrix) for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualMatlabSparseMat(double *d1, double *d2) /* a faire */
 {
-  int l,nel;
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
+    int l,nel;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  /* Check the number of rows */
-  if (id1[1] != id2[1]) return 0;
+    /* Check the number of rows */
+    if (id1[1] != id2[1]) return 0;
 
-  /* Check the number of columns */
-  if (id1[2] != id2[2]) return 0;
+    /* Check the number of columns */
+    if (id1[2] != id2[2]) return 0;
 
-  /* Check the real/complex flag */
-  if (id1[3] != id2[3]) return 0;
+    /* Check the real/complex flag */
+    if (id1[3] != id2[3]) return 0;
 
-  /* Check the number of non zero elements */
-  if (id1[4] != id2[4]) return 0;
-  nel = id1[4];
-  l = 5;
-  /* Check the array of number of non zero element per column */
-  if ( !IsEqualIntegerArray(id1[2], id1+l, id2+l) ) return 0;
-  l += id1[2];
+    /* Check the number of non zero elements */
+    if (id1[4] != id2[4]) return 0;
+    nel = id1[4];
+    l = 5;
+    /* Check the array of number of non zero element per column */
+    if ( !IsEqualIntegerArray(id1[2], id1+l, id2+l) ) return 0;
+    l += id1[2];
 
-  /* Check the column index of non zero elements */
-  if ( !IsEqualIntegerArray(nel, id1+l, id2+l) ) return 0;
-  l += nel;
+    /* Check the column index of non zero elements */
+    if ( !IsEqualIntegerArray(nel, id1+l, id2+l) ) return 0;
+    l += nel;
 
-  /* Check the non zero elements */
-  l = (l+1)/2;
-  if ( !IsEqualDoubleArray(nel*(id1[3]+1), d1+l, d2+l) ) return 0;
+    /* Check the non zero elements */
+    l = (l+1)/2;
+    if ( !IsEqualDoubleArray(nel*(id1[3]+1), d1+l, d2+l) ) return 0;
 
-  return 1;
+    return 1;
 }
 
 /**IsEqualBoolSparseMat
- * Used to test a couple of Scilab variable of type 6 (Boolean sparse matrix) for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type 6 (Boolean sparse matrix) for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualBoolSparseMat(double *d1, double *d2) /* a faire */
 {
-  int l,nel;
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
+    int l,nel;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  /* Check the number of rows */
-  if (id1[1] != id2[1]) return 0;
+    /* Check the number of rows */
+    if (id1[1] != id2[1]) return 0;
 
-  /* Check the number of columns */
-  if (id1[2] != id2[2]) return 0;
+    /* Check the number of columns */
+    if (id1[2] != id2[2]) return 0;
 
 
-  /* Check the number of non zero elements */
-  if (id1[4] != id2[4]) return 0;
-  nel = id1[4];
-  l = 5;
-  /* Check the array of number of non zero element per row */
-  if ( !IsEqualIntegerArray(id1[1], id1+l, id2+l) ) return 0;
-  l += id1[1];
+    /* Check the number of non zero elements */
+    if (id1[4] != id2[4]) return 0;
+    nel = id1[4];
+    l = 5;
+    /* Check the array of number of non zero element per row */
+    if ( !IsEqualIntegerArray(id1[1], id1+l, id2+l) ) return 0;
+    l += id1[1];
 
-  /* Check the column index of non zero elements */
-  if ( !IsEqualIntegerArray(nel, id1+l, id2+l) ) return 0;
+    /* Check the column index of non zero elements */
+    if ( !IsEqualIntegerArray(nel, id1+l, id2+l) ) return 0;
 
-  return 1;
+    return 1;
 }
 
 /**IsEqualFunction
- * Used to test a couple of Scilab variable of type 11 or 13 (function) for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type 11 or 13 (function) for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualFunction(double *d1, double *d2)
 {
-  int l,n;
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
-
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
-  l=1;
-  /* Check the number of output args */
-  if (id1[l] != id2[l]) return 0;
-  /* Check the output args names*/
-  n = id1[l];   l++;
-  if ( !IsEqualIntegerArray(n*nsiz, id1+l, id2+l) ) return 0;
-  l += n*nsiz;
-
-  /* Check the number of input args */
-  if (id1[l] != id2[l]) return 0;
-  /* Check the input args names*/
-  n = id1[l];   l++;
-  if ( !IsEqualIntegerArray(n*nsiz, id1+l, id2+l) ) return 0;
-  l += n*nsiz;
-
-  /* Check the number of int in instructions */
-  if (id1[l] != id2[l]) return 0;
-  n = id1[l];   l++;
-  if ( !IsEqualIntegerArray(n, id1+l, id2+l) ) return 0;
-
-
-  return 1;
+    int l,n;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
+
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
+    l=1;
+    /* Check the number of output args */
+    if (id1[l] != id2[l]) return 0;
+    /* Check the output args names*/
+    n = id1[l];   l++;
+    if ( !IsEqualIntegerArray(n*nsiz, id1+l, id2+l) ) return 0;
+    l += n*nsiz;
+
+    /* Check the number of input args */
+    if (id1[l] != id2[l]) return 0;
+    /* Check the input args names*/
+    n = id1[l];   l++;
+    if ( !IsEqualIntegerArray(n*nsiz, id1+l, id2+l) ) return 0;
+    l += n*nsiz;
+
+    /* Check the number of int in instructions */
+    if (id1[l] != id2[l]) return 0;
+    n = id1[l];   l++;
+    if ( !IsEqualIntegerArray(n, id1+l, id2+l) ) return 0;
+
+
+    return 1;
 }
 
 /**IsEqualLUPtr
- * Used to test a couple of Scilab variable of type 128  (pointer on LU factorization) for equality
- * @param double *d1: pointer on the beginning of the first variable structure
- * @param double *d2: pointer on the beginning of the first variable structure
- * @return 0 is the variables differ and 1 if they are identical
- * @author Serge Steer
- * @see IsEqualVar
- */
+* Used to test a couple of Scilab variable of type 128  (pointer on LU factorization) for equality
+* @param double *d1: pointer on the beginning of the first variable structure
+* @param double *d2: pointer on the beginning of the first variable structure
+* @return 0 is the variables differ and 1 if they are identical
+* @author Serge Steer
+* @see IsEqualVar
+*/
 int IsEqualLUPtr(double *d1, double *d2)
 {
-  int *id1 = (int *) d1;
-  int *id2 = (int *) d2;
+    int *id1 = (int *) d1;
+    int *id2 = (int *) d2;
 
-  /* Check the type */
-  if ((id1[0] != id2[0])) return 0;
+    /* Check the type */
+    if ((id1[0] != id2[0])) return 0;
 
-  /* Check the number of rows */
-  if (id1[1] != id2[1]) return 0;
+    /* Check the number of rows */
+    if (id1[1] != id2[1]) return 0;
 
-  /* Check the number of columns */
-  if (id1[2] != id2[2]) return 0;
+    /* Check the number of columns */
+    if (id1[2] != id2[2]) return 0;
 
-  /* Check the real/complex flag */
-  if (id1[3] != id2[3]) return 0;
+    /* Check the real/complex flag */
+    if (id1[3] != id2[3]) return 0;
 
-  /* Check the pointer value */
-  if (d1[2] != d2[2]) return 0;
+    /* Check the pointer value */
+    if (d1[2] != d2[2]) return 0;
 
-  return 1;
+    return 1;
 }
 
 /**IsEqualDoubleArrayIEEE
- * compare if two double precision arrays of size n, are identical.
- * NaN entries are supposed to be different from all values included NaN
- * NaN != NaN
- * @param int n: array size
- * @param double *d1: pointer on the beginning of the first array
- * @param double *d2: pointer on the beginning of the second array
- * @return 0 is the arrays differ and 1 if they are identical
- * @author Serge Steer
- */
+* compare if two double precision arrays of size n, are identical.
+* NaN entries are supposed to be different from all values included NaN
+* NaN != NaN
+* @param int n: array size
+* @param double *d1: pointer on the beginning of the first array
+* @param double *d2: pointer on the beginning of the second array
+* @return 0 is the arrays differ and 1 if they are identical
+* @author Serge Steer
+*/
 int IsEqualDoubleArrayIEEE(int n, double *d1, double *d2)
 {
-  int i;
-  /*DEBUG_BASE("IEEE comparison of %d doubles\n",n);*/
-
-  if (n == 0) return 1;
-  for (i = 0; i<n; i++){
-    if (d1[i] != d2[i]) return 0;
-  }
-  return 1;
+    int i;
+    /*DEBUG_BASE("IEEE comparison of %d doubles\n",n);*/
+
+    if (n == 0) return 1;
+    for (i = 0; i<n; i++){
+        if (d1[i] != d2[i]) return 0;
+    }
+    return 1;
 }
 
 /** IsEqualDoubleArrayBinary
- * compare if two  arrays of long long integers of size n, are identical.
- * @param int n: array size
- * @param long long *d1: pointer on the beginning of the first array
- * @param long long *d2: pointer on the beginning of the second array
- * @return 0 is the arrays differ and 1 if they are identical
- * @author Serge Steer
- */
+* compare if two  arrays of long long integers of size n, are identical.
+* @param int n: array size
+* @param long long *d1: pointer on the beginning of the first array
+* @param long long *d2: pointer on the beginning of the second array
+* @return 0 is the arrays differ and 1 if they are identical
+* @author Serge Steer
+*/
 int IsEqualDoubleArrayBinary(int n, double *d1, double *d2)
 {
-  int i;
-  long long *l1= (long long *)d1;
-  long long *l2= (long long *)d2;
+    int i;
+    long long *l1= (long long *)d1;
+    long long *l2= (long long *)d2;
 
-  /*DEBUG_BASE("binary comparison of %d doubles\n",n);*/
+    /*DEBUG_BASE("binary comparison of %d doubles\n",n);*/
 
-  if (n == 0) return 1;
-  for (i = 0; i<n; i++){
-    if (l1[i] != l2[i]) return 0;
-  }
-  return 1;
+    if (n == 0) return 1;
+    for (i = 0; i<n; i++){
+        if (l1[i] != l2[i]) return 0;
+    }
+    return 1;
 }
 
 
 /**IsEqualDoubleArray
- * compare if two double precision arrays of size n, are identical.
- * If the arrays conatins NaN the meaning depends on the value of the global flag IEEE_comp
- *  - if DoubleCompMode==1, double numbers are compared using "==", so Nan != NaN.
- *  - if DoubleCompMode==0, double numbers are compared bitwize.
- * @param int n: array size
- * @param double *d1: pointer on the beginning of the first array
- * @param double *d2: pointer on the beginning of the second array
- * @return 0 is the arrays differ and 1 if they are identical
- * @author Serge Steer
- */
+* compare if two double precision arrays of size n, are identical.
+* If the arrays conatins NaN the meaning depends on the value of the global flag IEEE_comp
+*  - if DoubleCompMode==1, double numbers are compared using "==", so Nan != NaN.
+*  - if DoubleCompMode==0, double numbers are compared bitwize.
+* @param int n: array size
+* @param double *d1: pointer on the beginning of the first array
+* @param double *d2: pointer on the beginning of the second array
+* @return 0 is the arrays differ and 1 if they are identical
+* @author Serge Steer
+*/
 int IsEqualDoubleArray(int n, double *d1, double *d2)
 {
-  if ( GetDoubleCompMode()) {
-    return IsEqualDoubleArrayIEEE(n, d1, d2);
-  }
-  else {
-    return IsEqualDoubleArrayBinary(n, d1, d2);
-  }
+    if ( GetDoubleCompMode()) {
+        return IsEqualDoubleArrayIEEE(n, d1, d2);
+    }
+    else {
+        return IsEqualDoubleArrayBinary(n, d1, d2);
+    }
 }
 
 
 
 /**IsEqualIntegerArray
- * compare if two int arrays of size n, are identical
- * @param int n: array size
- * @param int *d1: pointer on the beginning of the first array
- * @param int *d2: pointer on the beginning of the second array
- * @return 0 is the arrays differ and 1 if they are identical
- * @author Serge Steer
- */
+* compare if two int arrays of size n, are identical
+* @param int n: array size
+* @param int *d1: pointer on the beginning of the first array
+* @param int *d2: pointer on the beginning of the second array
+* @return 0 is the arrays differ and 1 if they are identical
+* @author Serge Steer
+*/
 int IsEqualIntegerArray(int n, int *d1, int *d2)
 {
-  int i;
+    int i;
 
-  /*DEBUG_BASE("comparison of %d ints\n",n);*/
+    /*DEBUG_BASE("comparison of %d ints\n",n);*/
 
-  if (n == 0) return 1;
-  for (i = 0; i<n; i++){
-    if (d1[i] != d2[i]) return 0;
-  }
-  return 1;
+    if (n == 0) return 1;
+    for (i = 0; i<n; i++){
+        if (d1[i] != d2[i]) return 0;
+    }
+    return 1;
 }
 
 typedef signed char integer1;
@@ -893,103 +914,103 @@ typedef short integer2;
 /*     Copyright INRIA */
 
 #define ISEQUAL(Type) {\
-Type *A;\
-Type *B;\
+    Type *A;\
+    Type *B;\
     A=(Type *)d1;\
     B=(Type *)d2;\
     for (i = 0; i <n; ++i) {\
-       if (A[i] != B[i]) return 0;\
+    if (A[i] != B[i]) return 0;\
     }\
 }
 
 
 /**IsEqualShortIntegerArray
- * compare if two short int (1,2 or 4 bytes) arrays of size n, are identical
- * @param int type: int type 1, 2, 4 or 11, 12, 14 for unsigned int
- * @param int n: array size
- * @param int *d1: pointer on the beginning of the first array
- * @param int *d2: pointer on the beginning of the second array
- * @return 0 is the arrays differ and 1 if they are identical
- * @author Serge Steer
- */
+* compare if two short int (1,2 or 4 bytes) arrays of size n, are identical
+* @param int type: int type 1, 2, 4 or 11, 12, 14 for unsigned int
+* @param int n: array size
+* @param int *d1: pointer on the beginning of the first array
+* @param int *d2: pointer on the beginning of the second array
+* @return 0 is the arrays differ and 1 if they are identical
+* @author Serge Steer
+*/
 int IsEqualShortIntegerArray(int typ, int n, int *d1, int *d2)
 {
-  int i;
+    int i;
 
-  /*DEBUG_BASE("comparison of %d int %d bytes\n",n,typ);*/
-  if (n == 0) return 1;
-  switch (typ) {
+    /*DEBUG_BASE("comparison of %d int %d bytes\n",n,typ);*/
+    if (n == 0) return 1;
+    switch (typ) {
   case 0:
-    ISEQUAL(double);
-    break;
+      ISEQUAL(double);
+      break;
   case 1:
-    ISEQUAL(integer1);
-    break;
+      ISEQUAL(integer1);
+      break;
   case 2:
-    ISEQUAL(integer2);
-    break;
+      ISEQUAL(integer2);
+      break;
   case 4:
-    ISEQUAL(int) ;
-    break;
+      ISEQUAL(int) ;
+      break;
   case 11:
-    ISEQUAL(unsigned char);
-    break;
+      ISEQUAL(unsigned char);
+      break;
   case 12:
-    ISEQUAL(unsigned short);
-    break;
+      ISEQUAL(unsigned short);
+      break;
   case 14:
-    ISEQUAL(unsigned int);
-    break;
-  }
+      ISEQUAL(unsigned int);
+      break;
+    }
 
-  return 1;
+    return 1;
 }
 
 /**FreeRec
- * Utility function to free the list recursion table
- * @author Serge Steer
- */
+* Utility function to free the list recursion table
+* @author Serge Steer
+*/
 void FreeRec(void)
 {
-  if ( MaxRec > 0 ) {
-    FREE(Rrec);
-    Rrec = NULL;
-    MaxRec = 0;
-  }
+    if ( MaxRec > 0 ) {
+        FREE(Rrec);
+        Rrec = NULL;
+        MaxRec = 0;
+    }
 }
 
 /** AllocRecIfRequired
- * Utility function to allocate or reallocate the list recursion table
- * @param int krec: minimum size requested
- * @author Serge Steer
- */
+* Utility function to allocate or reallocate the list recursion table
+* @param int krec: minimum size requested
+* @author Serge Steer
+*/
 int AllocRecIfRequired(int krec)
 {
-  /*Allocation is made by block of size 10 */
-  if (MaxRec <= krec) {
-    if ((Rrec = REALLOC(Rrec,(MaxRec+10)*sizeof(RecursionRecord))) ==NULL) return -2;
-    MaxRec = MaxRec+10;
-  }
-  return 0;
+    /*Allocation is made by block of size 10 */
+    if (MaxRec <= krec) {
+        if ((Rrec = (RecursionRecordPtr)REALLOC(Rrec,(MaxRec+10)*sizeof(RecursionRecord))) ==NULL) return -2;
+        MaxRec = MaxRec+10;
+    }
+    return 0;
 }
 
 /**SetDoubleCompMode
- * Utility function used to set the way double numbers are compared
- * @param int mode. 1 means that IEEE comparison is used, 0 means binary comparison
- * @author Serge Steer
- */
+* Utility function used to set the way double numbers are compared
+* @param int mode. 1 means that IEEE comparison is used, 0 means binary comparison
+* @author Serge Steer
+*/
 
 void SetDoubleCompMode(int mode)
 {
-  DoubleCompMode=mode;
+    DoubleCompMode=mode;
 }
 /**GetDoubleCompMode
- * Utility function used to get the way double numbers are compared
- * @return 1 means that IEEE comparison is used, 0 means binary comparison
- * @author Serge Steer
- */
+* Utility function used to get the way double numbers are compared
+* @return 1 means that IEEE comparison is used, 0 means binary comparison
+* @author Serge Steer
+*/
 
 int GetDoubleCompMode(void)
 {
-  return DoubleCompMode;
+    return DoubleCompMode;
 }
index 86eda22..b040be2 100644 (file)
@@ -18,6 +18,7 @@
 #include <string.h>
 #include "stack-c.h"
 #include "MALLOC.h"
+#include "stack-def.h"
 
 static int IsEqualDoubleMat(double *d1, double *d2);
 static int IsEqualPolyMat(double *d1, double *d2);
@@ -63,16 +64,6 @@ int MaxRec; /* allocated size for the array Rrec, 0 means not allocated */
 /*#define DEBUG_OVERLOADING(fmt, ...) sciprint(fmt, __VA_ARGS__) */ ;
 
 
-
-
-/* Scilab parser recursion data and functions*/
-static int *Ids     = C2F(recu).ids-nsiz-1;
-static int *Rstk    = C2F(recu).rstk-1;
-static int *Pstk    = C2F(recu).pstk-1;
-#define Pt (C2F(recu).pt)
-
-int Ptover(int n);
-
 /**intisequalvar
  * Gateway for isequalbitwise and isequal builtins
  * @param char * fname: the Scilab code of the function name
diff --git a/scilab/modules/elementary_functions/src/c/LibScilab_Import.def b/scilab/modules/elementary_functions/src/c/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..2d94b02
--- /dev/null
@@ -0,0 +1,27 @@
+       LIBRARY    Libscilab.dll
+
+
+EXPORTS
+;
+;core
+;
+isanan_
+callFunctionFromGateway
+crebmat_
+stack_
+com_
+checklhs_
+checkrhs_
+vstk_
+recu_
+overload_
+putlhsvar_
+freeArrayOfString
+createvarfromptr_
+intersci_
+check_length
+createvar_
+getrhsvar_
+vartype_
+GetData
+Ptover
\ No newline at end of file
diff --git a/scilab/modules/elementary_functions/src/c/elementary_functions.def b/scilab/modules/elementary_functions/src/c/elementary_functions.def
new file mode 100644 (file)
index 0000000..eb0af43
--- /dev/null
@@ -0,0 +1,133 @@
+LIBRARY    elementary_functions.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; elementary_functions
+; --------------------------------------- 
+
+       idcmp_
+       finiteComplex
+       gsortd_
+       gsortint_
+       gsortuint_
+       gsortshort_
+       gsortushort_
+       gsortchar_
+       gsortuchar_
+       gsorts_
+       gw_elementary_functions
+       idmax_
+       idmin_
+       int2db_
+       intisequalvar_
+       FreeRec
+       AllocRecIfRequired
+       SetDoubleCompMode
+       GetDoubleCompMode
+       ColSortchar
+       RowSortchar
+       GlobalSortchar
+       ColSortuchar
+       RowSortuchar
+       GlobalSortuchar
+       LexiRowchar
+       LexiRowuchar
+       LexiColchar
+       LexiColuchar
+       ColSortdouble
+       RowSortdouble
+       GlobalSortdouble
+       LexiRowdouble
+       LexiColdouble
+       ColSortint
+       ColSortuint
+       RowSortint
+       RowSortuint
+       GlobalSortint
+       GlobalSortuint
+       LexiRowint
+       LexiRowuint
+       LexiColint
+       LexiColuint
+       ColSortshort
+       RowSortshort
+       GlobalSortshort
+       ColSortushort
+       RowSortushort
+       GlobalSortushort
+       LexiRowshort
+       LexiRowushort
+       LexiColshort
+       LexiColushort
+       ColSortstring
+       RowSortstring
+       GlobalSortstring
+       LexiRowstring
+       LexiColstring
+       sciqsort
+       swapcodeint
+       rea2db_
+       scidcopy_
+       sci_abs_
+       sci_acos_
+       sci_asin_
+       sci_atan_
+       sci_ceil_
+       sci_chinesehat_
+       sci_clean_
+       sci_conj_
+       sci_cos_
+       sci_cumprod_
+       sci_cumsum_
+       sci_diag_
+       sci_dsearch_
+       sci_exp_
+       sci_expm_
+       sci_eye_
+       sci_floor_
+       sci_frexp_
+       sci_gsort_
+       sci_imag_
+       sci_imult_
+       sci_int_
+       sci_isequal_
+       sci_isequalbitwise_
+       sci_isreal_
+       sci_kron_
+       sci_log_
+       sci_log1p_
+       sci_scimatrix_
+       sci_maxi_
+       sci_nearfloat_
+       sci_number_properties_
+       sci_ones_
+       sci_prod_
+       sci_rand_
+       sci_real_
+       sci_round_
+       sci_sign_
+       sci_sin_
+       sci_size_
+       sci_spones_
+       sci_sqrt_
+       sci_sum_
+       sci_tan_
+       sci_testmatrix_
+       ccomplexf_
+       SciToF77
+       F77ToSci
+       double2z
+       z2double
+       sci_tril_
+       sci_triu_
+       sci_zeros_
+       unsfdcopy_
+       vceil_
+       vfinite_
+       vfiniteComplex_
+       vfloor_
+       vfrexp_
+       xerhlt_
+       setjmp_slatec_jmp_env
+\1a
\ No newline at end of file
diff --git a/scilab/modules/elementary_functions/src/c/elementary_functions.rc b/scilab/modules/elementary_functions/src/c/elementary_functions.rc
new file mode 100644 (file)
index 0000000..a8db789
--- /dev/null
@@ -0,0 +1,95 @@
+// Microsoft Visual C++ generated resource script.
+//
+
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// French (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 5,3,0,0
+ PRODUCTVERSION 5,3,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040c04b0"
+        BEGIN
+            VALUE "FileDescription", "elementary_functions module"
+            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "InternalName", "elementary_functions module"
+            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "OriginalFilename", "elementary_functions.dll"
+            VALUE "ProductName", "elementary_functions module"
+            VALUE "ProductVersion", "5, 3, 0, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x40c, 1200
+    END
+END
+
+#endif    // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
index fb51ba1..9677cb3 100644 (file)
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
        Name="elementary_functions"
        ProjectGUID="{5B110267-7C18-437C-B87D-DBA2B50729E9}"
        RootNamespace="elementary_functions"
+       Keyword="Win32Proj"
        TargetFrameworkVersion="0"
        >
        <Platforms>
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)libs\"
+                       OutputDirectory="$(SolutionDir)bin\"
                        IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       ConfigurationType="2"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
-                               PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ELEMENTARY_FUNCTIONS_EXPORTS"
+                               MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=""
-                               AssemblerListingLocation="$(ConfigurationName)/"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/"
                                WarningLevel="3"
-                               SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                                CompileAs="0"
                        />
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1036"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_header.def+elementary_functions.vcdef elementary_functions.def &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
-                               SuppressStartupBanner="true"
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib elementary_functions_f.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="elementary_functions.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
                                Name="VCXDCMakeTool"
                        />
                        <Tool
                                Name="VCFxCopTool"
                        />
                        <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\..\..\..\..\libs\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(SolutionDir)libs\"
+                       OutputDirectory="$(SolutionDir)bin\"
                        IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       ConfigurationType="2"
                        CharacterSet="2"
                        >
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
-                               PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ELEMENTARY_FUNCTIONS_EXPORTS"
+                               MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=""
-                               AssemblerListingLocation="$(ConfigurationName)/"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/"
                                WarningLevel="3"
-                               SuppressStartupBanner="true"
                                DebugInformationFormat="3"
                                CompileAs="0"
                        />
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1036"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_header.def+elementary_functions.vcdef elementary_functions.def &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
-                               SuppressStartupBanner="true"
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib elementary_functions_f.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="elementary_functions.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
                                Name="VCXDCMakeTool"
                        />
                        <Tool
                                Name="VCFxCopTool"
                        />
                        <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\..\..\..\..\libs\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)libs\"
+                       OutputDirectory="$(SolutionDir)bin\"
                        IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       ConfigurationType="2"
                        CharacterSet="2"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
-                               Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
-                               PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ELEMENTARY_FUNCTIONS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
                                EnableEnhancedInstructionSet="0"
                                UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=""
-                               AssemblerListingLocation="$(ConfigurationName)/"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/"
                                WarningLevel="3"
-                               SuppressStartupBanner="true"
+                               DebugInformationFormat="3"
                                CompileAs="0"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1036"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_header.def+elementary_functions.vcdef elementary_functions.def &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib elementary_functions_f.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="elementary_functions.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
-                               SuppressStartupBanner="true"
+                               Name="VCALinkTool"
                        />
                        <Tool
-                               Name="VCALinkTool"
+                               Name="VCManifestTool"
                        />
                        <Tool
                                Name="VCXDCMakeTool"
                                Name="VCFxCopTool"
                        />
                        <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\..\..\..\..\libs\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(SolutionDir)libs\"
+                       OutputDirectory="$(SolutionDir)bin\"
                        IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       ConfigurationType="2"
                        CharacterSet="2"
+                       WholeProgramOptimization="0"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
-                               PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ELEMENTARY_FUNCTIONS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
-                               EnableFunctionLevelLinking="true"
                                EnableEnhancedInstructionSet="0"
                                UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=""
-                               AssemblerListingLocation="$(ConfigurationName)/"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/"
                                WarningLevel="3"
-                               SuppressStartupBanner="true"
+                               DebugInformationFormat="3"
                                CompileAs="0"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1036"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_header.def+elementary_functions.vcdef elementary_functions.def &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib elementary_functions_f.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="elementary_functions.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
-                               SuppressStartupBanner="true"
+                               Name="VCALinkTool"
                        />
                        <Tool
-                               Name="VCALinkTool"
+                               Name="VCManifestTool"
                        />
                        <Tool
                                Name="VCXDCMakeTool"
                                Name="VCFxCopTool"
                        />
                        <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\..\..\..\..\libs\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                </Configuration>
        </Configurations>
                                >
                        </File>
                        <File
+                               RelativePath=".\DllmainElementary_functions.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\finite.c"
                                >
                        </File>
                        <File
                                RelativePath=".\IsEqualVar.c"
                                >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               CompileAs="0"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Debug|x64"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               CompileAs="0"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               CompileAs="0"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|x64"
+                                       >
+                                       <Tool
+                                               Name="VCCLCompilerTool"
+                                               CompileAs="0"
+                                       />
+                               </FileConfiguration>
                        </File>
                        <File
                                RelativePath=".\qsort-char.c"
                                >
                        </File>
                        <File
-                               RelativePath=".\IsEqualVar.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\qsort-char.h"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath="..\..\includes\rea2db.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\includes\sci_tools.h"
                                >
                        </File>
                        <File
+                               RelativePath="..\..\includes\scidcopy.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\includes\unsfdcopy.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\includes\vfinite.h"
                                >
                        </File>
                <Filter
                        Name="Libraries Dependencies"
                        >
+                       <Filter
+                               Name="Imports"
+                               >
+                               <File
+                                       RelativePath=".\elementary_functions_f_Import.def"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath=".\LibScilab_Import.def"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <Filter
+                       Name="Resource File"
+                       >
+                       <File
+                               RelativePath=".\elementary_functions.rc"
+                               >
+                       </File>
                </Filter>
                <File
+                       RelativePath="..\..\..\..\bin\blasplus.lib"
+                       >
+               </File>
+               <File
                        RelativePath="..\..\elementary_functions.iss"
                        >
                </File>
                        >
                </File>
                <File
+                       RelativePath="..\..\..\..\bin\lapack.lib"
+                       >
+               </File>
+               <File
                        RelativePath="..\..\Makefile.am"
                        >
                </File>
diff --git a/scilab/modules/elementary_functions/src/c/elementary_functions_f_Import.def b/scilab/modules/elementary_functions/src/c/elementary_functions_f_Import.def
new file mode 100644 (file)
index 0000000..40d2976
--- /dev/null
@@ -0,0 +1,54 @@
+LIBRARY    elementary_functions_f.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; elementary_functions_f
+; --------------------------------------- 
+intabs_
+intacos_
+intasin_
+intatan_
+intceil_
+intchinesehat_
+intconj_
+intcos_
+intcumprod_
+intcumsum_
+intdiag_
+intdsearch_
+intexp_
+intexpm_
+inteye_
+intfloor_
+intfrexp_
+intimult_
+intint_
+intisequal_
+intisequalvar_
+intisreal_
+intkron_
+intlog_
+intlog1p_
+intmatrix_
+intmaxi_
+intnearfl_
+intnbprop_
+intones_
+intprod_
+intrand_
+intreal_
+intround_
+intsign_
+intsin_
+intsize_
+intspones_
+intsqrt_
+intsum_
+inttan_
+inttestmatrix_
+inttril_
+inttriu_
+intzeros_
+intclean_
+intimag_
diff --git a/scilab/modules/elementary_functions/src/c/elementary_functions_header.def b/scilab/modules/elementary_functions/src/c/elementary_functions_header.def
new file mode 100644 (file)
index 0000000..13a7d9f
--- /dev/null
@@ -0,0 +1,8 @@
+LIBRARY    elementary_functions.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; elementary_functions
+; --------------------------------------- 
+
diff --git a/scilab/modules/elementary_functions/src/fortran/LibScilab_Import.def b/scilab/modules/elementary_functions/src/fortran/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..ccd1baa
--- /dev/null
@@ -0,0 +1,42 @@
+       LIBRARY    Libscilab.dll
+
+
+EXPORTS
+;
+;core
+;
+intersci_
+adre_
+iop_
+funnam_
+recu_
+stack_
+vstk_
+com_
+errgst_
+ref2val_
+copyobj_
+cremat_
+getrmat_
+getrvect_
+cha1_
+getsmat_
+checklhs_
+checkrhs_
+allops_
+createref_
+setfunnam_
+checkval_
+getlistmat_
+getilist_
+isanan_
+gettype_
+crebmat_
+cresmat2_
+objvide_
+getscalar_
+returnananfortran_
+
+;cacsd_f
+shrslv_
+giv_
\ No newline at end of file
index 1b316ec..98393f6 100644 (file)
@@ -36,6 +36,9 @@ c internal variables
       integer m, i, ir, id, ie, j, j1, n1, im1, ip1, k
       double precision a, b1, b2, b3, zero, one, two, cnst, half
       dimension a(41), m(21)
+cDEC$ IF DEFINED (FORDLL)
+cDEC$ ATTRIBUTES DLLIMPORT:: /dcoeff/
+cDEC$ ENDIF
       common /dcoeff/ b, n
       data zero, one, two, cnst, half /0.0d+0,1.0d+0,2.0d+0,
      * 0.556930d+0,0.50d+0/
index eabf670..5458266 100644 (file)
@@ -41,6 +41,9 @@ c
       double precision anorm,alpha,bvec,bbvec,rn,zero,c(41)
       logical fail
 c
+cDEC$ IF DEFINED (FORDLL)
+cDEC$ ATTRIBUTES DLLIMPORT:: /dcoeff/
+cDEC$ ENDIF
       common /dcoeff/ c,ndng
       data zero /0.0d+0/
       ndng=-1
diff --git a/scilab/modules/elementary_functions/src/fortran/elementary_functions_Import.def b/scilab/modules/elementary_functions/src/fortran/elementary_functions_Import.def
new file mode 100644 (file)
index 0000000..15d2a91
--- /dev/null
@@ -0,0 +1,12 @@
+LIBRARY    elementary_functions.dll
+
+
+EXPORTS
+vceil_
+unsfdcopy_
+int2db_
+vfloor_
+vfrexp_
+idmax_
+idmin_
+dcoeff_
diff --git a/scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc b/scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc
new file mode 100644 (file)
index 0000000..293317d
--- /dev/null
@@ -0,0 +1,95 @@
+// Microsoft Visual C++ generated resource script.
+//
+
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// French (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 5,3,0,0
+ PRODUCTVERSION 5,3,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040c04b0"
+        BEGIN
+            VALUE "FileDescription", "elementary_functions_f module"
+            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "InternalName", "elementary_functions_f module"
+            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "OriginalFilename", "elementary_functions_f.dll"
+            VALUE "ProductName", "elementary_functions_f module"
+            VALUE "ProductVersion", "5, 3, 0, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x40c, 1200
+    END
+END
+
+#endif    // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
index 7783c79..6137cc9 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="typeStaticLibrary" ProjectCreator="Intel Fortran" Keyword="Static Library" Version="11.0" ProjectIdGuid="{DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}">
+<VisualStudioProject ProjectType="typeDynamicLibrary" ProjectCreator="Intel Fortran" Keyword="Dll" Version="11.0" ProjectIdGuid="{DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}">
        <Platforms>
                <Platform Name="Win32"/>
                <Platform Name="x64"/></Platforms>
        <Configurations>
-               <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/elementary_functions_f.lib"/>
+               <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="elementary_functions_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib elementary_functions.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
-                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
-for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
+                               <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions_f.dll %%f &gt;nul
 copy *.def elementary_functions_f.def &gt;nul
-copy elementary_functions_f.def ..\..\..\..\..\libs\elementary_functions_f.vcdef &gt;nul
+copy elementary_functions_f.def ..\elementary_functions_f.vcdef &gt;nul
 del *.def &gt;nul
-cd .."/>
+cd ..
+copy elementary_functions_f_header.def+elementary_functions_f.vcdef elementary_functions_f.def &gt;nul" Description="Build elementary_functions.def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
-               <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" ImproveFloatingPointConsistency="true"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/elementary_functions_f.lib"/>
+               <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="elementary_functions_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib elementary_functions.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
-                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
-for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
+                               <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions_f.dll %%f &gt;nul
 copy *.def elementary_functions_f.def &gt;nul
-copy elementary_functions_f.def ..\..\..\..\..\libs\elementary_functions_f.vcdef &gt;nul
+copy elementary_functions_f.def ..\elementary_functions_f.vcdef &gt;nul
 del *.def &gt;nul
-cd .."/>
+cd ..
+copy elementary_functions_f_header.def+elementary_functions_f.vcdef elementary_functions_f.def &gt;nul" Description="Build elementary_functions.def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
-               <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/elementary_functions_f.lib"/>
+               <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="elementary_functions_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib elementary_functions.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
-                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
-for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
+                               <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions_f.dll %%f &gt;nul
 copy *.def elementary_functions_f.def &gt;nul
-copy elementary_functions_f.def ..\..\..\..\..\libs\elementary_functions_f.vcdef &gt;nul
+copy elementary_functions_f.def ..\elementary_functions_f.vcdef &gt;nul
 del *.def &gt;nul
-cd .."/>
+cd ..
+copy elementary_functions_f_header.def+elementary_functions_f.vcdef elementary_functions_f.def &gt;nul" Description="Build elementary_functions.def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
-               <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL" ImproveFloatingPointConsistency="true"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/elementary_functions_f.lib"/>
+               <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="elementary_functions_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib elementary_functions.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
-                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
-for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
+                               <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions_f.dll %%f &gt;nul
 copy *.def elementary_functions_f.def &gt;nul
-copy elementary_functions_f.def ..\..\..\..\..\libs\elementary_functions_f.vcdef &gt;nul
+copy elementary_functions_f.def ..\elementary_functions_f.vcdef &gt;nul
 del *.def &gt;nul
-cd .."/>
+cd ..
+copy elementary_functions_f_header.def+elementary_functions_f.vcdef elementary_functions_f.def &gt;nul" Description="Build elementary_functions.def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
                <Filter Name="Header Files" Filter="fi;fd"/>
-               <Filter Name="Library dependencies"/>
-               <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
+               <Filter Name="Library Dependencies">
+               <File RelativePath=".\elementary_functions_Import.def"/>
+               <File RelativePath=".\LibScilab_Import.def"/></Filter>
+               <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+               <File RelativePath=".\elementary_functions_f.rc"/></Filter>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
-               <File RelativePath="arcosh.f"/>
-               <File RelativePath="bdiag.f"/>
-               <File RelativePath="calerf.f"/>
-               <File RelativePath="cbal.f"/>
-               <File RelativePath="ccopy.f"/>
-               <File RelativePath="cerr.f"/>
-               <File RelativePath="coef.f"/>
-               <File RelativePath="comqr3.f"/>
-               <File RelativePath="corth.f"/>
-               <File RelativePath="cortr.f"/>
-               <File RelativePath="coshin.f"/>
-               <File RelativePath="cupro.f"/>
-               <File RelativePath="cuproi.f"/>
-               <File RelativePath="cusum.f"/>
-               <File RelativePath="d1mach.f"/>
-               <File RelativePath="dad.f"/>
-               <File RelativePath="dadd.f"/>
-               <File RelativePath="dbesig.f"/>
-               <File RelativePath="dbesjg.f"/>
-               <File RelativePath="dbeskg.f"/>
-               <File RelativePath="dbesyg.f"/>
-               <File RelativePath="dclmat.f"/>
-               <File RelativePath="ddif.f"/>
-               <File RelativePath="ddpow.f"/>
-               <File RelativePath="ddpow1.f"/>
-               <File RelativePath="ddpowe.f"/>
-               <File RelativePath="ddrdiv.f"/>
-               <File RelativePath="dexpm1.f"/>
-               <File RelativePath="dipow.f"/>
-               <File RelativePath="dipowe.f"/>
-               <File RelativePath="dlblks.f"/>
-               <File RelativePath="dlgama.f"/>
-               <File RelativePath="dmcopy.f"/>
-               <File RelativePath="dmmul.f"/>
-               <File RelativePath="dmmul1.f"/>
-               <File RelativePath="dmprod.f"/>
-               <File RelativePath="dmsum.f"/>
-               <File RelativePath="drdiv.f"/>
-               <File RelativePath="dsearch.f"/>
-               <File RelativePath="dset.f"/>
-               <File RelativePath="dsort.f"/>
-               <File RelativePath="dsum.f"/>
-               <File RelativePath="dtild.f"/>
-               <File RelativePath="dvmul.f"/>
-               <File RelativePath="dwdiv.f"/>
-               <File RelativePath="dwpow.f"/>
-               <File RelativePath="dwpow1.f"/>
-               <File RelativePath="dwpowe.f"/>
-               <File RelativePath="dwrdiv.f"/>
-               <File RelativePath="entier.f"/>
-               <File RelativePath="exch.f"/>
-               <File RelativePath="franck.f"/>
-               <File RelativePath="gdcp2i.f"/>
-               <File RelativePath="getdimfromvar.f"/>
-               <File RelativePath="getorient.f"/>
-               <File RelativePath="hilber.f"/>
-               <File RelativePath="i1mach.f"/>
-               <File RelativePath="imcopy.f"/>
-               <File RelativePath="infinity.f"/>
-               <File RelativePath="intp.f"/>
-               <File RelativePath="iset.f"/>
-               <File RelativePath="isort.f"/>
-               <File RelativePath="isova0.f"/>
-               <File RelativePath="isoval.f"/>
-               <File RelativePath="ivimp.f"/>
-               <File RelativePath="iwamax.f"/>
-               <File RelativePath="kronc.f"/>
-               <File RelativePath="kronr.f"/>
-               <File RelativePath="lnblnk.f"/>
-               <File RelativePath="magic.f"/>
-               <File RelativePath="mtran.f"/>
-               <File RelativePath="nearfloat.f"/>
-               <File RelativePath="orthes.f"/>
-               <File RelativePath="ortran.f"/>
-               <File RelativePath="psi.f"/>
-               <File RelativePath="pythag.f"/>
-               <File RelativePath="rat.f"/>
-               <File RelativePath="rcopy.f"/>
-               <File RelativePath="rcsort.f"/>
-               <File RelativePath="ribesl.f"/>
-               <File RelativePath="rjbesl.f"/>
-               <File RelativePath="rkbesl.f"/>
-               <File RelativePath="round.f"/>
-               <File RelativePath="rybesl.f"/>
+               <File RelativePath=".\arcosh.f"/>
+               <File RelativePath=".\bdiag.f"/>
+               <File RelativePath=".\calerf.f"/>
+               <File RelativePath=".\cbal.f"/>
+               <File RelativePath=".\ccopy.f"/>
+               <File RelativePath=".\cerr.f"/>
+               <File RelativePath=".\coef.f"/>
+               <File RelativePath=".\comqr3.f"/>
+               <File RelativePath=".\corth.f"/>
+               <File RelativePath=".\cortr.f"/>
+               <File RelativePath=".\coshin.f"/>
+               <File RelativePath=".\cupro.f"/>
+               <File RelativePath=".\cuproi.f"/>
+               <File RelativePath=".\cusum.f"/>
+               <File RelativePath=".\d1mach.f"/>
+               <File RelativePath=".\dad.f"/>
+               <File RelativePath=".\dadd.f"/>
+               <File RelativePath=".\dbesig.f"/>
+               <File RelativePath=".\dbesjg.f"/>
+               <File RelativePath=".\dbeskg.f"/>
+               <File RelativePath=".\dbesyg.f"/>
+               <File RelativePath=".\dclmat.f"/>
+               <File RelativePath=".\ddif.f"/>
+               <File RelativePath=".\ddpow.f"/>
+               <File RelativePath=".\ddpow1.f"/>
+               <File RelativePath=".\ddpowe.f"/>
+               <File RelativePath=".\ddrdiv.f"/>
+               <File RelativePath=".\dexpm1.f"/>
+               <File RelativePath=".\dipow.f"/>
+               <File RelativePath=".\dipowe.f"/>
+               <File RelativePath=".\dlblks.f"/>
+               <File RelativePath=".\dlgama.f"/>
+               <File RelativePath=".\dmcopy.f"/>
+               <File RelativePath=".\dmmul.f"/>
+               <File RelativePath=".\dmmul1.f"/>
+               <File RelativePath=".\dmprod.f"/>
+               <File RelativePath=".\dmsum.f"/>
+               <File RelativePath=".\drdiv.f"/>
+               <File RelativePath=".\dsearch.f"/>
+               <File RelativePath=".\dset.f"/>
+               <File RelativePath=".\dsort.f"/>
+               <File RelativePath=".\dsum.f"/>
+               <File RelativePath=".\dtild.f"/>
+               <File RelativePath=".\dvmul.f"/>
+               <File RelativePath=".\dwdiv.f"/>
+               <File RelativePath=".\dwpow.f"/>
+               <File RelativePath=".\dwpow1.f"/>
+               <File RelativePath=".\dwpowe.f"/>
+               <File RelativePath=".\dwrdiv.f"/>
+               <File RelativePath=".\entier.f"/>
+               <File RelativePath=".\exch.f"/>
+               <File RelativePath=".\franck.f"/>
+               <File RelativePath=".\gdcp2i.f"/>
+               <File RelativePath=".\getdimfromvar.f"/>
+               <File RelativePath=".\getorient.f"/>
+               <File RelativePath=".\hilber.f"/>
+               <File RelativePath=".\i1mach.f"/>
+               <File RelativePath=".\imcopy.f"/>
+               <File RelativePath=".\infinity.f"/>
+               <File RelativePath=".\intp.f"/>
+               <File RelativePath=".\iset.f"/>
+               <File RelativePath=".\isort.f"/>
+               <File RelativePath=".\isova0.f"/>
+               <File RelativePath=".\isoval.f"/>
+               <File RelativePath=".\ivimp.f"/>
+               <File RelativePath=".\iwamax.f"/>
+               <File RelativePath=".\kronc.f"/>
+               <File RelativePath=".\kronr.f"/>
+               <File RelativePath=".\lnblnk.f"/>
+               <File RelativePath=".\magic.f"/>
+               <File RelativePath=".\mtran.f"/>
+               <File RelativePath=".\nearfloat.f"/>
+               <File RelativePath=".\orthes.f"/>
+               <File RelativePath=".\ortran.f"/>
+               <File RelativePath=".\psi.f"/>
+               <File RelativePath=".\pythag.f"/>
+               <File RelativePath=".\rat.f"/>
+               <File RelativePath=".\rcopy.f"/>
+               <File RelativePath=".\rcsort.f"/>
+               <File RelativePath=".\ribesl.f"/>
+               <File RelativePath=".\rjbesl.f"/>
+               <File RelativePath=".\rkbesl.f"/>
+               <File RelativePath=".\round.f"/>
+               <File RelativePath=".\rybesl.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_abs.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_acos.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_asin.f"/>
@@ -202,53 +211,55 @@ cd .."/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_triu.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_f_zeros.f"/>
                <File RelativePath=".\sdot.f"/>
-               <File RelativePath="simple.f"/>
-               <File RelativePath="split.f"/>
-               <File RelativePath="urand.f"/>
-               <File RelativePath="vpythag.f"/>
-               <File RelativePath="wacos.f"/>
-               <File RelativePath="wasin.f"/>
-               <File RelativePath="wasum.f"/>
-               <File RelativePath="watan.f"/>
-               <File RelativePath="waxpy.f"/>
-               <File RelativePath="wbdiag.f"/>
-               <File RelativePath="wcerr.f"/>
-               <File RelativePath="wclmat.f"/>
-               <File RelativePath="wddiv.f"/>
-               <File RelativePath="wdiv.f"/>
-               <File RelativePath="wdotci.f"/>
-               <File RelativePath="wdotcr.f"/>
-               <File RelativePath="wdpow.f"/>
-               <File RelativePath="wdpow1.f"/>
-               <File RelativePath="wdpowe.f"/>
-               <File RelativePath="wdrdiv.f"/>
-               <File RelativePath="wexchn.f"/>
-               <File RelativePath="wexpm1.f"/>
-               <File RelativePath="wipow.f"/>
-               <File RelativePath="wipowe.f"/>
-               <File RelativePath="wlog.f"/>
-               <File RelativePath="wmmul.f"/>
-               <File RelativePath="wmprod.f"/>
-               <File RelativePath="wmsum.f"/>
-               <File RelativePath="wmul.f"/>
-               <File RelativePath="wrscal.f"/>
-               <File RelativePath="wscal.f"/>
-               <File RelativePath="wshrsl.f"/>
-               <File RelativePath="wsign.f"/>
-               <File RelativePath="wsqrt.f"/>
-               <File RelativePath="wswap.f"/>
-               <File RelativePath="wtan.f"/>
-               <File RelativePath="wvmul.f"/>
-               <File RelativePath="wwdiv.f"/>
-               <File RelativePath="wwpow.f"/>
-               <File RelativePath="wwpow1.f"/>
-               <File RelativePath="wwpowe.f"/>
-               <File RelativePath="wwrdiv.f"/>
-               <File RelativePath="zbeshg.f"/>
-               <File RelativePath="zbesig.f"/>
-               <File RelativePath="zbesjg.f"/>
-               <File RelativePath="zbeskg.f"/>
-               <File RelativePath="zbesyg.f"/></Filter>
+               <File RelativePath=".\simple.f"/>
+               <File RelativePath=".\split.f"/>
+               <File RelativePath=".\urand.f"/>
+               <File RelativePath=".\vpythag.f"/>
+               <File RelativePath=".\wacos.f"/>
+               <File RelativePath=".\wasin.f"/>
+               <File RelativePath=".\wasum.f"/>
+               <File RelativePath=".\watan.f"/>
+               <File RelativePath=".\waxpy.f"/>
+               <File RelativePath=".\wbdiag.f"/>
+               <File RelativePath=".\wcerr.f"/>
+               <File RelativePath=".\wclmat.f"/>
+               <File RelativePath=".\wddiv.f"/>
+               <File RelativePath=".\wdiv.f"/>
+               <File RelativePath=".\wdotci.f"/>
+               <File RelativePath=".\wdotcr.f"/>
+               <File RelativePath=".\wdpow.f"/>
+               <File RelativePath=".\wdpow1.f"/>
+               <File RelativePath=".\wdpowe.f"/>
+               <File RelativePath=".\wdrdiv.f"/>
+               <File RelativePath=".\wexchn.f"/>
+               <File RelativePath=".\wexpm1.f"/>
+               <File RelativePath=".\wipow.f"/>
+               <File RelativePath=".\wipowe.f"/>
+               <File RelativePath=".\wlog.f"/>
+               <File RelativePath=".\wmmul.f"/>
+               <File RelativePath=".\wmprod.f"/>
+               <File RelativePath=".\wmsum.f"/>
+               <File RelativePath=".\wmul.f"/>
+               <File RelativePath=".\wrscal.f"/>
+               <File RelativePath=".\wscal.f"/>
+               <File RelativePath=".\wshrsl.f"/>
+               <File RelativePath=".\wsign.f"/>
+               <File RelativePath=".\wsqrt.f"/>
+               <File RelativePath=".\wswap.f"/>
+               <File RelativePath=".\wtan.f"/>
+               <File RelativePath=".\wvmul.f"/>
+               <File RelativePath=".\wwdiv.f"/>
+               <File RelativePath=".\wwpow.f"/>
+               <File RelativePath=".\wwpow1.f"/>
+               <File RelativePath=".\wwpowe.f"/>
+               <File RelativePath=".\wwrdiv.f"/>
+               <File RelativePath=".\zbeshg.f"/>
+               <File RelativePath=".\zbesig.f"/>
+               <File RelativePath=".\zbesjg.f"/>
+               <File RelativePath=".\zbeskg.f"/>
+               <File RelativePath=".\zbesyg.f"/></Filter>
+               <File RelativePath="..\..\..\..\bin\blasplus.lib"/>
                <File RelativePath="..\..\sci_gateway\elementary_functions_gateway.xml"/>
+               <File RelativePath="..\..\..\..\bin\lapack.lib"/>
                <File RelativePath="..\..\Makefile.am"/></Files>
        <Globals/></VisualStudioProject>
index 6a4f1ab..ddc7cef 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)libs\"
+                       OutputDirectory="$(SolutionDir)bin\"
                        IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
-                       ConfigurationType="4"
-                       CharacterSet="2"
+                       ConfigurationType="2"
+                       CharacterSet="1"
                        >
                        <Tool
                                Name="f2c rule"
                        />
                        <Tool
                                Name="VCPreBuildEventTool"
+                               Description="Build Dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                                ExecutionBucket="2"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        />
-
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
                                ExecutionBucket="5"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                ExecutionBucket="6"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../../../libs/f2c"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ELEMENTARY_FUNCTIONS_F2C_EXPORTS;FORDLL"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Build elementary_functions_f.def"
+                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions_f.def &gt;nul&#x0D;&#x0A;copy elementary_functions_f.def ..\elementary_functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_f_header.def+elementary_functions_f.vcdef elementary_functions_f.def &gt;nul&#x0D;&#x0A;"
                                ExecutionBucket="9"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
+                               Name="VCLinkerTool"
                                ExecutionBucket="10"
-                               OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
+                               AdditionalOptions="/ignore:4049"
+                               AdditionalDependencies="Libscilab.lib elementary_functions.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="elementary_functions_f.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
                        />
                        <Tool
                                Name="VCALinkTool"
                                ExecutionBucket="11"
                        />
                        <Tool
-                               Name="VCXDCMakeTool"
+                               Name="VCManifestTool"
                                ExecutionBucket="12"
                        />
                        <Tool
-                               Name="VCBscMakeTool"
+                               Name="VCXDCMakeTool"
                                ExecutionBucket="13"
                        />
                        <Tool
-                               Name="VCFxCopTool"
+                               Name="VCBscMakeTool"
                                ExecutionBucket="14"
                        />
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               Description="Build elementary_functions_f.vcdef"
-                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions_f.def &gt;nul&#x0D;&#x0A;copy elementary_functions_f.def ..\..\..\..\..\libs\elementary_functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;"
+                               Name="VCFxCopTool"
                                ExecutionBucket="15"
                        />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                               ExecutionBucket="17"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(SolutionDir)libs\"
+                       OutputDirectory="$(SolutionDir)bin\"
                        IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
-                       ConfigurationType="4"
-                       CharacterSet="2"
+                       ConfigurationType="2"
+                       CharacterSet="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               Description="Build Dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="../../../../libs/f2c"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ELEMENTARY_FUNCTIONS_F2C_EXPORTS;FORDLL"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Build elementary_functions_f.def"
+                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions_f.def &gt;nul&#x0D;&#x0A;copy elementary_functions_f.def ..\elementary_functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_f_header.def+elementary_functions_f.vcdef elementary_functions_f.def &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
+                               Name="VCLinkerTool"
+                               AdditionalOptions="/ignore:4049"
+                               AdditionalDependencies="Libscilab.lib elementary_functions.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="elementary_functions_f.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
                                Name="VCXDCMakeTool"
                        />
                        <Tool
                                Name="VCFxCopTool"
                        />
                        <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
                                Name="VCPostBuildEventTool"
-                               Description="Build elementary_functions_f.vcdef"
-                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions_f.def &gt;nul&#x0D;&#x0A;copy elementary_functions_f.def ..\..\..\..\..\libs\elementary_functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(SolutionDir)libs\"
+                       OutputDirectory="$(SolutionDir)bin\"
                        IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
-                       ConfigurationType="4"
-                       CharacterSet="2"
+                       ConfigurationType="2"
+                       CharacterSet="1"
                        WholeProgramOptimization="1"
                        >
                        <Tool
-                               Name="f2c rule"
-                               ExecutionBucket="1"
-                       />
-                       <Tool
                                Name="VCPreBuildEventTool"
-                               ExecutionBucket="2"
+                               Description="Build Dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        />
-
+                       <Tool
+                               Name="f2c rule"
+                       />
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
-                               ExecutionBucket="5"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               ExecutionBucket="6"
                                WholeProgramOptimization="false"
                                AdditionalIncludeDirectories="../../../../libs/f2c"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ELEMENTARY_FUNCTIONS_F2C_EXPORTS;FORDLL"
                                RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="0"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="3"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
-                               ExecutionBucket="7"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               ExecutionBucket="8"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               ExecutionBucket="9"
+                               Description="Build elementary_functions_f.def"
+                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions_f.def &gt;nul&#x0D;&#x0A;copy elementary_functions_f.def ..\elementary_functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_f_header.def+elementary_functions_f.vcdef elementary_functions_f.def &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               ExecutionBucket="10"
-                               OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
+                               Name="VCLinkerTool"
+                               AdditionalOptions="/ignore:4049"
+                               AdditionalDependencies="Libscilab.lib elementary_functions.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="elementary_functions_f.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
                        />
                        <Tool
                                Name="VCALinkTool"
-                               ExecutionBucket="11"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
                        />
                        <Tool
                                Name="VCXDCMakeTool"
-                               ExecutionBucket="12"
                        />
                        <Tool
                                Name="VCBscMakeTool"
-                               ExecutionBucket="13"
                        />
                        <Tool
                                Name="VCFxCopTool"
-                               ExecutionBucket="14"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
-                               Description="Build elementary_functions_f.vcdef"
-                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions_f.def &gt;nul&#x0D;&#x0A;copy elementary_functions_f.def ..\..\..\..\..\libs\elementary_functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;"
-                               ExecutionBucket="15"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(SolutionDir)libs\"
+                       OutputDirectory="$(SolutionDir)bin\"
                        IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
-                       ConfigurationType="4"
-                       CharacterSet="2"
+                       ConfigurationType="2"
+                       CharacterSet="1"
                        WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
+                               Description="Build Dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                Name="VCCLCompilerTool"
                                WholeProgramOptimization="false"
                                AdditionalIncludeDirectories="../../../../libs/f2c"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ELEMENTARY_FUNCTIONS_F2C_EXPORTS;FORDLL"
                                RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="1"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                DebugInformationFormat="3"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Build elementary_functions_f.def"
+                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions_f.def &gt;nul&#x0D;&#x0A;copy elementary_functions_f.def ..\elementary_functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_f_header.def+elementary_functions_f.vcdef elementary_functions_f.def &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
+                               Name="VCLinkerTool"
+                               AdditionalOptions="/ignore:4049"
+                               AdditionalDependencies="Libscilab.lib elementary_functions.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="elementary_functions_f.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
                                Name="VCXDCMakeTool"
                        />
                        <Tool
                                Name="VCFxCopTool"
                        />
                        <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
                                Name="VCPostBuildEventTool"
-                               Description="Build elementary_functions_f.vcdef"
-                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions_f.def &gt;nul&#x0D;&#x0A;copy elementary_functions_f.def ..\..\..\..\..\libs\elementary_functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;"
                        />
                </Configuration>
        </Configurations>
                        >
                </Filter>
                <Filter
-                       Name="Fortran Files"
+                       Name="Fortran files"
                        >
                        <File
                                RelativePath=".\arcosh.f"
                                >
                        </File>
                </Filter>
+               <Filter
+                       Name="Libraries Dependencies"
+                       >
+                       <File
+                               RelativePath=".\elementary_functions_Import.def"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\LibScilab_Import.def"
+                               >
+                       </File>
+               </Filter>
+               <File
+                       RelativePath="..\..\..\..\bin\blasplus.lib"
+                       >
+               </File>
                <File
                        RelativePath="..\..\sci_gateway\elementary_functions_gateway.xml"
                        >
                </File>
                <File
+                       RelativePath="..\..\..\..\bin\lapack.lib"
+                       >
+               </File>
+               <File
                        RelativePath="..\..\..\..\bin\libf2c.lib"
                        >
                </File>
diff --git a/scilab/modules/elementary_functions/src/fortran/elementary_functions_f_header.def b/scilab/modules/elementary_functions/src/fortran/elementary_functions_f_header.def
new file mode 100644 (file)
index 0000000..3e40425
--- /dev/null
@@ -0,0 +1,7 @@
+LIBRARY    elementary_functions_f.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; elementary_functions_f
+; --------------------------------------- 
diff --git a/scilab/modules/elementary_functions/src/fortran/linpack/Elementary_functions_Import.def b/scilab/modules/elementary_functions/src/fortran/linpack/Elementary_functions_Import.def
new file mode 100644 (file)
index 0000000..295468d
--- /dev/null
@@ -0,0 +1,7 @@
+       LIBRARY    elementary_functions.dll
+
+
+EXPORTS
+;
+;elementary_functions
+dcoeff_
diff --git a/scilab/modules/elementary_functions/src/fortran/linpack/Elementary_functions_f_Import.def b/scilab/modules/elementary_functions/src/fortran/linpack/Elementary_functions_f_Import.def
new file mode 100644 (file)
index 0000000..52d0296
--- /dev/null
@@ -0,0 +1,25 @@
+       LIBRARY    elementary_functions_f.dll
+
+
+EXPORTS
+;
+;elementary_functions_f
+dmcopy_
+dmmul_
+dclmat_
+cerr_
+coef_
+sdot_
+wdotci_
+wdotcr_
+waxpy_
+wmul_
+wdiv_
+wrscal_
+wsign_
+wasum_
+wscal_
+iwamax_
+wmmul_
+wclmat_
+wcerr_
\ No newline at end of file
index d1a380b..79cd565 100644 (file)
@@ -3,30 +3,9 @@
 
 EXPORTS
 ;
-;elementary_functions_f
-dmmul_
-dclmat_
-cerr_
-dmcopy_
-wmmul_
-wclmat_
-wcerr_
-dcoeff_
-coef_
-;
-iwamax_
-wdiv_
-wscal_
-waxpy_
-wasum_
-wsign_
-wrscal_
-wmul_
-wdotcr_
-wdotci_
-sdot_
-;
 ;cacsd_f
 dgeco_
 wgesl_
-wgeco_
\ No newline at end of file
+wgeco_
+;
+;core
index f4fee01..b934d50 100644 (file)
@@ -6,7 +6,7 @@
        <Configurations>
                <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linpack_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linpack_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib elementary_functions_f.lib elementary_functions.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -17,12 +17,14 @@ copy linpack_f.def ..\linpack_f.vcdef &gt;nul
 del *.def &gt;nul
 cd ..
 copy linpack_f_header.def+linpack_f.vcdef linpack_f.def &gt;nul" Description="Build linpack.def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linpack_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linpack_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib elementary_functions_f.lib elementary_functions.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -33,12 +35,14 @@ copy linpack_f.def ..\linpack_f.vcdef &gt;nul
 del *.def &gt;nul
 cd ..
 copy linpack_f_header.def+linpack_f.vcdef linpack_f.def &gt;nul" Description="Build linpack.def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linpack_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linpack_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib elementary_functions_f.lib elementary_functions.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -49,12 +53,14 @@ copy linpack_f.def ..\linpack_f.vcdef &gt;nul
 del *.def &gt;nul
 cd ..
 copy linpack_f_header.def+linpack_f.vcdef linpack_f.def &gt;nul" Description="Build linpack.def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linpack_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="linpack_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib elementary_functions_f.lib elementary_functions.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -65,7 +71,9 @@ copy linpack_f.def ..\linpack_f.vcdef &gt;nul
 del *.def &gt;nul
 cd ..
 copy linpack_f_header.def+linpack_f.vcdef linpack_f.def &gt;nul" Description="Build linpack.def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
index d07c3ea..bf96a0c 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                        />
                        <Tool
                                Name="VCPreBuildEventTool"
-                               Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL"
+                               Description="Build dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL"
                                ExecutionBucket="2"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        />
-
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
@@ -51,6 +50,9 @@
                                ExecutionBucket="5"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                ExecutionBucket="6"
                                Optimization="0"
@@ -80,7 +82,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                ExecutionBucket="10"
-                               AdditionalDependencies="Libscilab.lib"
+                               AdditionalDependencies="Libscilab.lib elementary_functions_f.lib elementary_functions.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="linpack_f.def"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL"
+                               Description="Build dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Libscilab.lib"
+                               AdditionalDependencies="Libscilab.lib elementary_functions_f.lib elementary_functions.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="linpack_f.def"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL"
+                               Description="Build dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Libscilab.lib"
+                               AdditionalDependencies="Libscilab.lib elementary_functions_f.lib elementary_functions.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="linpack_f.def"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL"
+                               Description="Build dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Libscilab.lib"
+                               AdditionalDependencies="Libscilab.lib elementary_functions_f.lib elementary_functions.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="linpack_f.def"
                                >
                        </File>
                        <File
+                               RelativePath=".\dpofa.f"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\dqrdc.f"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\util.f"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\wcopy.f"
                                >
                        </File>
                        >
                </File>
                <File
-                       RelativePath=".\dpofa.f"
-                       >
-               </File>
-               <File
                        RelativePath="..\..\..\..\..\bin\lapack.lib"
                        >
                </File>
                        RelativePath="..\..\..\..\..\bin\libf2c.lib"
                        >
                </File>
-               <File
-                       RelativePath=".\util.f"
-                       >
-               </File>
        </Files>
        <Globals>
        </Globals>
diff --git a/scilab/modules/elementary_functions/src/fortran/slatec/Elementary_functions_f_Import.def b/scilab/modules/elementary_functions/src/fortran/slatec/Elementary_functions_f_Import.def
new file mode 100644 (file)
index 0000000..ab60f1e
--- /dev/null
@@ -0,0 +1,8 @@
+       LIBRARY    elementary_functions_f.dll
+
+
+EXPORTS
+;
+;elementary_functions_f
+i1mach_
+d1mach_
index 02302b6..6cecf4b 100644 (file)
@@ -6,7 +6,7 @@
        <Configurations>
                <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slatec_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slatec_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -17,12 +17,13 @@ copy slatec_f.def ..\slatec_f.vcdef &gt;nul
 del *.def &gt;nul
 cd ..
 copy slatec_f_header.def+slatec_f.vcdef slatec_f.def &gt;nul" Description="Build slatec.def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slatec_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slatec_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -33,12 +34,13 @@ copy slatec_f.def ..\slatec_f.vcdef &gt;nul
 del *.def &gt;nul
 cd ..
 copy slatec_f_header.def+slatec_f.vcdef slatec_f.def &gt;nul" Description="Build slatec.def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slatec_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slatec_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -49,12 +51,13 @@ copy slatec_f.def ..\slatec_f.vcdef &gt;nul
 del *.def &gt;nul
 cd ..
 copy slatec_f_header.def+slatec_f.vcdef slatec_f.def &gt;nul" Description="Build slatec.def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slatec_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slatec_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -65,7 +68,8 @@ copy slatec_f.def ..\slatec_f.vcdef &gt;nul
 del *.def &gt;nul
 cd ..
 copy slatec_f_header.def+slatec_f.vcdef slatec_f.def &gt;nul" Description="Build slatec.def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
index ea116e3..a4613c8 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL"
                                ExecutionBucket="2"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        />
-
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
@@ -51,6 +50,9 @@
                                ExecutionBucket="5"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                ExecutionBucket="6"
                                Optimization="0"
@@ -81,7 +83,7 @@
                                Name="VCLinkerTool"
                                ExecutionBucket="10"
                                AdditionalOptions="/ignore:4049"
-                               AdditionalDependencies="Libscilab.lib"
+                               AdditionalDependencies="Libscilab.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="slatec_f.def"
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/ignore:4049"
-                               AdditionalDependencies="Libscilab.lib"
+                               AdditionalDependencies="Libscilab.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="slatec_f.def"
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/ignore:4049"
-                               AdditionalDependencies="Libscilab.lib"
+                               AdditionalDependencies="Libscilab.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="slatec_f.def"
                        <Tool
                                Name="VCPreBuildEventTool"
                                Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/ignore:4049"
-                               AdditionalDependencies="Libscilab.lib"
+                               AdditionalDependencies="Libscilab.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="slatec_f.def"
index 94e4917..2cbf33d 100644 (file)
@@ -51,6 +51,9 @@ c
       double precision anorm,alpha,bvecr,bveci,bbvec,rn,zero,c(41)
       logical fail
 c
+cDEC$ IF DEFINED (FORDLL)
+cDEC$ ATTRIBUTES DLLIMPORT:: /dcoeff/
+cDEC$ ENDIF
       common /dcoeff/ c,ndng
 c
       data zero /0.0d+0/
index 40e1751..0e3efde 100644 (file)
@@ -21,5 +21,3 @@ getrhsvar_
 gettype_
 vstk_
 
-;elementary_functions_f
- dset_
\ No newline at end of file
index 5a8943e..74043ae 100644 (file)
@@ -16,12 +16,9 @@ funs_
 objvide_
 stackp_
 cremat_
-unsfdcopy_
 getfun_
 putid_
-isort_
 namstr_
-iset_
 cvname_
 clunit_
 checkval_
index 5df3841..017453d 100644 (file)
@@ -12,7 +12,6 @@ cha1_
 gettype_
 getmatdims_
 freeArrayOfString
-dsort_
 check_dims
 numopt_
 check_scalar
diff --git a/scilab/modules/integer/src/fortran/Elementary_functions_f_Import.def b/scilab/modules/integer/src/fortran/Elementary_functions_f_Import.def
new file mode 100644 (file)
index 0000000..6375a9c
--- /dev/null
@@ -0,0 +1,10 @@
+       LIBRARY    elementary_functions_f.dll
+
+
+EXPORTS
+;
+;elementary_functions_f
+iset_
+dset_
+getorient_
+mtlbsel_
index d4844d3..4e0385c 100644 (file)
@@ -23,13 +23,7 @@ EXPORTS
  crewimat_
  checkrhs_
  checklhs_
- unsfdcopy_
- dset_
- iset_
  funnam_
- int2db_
- mtlbsel_
- getorient_
  gettype_
  indxg_
  
index c2ef2c3..4295fc4 100644 (file)
@@ -6,7 +6,7 @@
        <Configurations>
                <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="integer_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib integer.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="integer_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib integer.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -18,12 +18,13 @@ del *.def &gt;nul
 cd ..
 copy integer_f_header.def+integer_f.vcdef integer_f.def &gt;nul" Description="Build integer.def"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="integer_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib integer.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="integer_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib integer.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -35,12 +36,13 @@ del *.def &gt;nul
 cd ..
 copy integer_f_header.def+integer_f.vcdef integer_f.def &gt;nul" Description="Build integer.def"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="integer_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib integer.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="integer_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib integer.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -52,12 +54,13 @@ del *.def &gt;nul
 cd ..
 copy integer_f_header.def+integer_f.vcdef integer_f.def &gt;nul" Description="Build integer.def"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="integer_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib integer.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="integer_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib integer.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -69,7 +72,8 @@ del *.def &gt;nul
 cd ..
 copy integer_f_header.def+integer_f.vcdef integer_f.def &gt;nul" Description="Build integer.def"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
+lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
index 1cd77aa..dc82e9a 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                        />
                        <Tool
                                Name="VCPreBuildEventTool"
-                               Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               Description="Build dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                                ExecutionBucket="2"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                        />
-
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
@@ -51,6 +50,9 @@
                                ExecutionBucket="5"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCCLCompilerTool"
                                ExecutionBucket="6"
                                Optimization="0"
@@ -80,7 +82,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                ExecutionBucket="10"
-                               AdditionalDependencies="Libscilab.lib integer.lib"
+                               AdditionalDependencies="Libscilab.lib integer.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="integer_f.def"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               Description="Build dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Libscilab.lib integer.lib"
+                               AdditionalDependencies="Libscilab.lib integer.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="2"
                                ModuleDefinitionFile="integer_f.def"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               Description="Build dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Libscilab.lib integer.lib"
+                               AdditionalDependencies="Libscilab.lib integer.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="integer_f.def"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               Description="Build Libscilab.lib (dependencies)"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               Description="Build dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Integer_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)integer.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL"
                        />
                        <Tool
                                Name="VCCustomBuildTool"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Libscilab.lib integer.lib"
+                               AdditionalDependencies="Libscilab.lib integer.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="integer_f.def"
diff --git a/scilab/modules/io/src/fortran/Elementary_functions_f_Import.def b/scilab/modules/io/src/fortran/Elementary_functions_f_Import.def
new file mode 100644 (file)
index 0000000..e4f6955
--- /dev/null
@@ -0,0 +1,10 @@
+       LIBRARY    elementary_functions_f.dll
+
+
+EXPORTS
+;
+;elementary_functions_f
+rat_
+mtran_
+entier_
+lnblnk_
index f893c81..58d1459 100644 (file)
@@ -48,13 +48,3 @@ savlod_
 dbasin_
 basin_
 ;
-;elementary_functions_f
-;
-unsfdcopy_
-mtran_
-entier_
-rea2db_
-iset_
-isort_
-lnblnk_
-rat_
index 02b73b3..36e99bf 100644 (file)
@@ -6,7 +6,7 @@
        <Configurations>
                <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib output_stream_f.lib io.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib output_stream_f.lib io.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -19,12 +19,13 @@ cd ..
 copy io_f_header.def+io_f.vcdef io_f.def &gt;nul" Description="Build io.def"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+lib /DEF:&quot;$(InputDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Parallelization="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib output_stream_f.lib io.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib output_stream_f.lib io.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -37,12 +38,13 @@ cd ..
 copy io_f_header.def+io_f.vcdef io_f.def &gt;nul" Description="Build io.def"/>
                                <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+lib /DEF:&quot;$(InputDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)Elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib output_stream_f.lib io.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib output_stream_f.lib io.lib elementary_functions_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                            &n