replug dynamic load of modules 99/5299/7
Antoine ELIAS [Mon, 24 Oct 2011 14:09:54 +0000 (16:09 +0200)]
Change-Id: Ice0c1bf5c7446072550de4cea883e52ec4c4e391

309 files changed:
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/etc/classpath.xml.vc
scilab/etc/modules.xml.vc
scilab/libs/dynamiclibrary/Makefile.am
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/dynamiclibrary/dynamiclibrary.vcxproj
scilab/libs/dynamiclibrary/dynamiclibrary.vcxproj.filters
scilab/libs/dynamiclibrary/includes/dynamiclibrary_others.h
scilab/libs/dynamiclibrary/includes/dynamiclibrary_windows.h
scilab/libs/dynamiclibrary/localization_Import.def [new file with mode: 0644]
scilab/libs/dynamiclibrary/src/dynamiclibrary_others.c
scilab/libs/dynamiclibrary/src/dynamiclibrary_windows.c
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/includes/action_binding_gw.hxx
scilab/modules/action_binding/sci_gateway/action_binding_gateway.xml
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.cpp
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj.filters
scilab/modules/action_binding/src/noaction_binding/noaction_binding.cpp
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/ast/Makefile.am
scilab/modules/ast/Makefile.in
scilab/modules/ast/ast.vcxproj
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/includes/dynlib_boolean.h [new file with mode: 0644]
scilab/modules/boolean/includes/gw_boolean.h
scilab/modules/boolean/includes/vect_and.h [moved from scilab/modules/boolean/src/c/vect_and.h with 84% similarity]
scilab/modules/boolean/includes/vect_or.h [moved from scilab/modules/boolean/src/c/vect_or.h with 84% similarity]
scilab/modules/boolean/sci_gateway/c/gw_boolean.c [deleted file]
scilab/modules/boolean/sci_gateway/c/sci_and.c
scilab/modules/boolean/sci_gateway/c/sci_bool2s.c [deleted file]
scilab/modules/boolean/sci_gateway/c/sci_find.c [deleted file]
scilab/modules/boolean/sci_gateway/c/sci_or.c
scilab/modules/boolean/sci_gateway/fortran/sci_f_bool2s.f [deleted file]
scilab/modules/boolean/sci_gateway/fortran/sci_f_find.f [deleted file]
scilab/modules/boolean/src/c/LibScilab_Import.def [deleted file]
scilab/modules/boolean/src/c/boolean.vcxproj
scilab/modules/boolean/src/c/boolean.vcxproj.filters
scilab/modules/boolean/src/c/boolean_f_Import.def [deleted file]
scilab/modules/boolean/src/c/matboolean.c [deleted file]
scilab/modules/boolean/src/cpp/boolean_gw.vcxproj
scilab/modules/boolean/src/cpp/boolean_gw.vcxproj.filters
scilab/modules/boolean/src/fortran/boolean_Import.def [deleted file]
scilab/modules/boolean/src/fortran/boolean_f.vfproj
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completion.vcxproj
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core_yasp.vcxproj
scilab/modules/core/src/c/callDynamicGateway.c [deleted file]
scilab/modules/core/src/c/callDynamicGateway.h [deleted file]
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/core/src/c/dynamic_parallel.c
scilab/modules/core/src/c/dynamic_tclsci.c
scilab/modules/core/src/c/gw_dynamic_generic.c
scilab/modules/core/src/c/gw_dynamic_generic.h
scilab/modules/core/src/cpp/core_gw.vcxproj
scilab/modules/core/src/cpp/core_gw.vcxproj.filters
scilab/modules/double/sci_gateway/c/gw_double.c
scilab/modules/dynamic_link/sci_gateway/cpp/dynamic_link_gw.vcxproj
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/basic_functions.h
scilab/modules/elementary_functions/includes/dynlib_elementary_functions_gw.h [new file with mode: 0644]
scilab/modules/elementary_functions/includes/elem_func_gw.hxx
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_expm.c
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/cacsd_f_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/eispack_f_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj.filters
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elementary_functions_f_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/libScilab_import.def
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/linpack_f_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters
scilab/modules/elementary_functions/src/c/gsort.h
scilab/modules/elementary_functions/src/cpp/elem_func/elementary_functions_f_Import.def
scilab/modules/elementary_functions/src/fortran/elementary_functions_Import.def
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_gw_Import.def [new file with mode: 0644]
scilab/modules/elementary_functions/src/fortran/linpack/Elementary_functions_Import.def
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcxproj
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcxproj.filters
scilab/modules/fileio/src/c/fprintfMat.h
scilab/modules/fileio/src/c/fscanfMat.h
scilab/modules/fileio/src/c/getrelativefilename.h
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/includes/functions_gw.hxx
scilab/modules/functions/sci_gateway/c/gw_functions.c
scilab/modules/functions/sci_gateway/cpp/functions_gw.cpp [deleted file]
scilab/modules/functions/sci_gateway/cpp/functions_gw.vcxproj
scilab/modules/functions/sci_gateway/cpp/functions_gw.vcxproj.filters
scilab/modules/functions/sci_gateway/functions_gateway.xml
scilab/modules/functions/xml/gateway.dtd
scilab/modules/functions_manager/Makefile.am
scilab/modules/functions_manager/Makefile.in
scilab/modules/functions_manager/functions_manager.vcxproj
scilab/modules/functions_manager/functions_manager.vcxproj.filters
scilab/modules/functions_manager/includes/dynamic_modules.hxx [new file with mode: 0644]
scilab/modules/functions_manager/includes/funcmanager.hxx
scilab/modules/functions_manager/includes/module_declaration.hxx
scilab/modules/functions_manager/src/cpp/callDynamicGateway.cpp [moved from scilab/modules/boolean/includes/matboolean.h with 60% similarity]
scilab/modules/functions_manager/src/cpp/callDynamicGateway.hxx [new file with mode: 0644]
scilab/modules/functions_manager/src/cpp/dynamic_modules.cpp [new file with mode: 0644]
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/includes/h5_readDataFromFile.h
scilab/modules/hdf5/includes/h5_writeDataToFile.h
scilab/modules/hdf5/includes/hdf5_gw.hxx
scilab/modules/hdf5/sci_gateway/c/gw_hdf5.c
scilab/modules/hdf5/sci_gateway/cpp/hdf5_gw.cpp [deleted file]
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/sci_gateway/hdf5_gateway.xml
scilab/modules/hdf5/src/c/DllmainHdf5.c
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/hdf5/src/c/hdf5.vcxproj.filters
scilab/modules/hdf5/src/cpp/dynhdf5.cpp [new file with mode: 0644]
scilab/modules/hdf5/src/cpp/dynhdf5.hxx [new file with mode: 0644]
scilab/modules/hdf5/src/cpp/h5_fileManagement.cpp [moved from scilab/modules/hdf5/src/c/h5_fileManagement.c with 94% similarity]
scilab/modules/hdf5/src/cpp/h5_readDataFromFile.cpp [moved from scilab/modules/hdf5/src/c/h5_readDataFromFile.c with 77% similarity]
scilab/modules/hdf5/src/cpp/h5_writeDataToFile.cpp [moved from scilab/modules/hdf5/src/c/h5_writeDataToFile.c with 79% similarity]
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/sci_gateway/c/gw_helptools.c
scilab/modules/helptools/sci_gateway/cpp/helptools_gw.cpp [deleted file]
scilab/modules/helptools/sci_gateway/helptools_gateway.xml
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/helptools/src/c/helptools.vcxproj.filters
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/includes/gw_history_manager.h
scilab/modules/history_manager/sci_gateway/cpp/history_manager_gw.vcxproj
scilab/modules/history_manager/src/c/history_manager.vcxproj
scilab/modules/history_manager/src/c/history_manager.vcxproj.filters
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/integer/includes/gw_integer.h
scilab/modules/integer/sci_gateway/c/gw_integer.c
scilab/modules/integer/src/c/integer.vcxproj
scilab/modules/integer/src/c/integer.vcxproj.filters
scilab/modules/integer/src/cpp/integer_gw.vcxproj
scilab/modules/integer/src/cpp/integer_gw.vcxproj.filters
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/includes/gw_io.h
scilab/modules/io/sci_gateway/c/gw_io.c
scilab/modules/io/sci_gateway/c/sci_getpid.c
scilab/modules/io/src/c/getpidc.c
scilab/modules/io/src/c/getpidc.h
scilab/modules/io/src/c/io.vcxproj
scilab/modules/io/src/c/io.vcxproj.filters
scilab/modules/io/src/cpp/io_f_Import.def [new file with mode: 0644]
scilab/modules/io/src/cpp/io_gw.vcxproj
scilab/modules/io/src/cpp/io_gw.vcxproj.filters
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/includes/gw_jvm.h
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/libjvm.vcxproj.filters
scilab/modules/jvm/sci_gateway/c/gw_jvm.c
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj.filters
scilab/modules/jvm/src/c/JVM_functions.h
scilab/modules/jvm/src/c/getLibrarypath.h
scilab/modules/jvm/src/c/system_setproperty.h
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra.c
scilab/modules/linear_algebra/sci_gateway/c/gw_linear_algebra2.c
scilab/modules/linear_algebra/sci_gateway/cpp/linear_algebra_gw.vcxproj
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/includes/gw_localization.h
scilab/modules/localization/sci_gateway/c/gw_localization.c
scilab/modules/localization/sci_gateway/cpp/localization_gw.vcxproj
scilab/modules/localization/sci_gateway/cpp/localization_gw.vcxproj.filters
scilab/modules/localization/src/localization.vcxproj
scilab/modules/localization/src/localization.vcxproj.filters
scilab/modules/matio/Makefile.am
scilab/modules/matio/Makefile.in
scilab/modules/matio/includes/dynlib_matio_gw.h [new file with mode: 0644]
scilab/modules/matio/includes/matio_gw.hxx
scilab/modules/matio/matio.vcxproj
scilab/modules/matio/matio.vcxproj.filters
scilab/modules/matio/sci_gateway/c/gw_matio.c
scilab/modules/matio/sci_gateway/cpp/matio_gw.cpp [deleted file]
scilab/modules/matio/sci_gateway/cpp/matio_gw.vcxproj
scilab/modules/matio/sci_gateway/cpp/matio_gw.vcxproj.filters
scilab/modules/matio/sci_gateway/matio_gateway.xml
scilab/modules/matio/src/c/CreateMatlabVariable.h
scilab/modules/matio/src/c/GetCharVariable.c
scilab/modules/matio/src/c/GetMatlabVariable.h
scilab/modules/matio/src/c/matfile_manager.h
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/mexlib/src/libmat/libmat.vcxproj
scilab/modules/mexlib/src/libmex/libmex.vcxproj
scilab/modules/mexlib/src/libmx/libmx.vcxproj
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/includes/gw_output_stream.h
scilab/modules/output_stream/sci_gateway/c/gw_output_stream.c
scilab/modules/output_stream/sci_gateway/cpp/output_stream_gw/output_stream_gw.vcxproj
scilab/modules/output_stream/sci_gateway/cpp/output_stream_gw/output_stream_gw.vcxproj.filters
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/output_stream/src/c/output_stream.vcxproj.filters
scilab/modules/parse/Makefile.am
scilab/modules/parse/Makefile.in
scilab/modules/parse/parse.vcxproj
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/includes/scinotes_gw.hxx
scilab/modules/scinotes/sci_gateway/c/gw_scinotes.c
scilab/modules/scinotes/sci_gateway/cpp/scinotes_gw.cpp [deleted file]
scilab/modules/scinotes/sci_gateway/scinotes_gateway.xml
scilab/modules/scinotes/src/c/scinotes.vcxproj
scilab/modules/scinotes/src/c/scinotes.vcxproj.filters
scilab/modules/scinotes/src/noscinotes/noscinotes_gw.cpp
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/includes/gw_signal.h
scilab/modules/signal_processing/includes/signal_gw.hxx
scilab/modules/signal_processing/sci_gateway/c/gw_signal.c
scilab/modules/signal_processing/sci_gateway/cpp/signal_gw.cpp [deleted file]
scilab/modules/signal_processing/sci_gateway/cpp/signal_processing_gw.vcxproj
scilab/modules/signal_processing/sci_gateway/cpp/signal_processing_gw.vcxproj.filters
scilab/modules/signal_processing/sci_gateway/signal_processing_gateway.xml
scilab/modules/signal_processing/src/c/signal_processing.vcxproj
scilab/modules/signal_processing/src/c/signal_processing.vcxproj.filters
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/includes/CdfBase.h [moved from scilab/modules/statistics/src/c/CdfBase.h with 96% similarity]
scilab/modules/statistics/includes/gw_statistics.h
scilab/modules/statistics/includes/sci_string_matrix.h [moved from scilab/modules/statistics/src/c/sci_string_matrix.h with 100% similarity]
scilab/modules/statistics/sci_gateway/c/gw_statistics.c
scilab/modules/statistics/sci_gateway/cpp/statistics_gw.cpp [deleted file]
scilab/modules/statistics/sci_gateway/cpp/statistics_gw.vcxproj
scilab/modules/statistics/sci_gateway/cpp/statistics_gw.vcxproj.filters
scilab/modules/statistics/sci_gateway/statistics_gateway.xml
scilab/modules/statistics/src/c/LibScilab_Import.def [deleted file]
scilab/modules/statistics/src/c/statistics.vcxproj
scilab/modules/statistics/src/c/statistics.vcxproj.filters
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/includes/gw_string.h
scilab/modules/string/sci_gateway/cpp/string_gw.vcxproj
scilab/modules/string/sci_gateway/cpp/string_gw.vcxproj.filters
scilab/modules/string/src/c/isalphanum.h
scilab/modules/string/src/c/isdigit.h
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/string/src/c/strsplitfunction.h
scilab/modules/symbol/Makefile.am
scilab/modules/symbol/Makefile.in
scilab/modules/symbol/symbol.vcxproj
scilab/modules/system_env/Makefile.am
scilab/modules/system_env/Makefile.in
scilab/modules/system_env/system_env.vcxproj
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/includes/dynlib_time_gw.h [new file with mode: 0644]
scilab/modules/time/includes/gw_time.h
scilab/modules/time/includes/time_gw.hxx
scilab/modules/time/sci_gateway/c/sci_getdate.c
scilab/modules/time/sci_gateway/cpp/time_gw.vcxproj
scilab/modules/time/sci_gateway/cpp/time_gw.vcxproj.filters
scilab/modules/time/src/c/getdate.c
scilab/modules/time/src/c/getdate.h
scilab/modules/time/time.vcxproj
scilab/modules/time/time.vcxproj.filters
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/includes/arrayof.hxx
scilab/modules/types/includes/callable.hxx
scilab/modules/types/includes/cpp_gateway_prototype.hxx
scilab/modules/types/includes/function.hxx
scilab/modules/types/includes/inspector.hxx
scilab/modules/types/sci_gateway/cpp/types_gw/types_gw.vcxproj
scilab/modules/types/src/cpp/function.cpp
scilab/modules/types/src/cpp/macrofile.cpp
scilab/modules/types/src/cpp/threadId.cpp
scilab/modules/types/types.vcxproj
scilab/modules/types/typesmacro/typesmacro.vcxproj
scilab/modules/windows_tools/src/c/windows_tools.vcxproj

index d6dbe8f..8847f7b 100644 (file)
@@ -70,7 +70,8 @@ COMMON_CPPFLAGS = -I$(top_srcdir)/modules/console/includes/ \
                                                -I$(top_srcdir)/modules/string/includes/ \
                                                -I$(top_srcdir)/modules/history_manager/includes/ \
                                                -I$(top_srcdir)/modules/threads/includes/ \
-                                               -I$(top_srcdir)/modules/api_scilab/includes/
+                                               -I$(top_srcdir)/modules/api_scilab/includes/ \
+                                               -I$(top_srcdir)/libs/dynamiclibrary/includes/
 
 scilab_bin_SOURCES             =       $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
                                                        $(top_srcdir)/modules/core/src/cpp/tasks.cpp
index c8681e2..284578c 100644 (file)
@@ -652,7 +652,8 @@ COMMON_CPPFLAGS = -I$(top_srcdir)/modules/console/includes/ \
                                                -I$(top_srcdir)/modules/string/includes/ \
                                                -I$(top_srcdir)/modules/history_manager/includes/ \
                                                -I$(top_srcdir)/modules/threads/includes/ \
-                                               -I$(top_srcdir)/modules/api_scilab/includes/
+                                               -I$(top_srcdir)/modules/api_scilab/includes/ \
+                                               -I$(top_srcdir)/libs/dynamiclibrary/includes/
 
 scilab_bin_SOURCES = $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
        $(top_srcdir)/modules/core/src/cpp/tasks.cpp $(am__append_3)
index 22bad54..cab7575 100644 (file)
@@ -536,6 +536,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func", "modules\elemen
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func_gw", "modules\elementary_functions\sci_gateway\cpp\elem_func_gw\elem_func_gw.vcxproj", "{9881F0CE-A1AC-4744-B709-7C1453A77B95}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
                {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
        EndProjectSection
 EndProject
@@ -550,6 +551,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symbol", "modules\symbol\symbol.vcxproj", "{2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcxproj", "{64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}"
+       ProjectSection(ProjectDependencies) = postProject
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+       EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "system_env", "modules\system_env\system_env.vcxproj", "{7CA60AEF-9AFA-4D06-AF28-613C0AA27640}"
        ProjectSection(ProjectDependencies) = postProject
@@ -571,6 +575,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io_gw", "modules\io\src\cpp\io_gw.vcxproj", "{719EC179-3AD3-4C6B-BBD8-B44C96B1A204}"
        ProjectSection(ProjectDependencies) = postProject
                {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
+               {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\xcos.vcxproj", "{494FA8C9-6C85-4175-BE4C-9A113C7A3278}"
@@ -686,6 +691,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_algebra_gw", "modules\linear_algebra\sci_gateway\cpp\linear_algebra_gw.vcxproj", "{EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "statistics_gw", "modules\statistics\sci_gateway\cpp\statistics_gw.vcxproj", "{EAE1009F-B967-43C4-9408-97A37EFA8678}"
+       ProjectSection(ProjectDependencies) = postProject
+               {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0} = {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}
+       EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-JAVA-tests", "modules\types\tests\java\types-JAVA-tests.vcxproj", "{3F4504A3-1116-40BD-9612-F5E83D09CC99}"
 EndProject
@@ -1715,6 +1723,14 @@ Global
                {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|Win32.Build.0 = Release|Win32
                {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|x64.ActiveCfg = Release|x64
                {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|x64.Build.0 = Release|x64
+               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.ActiveCfg = Debug|Win32
+               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.Build.0 = Debug|Win32
+               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.ActiveCfg = Debug|x64
+               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.Build.0 = Debug|x64
+               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.ActiveCfg = Release|Win32
+               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.Build.0 = Release|Win32
+               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.ActiveCfg = Release|x64
+               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.Build.0 = Release|x64
                {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|Win32.ActiveCfg = Debug|Win32
                {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|Win32.Build.0 = Debug|Win32
                {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|x64.ActiveCfg = Debug|x64
@@ -1963,14 +1979,6 @@ Global
                {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.Build.0 = Release|Win32
                {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.ActiveCfg = Release|x64
                {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.Build.0 = Release|x64
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.Build.0 = Debug|Win32
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.ActiveCfg = Debug|x64
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.Build.0 = Debug|x64
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.ActiveCfg = Release|Win32
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.Build.0 = Release|Win32
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.ActiveCfg = Release|x64
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.Build.0 = Release|x64
                {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|Win32.ActiveCfg = Debug|Win32
                {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.ActiveCfg = Debug|x64
                {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.ActiveCfg = Release|Win32
index 02f77e2..80a1290 100644 (file)
@@ -29,7 +29,7 @@ The option is "disableUnderMode" and can be:
 
 <!-- Mandatory on startup -->
 <path value="$SCILAB/thirdparty/flexdock-0.5.4.jar"/>
-<path value="$SCILAB/thirdparty/jrosetta-API.jar" disableUnderMode="NW"/>
+<path value="$SCILAB/thirdparty/jrosetta-API.jar"/>
 <path value="$SCILAB/thirdparty/jrosetta-engine.jar"/>
 <path value="$SCILAB/thirdparty/skinlf.jar"/>
 <path value="$SCILAB/thirdparty/looks-2.1.1.jar"/>
@@ -140,9 +140,12 @@ The option is "disableUnderMode" and can be:
 
 <!-- Console GUI dep -->
 <path value="$SCILAB/modules/history_manager/jar/org.scilab.modules.history_manager.jar" disableUnderMode="NW"/>
-<path value="$SCILAB/modules/completion/jar/org.scilab.modules.completion.jar" disableUnderMode="NW"/>
+    <path value="$SCILAB/modules/completion/jar/org.scilab.modules.completion.jar" load="onUse">
+        <load on="Console"/>
+        <load on="SciNotes"/>
+    </path>
 
-<path value="$SCILAB/modules/console/jar/org.scilab.modules.console.jar"/>
+    <path value="$SCILAB/modules/console/jar/org.scilab.modules.console.jar"/>
 
 <path value="$SCILAB/modules/localization/jar/org.scilab.modules.localization.jar"/>
 <path value="$SCILAB/modules/action_binding/jar/org.scilab.modules.action_binding.jar"/>
index d3aae78..d4a2a5e 100644 (file)
@@ -33,7 +33,6 @@
     <module name="localization" activate="yes"/>
     <module name="windows_tools" activate="yes"/>
     <module name="jvm" activate="yes"/>
-    <module name="functions" activate="yes"/>
     <module name="helptools" activate="yes"/>
     <module name="hdf5" activate="yes"/>
     <!-- <module name="xcos" activate="yes"/> -->
index 76a727f..2d71a24 100644 (file)
@@ -10,7 +10,10 @@ libscidynamiclibrary_la_includedir=$(pkgincludedir)
 libscidynamiclibrary_la_include_HEADERS = includes/dynamiclibrary_others.h \
 includes/dynamiclibrary.h
 
-libscidynamiclibrary_la_CFLAGS= -Isrc/ -I$(srcdir)/includes/
+libscidynamiclibrary_la_CFLAGS= \
+    -Isrc/ \
+    -I$(srcdir)/includes/ \
+    -I$(top_srcdir)/modules/string/includes
 
 pkglib_LTLIBRARIES = libscidynamiclibrary.la
 
index bf8706a..c26a750 100644 (file)
@@ -395,7 +395,11 @@ libscidynamiclibrary_la_includedir = $(pkgincludedir)
 libscidynamiclibrary_la_include_HEADERS = includes/dynamiclibrary_others.h \
 includes/dynamiclibrary.h
 
-libscidynamiclibrary_la_CFLAGS = -Isrc/ -I$(srcdir)/includes/
+libscidynamiclibrary_la_CFLAGS = \
+    -Isrc/ \
+    -I$(srcdir)/includes/ \
+    -I$(top_srcdir)/modules/string/includes
+
 pkglib_LTLIBRARIES = libscidynamiclibrary.la
 libscidynamiclibrary_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
 libscidynamiclibrary_la_SOURCES = $(DYNAMICLIBRARY_C_SOURCES)
index 5c5a141..8876611 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;../../modules/string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <TargetMachine>MachineX86</TargetMachine>
       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <AdditionalDependencies>scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PreLinkEvent>
+      <Command>lib /DEF:"$(ProjectDir)localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilocalization.lib" 1&gt;NUL 2&gt;NUL</Command>
+    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Midl>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;../../modules/string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <TargetMachine>MachineX64</TargetMachine>
       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <AdditionalDependencies>scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PreLinkEvent>
+      <Command>lib /DEF:"$(ProjectDir)localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilocalization.lib" 1&gt;NUL 2&gt;NUL</Command>
+    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;../../modules/string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <TargetMachine>MachineX86</TargetMachine>
       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <AdditionalDependencies>scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PreLinkEvent>
+      <Command>lib /DEF:"$(ProjectDir)localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilocalization.lib" 1&gt;NUL 2&gt;NUL</Command>
+    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;../../modules/string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <TargetMachine>MachineX64</TargetMachine>
       <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <AdditionalDependencies>scilocalization.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PreLinkEvent>
+      <Command>lib /DEF:"$(ProjectDir)localization_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)scilocalization.lib" 1&gt;NUL 2&gt;NUL</Command>
+    </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\dynamiclibrary_windows.c" />
     <ResourceCompile Include="dynamiclibrary.rc" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="localization_Import.def" />
     <None Include="Makefile.am" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\modules\localization\src\localization.vcxproj">
-      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
index 4b610d4..0364871 100644 (file)
@@ -13,6 +13,9 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
     </Filter>
+    <Filter Include="Libraries Dependencies">
+      <UniqueIdentifier>{20611a5a-1678-4c3a-88d5-8a3871459ec3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\dynamiclibrary_windows.c">
@@ -34,5 +37,8 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Makefile.am" />
+    <None Include="localization_Import.def">
+      <Filter>Libraries Dependencies</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
index dae14ff..852080a 100644 (file)
@@ -14,6 +14,7 @@
 #define __DYNAMICLIBRARY_OTHERS_H__
 
 #include <dlfcn.h>
+#include <wchar.h>
 #include "BOOL.h" /* BOOL */
 
 typedef void * DynLibHandle;
@@ -47,6 +48,35 @@ DynLibFuncPtr GetDynLibFuncPtr(DynLibHandle hInstance,char *funcName);
 */
 #define GetLastDynLibError() dlerror()
 
+
+typedef int (*PROC_GATEWAY) (void);
+
+typedef enum { DYN_GW_NO_ERROR = 0,
+DYN_GW_LOAD_LIBRARY_ERROR = 1,
+DYN_GW_PTR_FUNCTION_ERROR = 2,
+DYN_GW_CALL_FUNCTION_ERROR =3
+
+} dynamic_gateway_error_code;
+
+typedef enum { DYNLIB_NAME_FORMAT_AUTO = 0, 
+DYNLIB_NAME_FORMAT_1 = 1,
+DYNLIB_NAME_FORMAT_2 = 2,
+DYNLIB_NAME_FORMAT_3 = 3
+} dynlib_name_format;
+
+#define FORMATGATEWAYLIBNAME_1 L"%ls%ls"
+#define FORMATGATEWAYLIBNAME_2 L"sci%ls%ls"
+#define FORMATGATEWAYLIBNAME_3 L"libsci%ls%ls"
+
+/**
+* Build name of dynamic library based on module name
+* @param[in] module name
+* @param[in] generated dynamic lib name type
+* @return name of dynamic library
+*/
+wchar_t* buildModuleDynLibraryNameW(const wchar_t* _pwstModuleName, dynlib_name_format _iType);
+char* buildModuleDynLibraryName(const char* _pstModuleName, dynlib_name_format _iType);
+
 #endif /* __DYNAMICLIBRARY_OTHERS_H__ */
 
 
index 2488f86..621399c 100644 (file)
@@ -62,5 +62,34 @@ IMPORT_EXPORT_DYNAMICLIBRARY_DLL DynLibFuncPtr GetDynLibFuncPtrW(DynLibHandle _h
 */
 IMPORT_EXPORT_DYNAMICLIBRARY_DLL  wchar_t* GetLastDynLibError(void);
 
+
+typedef int (*PROC_GATEWAY) (void);
+
+typedef enum { DYN_GW_NO_ERROR = 0,
+DYN_GW_LOAD_LIBRARY_ERROR = 1,
+DYN_GW_PTR_FUNCTION_ERROR = 2,
+DYN_GW_CALL_FUNCTION_ERROR =3
+
+} dynamic_gateway_error_code;
+
+typedef enum { DYNLIB_NAME_FORMAT_AUTO = 0, 
+DYNLIB_NAME_FORMAT_1 = 1,
+DYNLIB_NAME_FORMAT_2 = 2,
+DYNLIB_NAME_FORMAT_3 = 3
+} dynlib_name_format;
+
+#define FORMATGATEWAYLIBNAME_1 L"%ls%ls"
+#define FORMATGATEWAYLIBNAME_2 L"sci%ls%ls"
+#define FORMATGATEWAYLIBNAME_3 L"libsci%ls%ls"
+
+/**
+* Build name of dynamic library based on module name
+* @param[in] module name
+* @param[in] generated dynamic lib name type
+* @return name of dynamic library
+*/
+IMPORT_EXPORT_DYNAMICLIBRARY_DLL wchar_t* buildModuleDynLibraryNameW(const wchar_t* _pwstModuleName, dynlib_name_format _iType);
+IMPORT_EXPORT_DYNAMICLIBRARY_DLL char* buildModuleDynLibraryName(const char* _pstModuleName, dynlib_name_format _iType);
+
 #endif /* __DYNAMICLIBRARY_WINDOWS_H__ */
 
diff --git a/scilab/libs/dynamiclibrary/localization_Import.def b/scilab/libs/dynamiclibrary/localization_Import.def
new file mode 100644 (file)
index 0000000..15d9312
--- /dev/null
@@ -0,0 +1,6 @@
+LIBRARY    scilocalization.dll
+
+
+EXPORTS
+wide_string_to_UTF8
+to_wide_string
index 6654684..ae7d218 100644 (file)
 #include "dynamiclibrary_others.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdio.h>
+#include "machine.h"
+#include "os_swprintf.h"
+#include "MALLOC.h"
+#include "localization.h"
 /*---------------------------------------------------------------------------*/ 
 #ifndef NULL
 #define NULL 0
@@ -50,3 +55,60 @@ DynLibFuncPtr GetDynLibFuncPtr(DynLibHandle hInstance,char *funcName)
     return NULL;
 }
 /*---------------------------------------------------------------------------*/
+wchar_t* buildModuleDynLibraryNameW(const wchar_t* _pwstModuleName, dynlib_name_format _iType)
+{
+    wchar_t *pwstDynlibname = NULL;
+    int iLen = (int)(wcslen(_pwstModuleName) + wcslen(SHARED_LIB_EXTW)) + 1;//+1 for null
+    switch(_iType)
+    {
+    case DYNLIB_NAME_FORMAT_AUTO: 
+    default:
+#ifdef _MSC_VER
+        iLen = iLen + (int)wcslen(FORMATGATEWAYLIBNAME_1);
+#else
+        iLen = iLen + (int)wcslen(FORMATGATEWAYLIBNAME_3);
+#endif
+        pwstDynlibname = (wchar_t*)MALLOC(sizeof(wchar_t) * iLen);
+        if (iLen)
+        {
+            os_swprintf(pwstDynlibname, iLen, FORMATGATEWAYLIBNAME_1, _pwstModuleName, SHARED_LIB_EXTW);
+        }
+        break;
+    case DYNLIB_NAME_FORMAT_1:
+        iLen = iLen + (int)wcslen(FORMATGATEWAYLIBNAME_1) ;
+        pwstDynlibname = (wchar_t*)MALLOC(sizeof(wchar_t) * iLen);
+        if (pwstDynlibname)
+        {
+            os_swprintf(pwstDynlibname, iLen,FORMATGATEWAYLIBNAME_1, _pwstModuleName, SHARED_LIB_EXTW);
+        }
+        break;
+    case DYNLIB_NAME_FORMAT_2:
+        iLen = iLen + (int)wcslen(FORMATGATEWAYLIBNAME_2);
+        pwstDynlibname = (wchar_t*)MALLOC(sizeof(wchar_t) * iLen);
+        if (pwstDynlibname)
+        {
+            os_swprintf(pwstDynlibname, iLen, FORMATGATEWAYLIBNAME_2, _pwstModuleName, SHARED_LIB_EXTW);
+        }
+        break;
+    case DYNLIB_NAME_FORMAT_3:
+        iLen = iLen + (int)wcslen(FORMATGATEWAYLIBNAME_3);
+        pwstDynlibname = (wchar_t*)MALLOC(sizeof(wchar_t) * iLen);
+        if (pwstDynlibname)
+        {
+            os_swprintf(pwstDynlibname, iLen, FORMATGATEWAYLIBNAME_3, _pwstModuleName, SHARED_LIB_EXTW);
+        }
+        break;
+    }
+    return pwstDynlibname;
+}
+/*--------------------------------------------------------------------------*/
+char* buildModuleDynLibraryName(const char* _pstModuleName, dynlib_name_format _iType)
+{
+    wchar_t* pwstModuleName = to_wide_string(_pstModuleName);
+    wchar_t* pwstDynLibName = buildModuleDynLibraryNameW(pwstModuleName, _iType);
+    char* pstDynLibName = wide_string_to_UTF8(pwstDynLibName);
+    FREE(pwstModuleName);
+    FREE(pwstDynLibName);
+    return pstDynLibName;
+}
+/*--------------------------------------------------------------------------*/
index 17acb22..931d0f2 100644 (file)
@@ -14,6 +14,9 @@
 #include "dynamiclibrary_windows.h"
 #include "charEncoding.h"
 #include "MALLOC.h"
+#include "machine.h"
+#include "os_swprintf.h"
+
 /*---------------------------------------------------------------------------*/
 IMPORT_EXPORT_DYNAMICLIBRARY_DLL DynLibHandle LoadDynLibraryW(wchar_t *libname)
 {
@@ -77,3 +80,60 @@ IMPORT_EXPORT_DYNAMICLIBRARY_DLL wchar_t* GetLastDynLibError(void)
        return buffer;
 }
 /*---------------------------------------------------------------------------*/
+wchar_t* buildModuleDynLibraryNameW(const wchar_t* _pwstModuleName, dynlib_name_format _iType)
+{
+    wchar_t *pwstDynlibname = NULL;
+    int iLen = (int)(wcslen(_pwstModuleName) + wcslen(SHARED_LIB_EXTW)) + 1;//+1 for null
+    switch(_iType)
+    {
+    case DYNLIB_NAME_FORMAT_AUTO: 
+    default:
+#ifdef _MSC_VER
+        iLen = iLen + (int)wcslen(FORMATGATEWAYLIBNAME_1);
+#else
+        iLen = iLen + (int)wcslen(FORMATGATEWAYLIBNAME_3);
+#endif
+        pwstDynlibname = (wchar_t*)MALLOC(sizeof(wchar_t) * iLen);
+        if (iLen)
+        {
+            os_swprintf(pwstDynlibname, iLen, FORMATGATEWAYLIBNAME_1, _pwstModuleName, SHARED_LIB_EXTW);
+        }
+        break;
+    case DYNLIB_NAME_FORMAT_1:
+        iLen = iLen + (int)wcslen(FORMATGATEWAYLIBNAME_1) ;
+        pwstDynlibname = (wchar_t*)MALLOC(sizeof(wchar_t) * iLen);
+        if (pwstDynlibname)
+        {
+            os_swprintf(pwstDynlibname, iLen,FORMATGATEWAYLIBNAME_1, _pwstModuleName, SHARED_LIB_EXTW);
+        }
+        break;
+    case DYNLIB_NAME_FORMAT_2:
+        iLen = iLen + (int)wcslen(FORMATGATEWAYLIBNAME_2);
+        pwstDynlibname = (wchar_t*)MALLOC(sizeof(wchar_t) * iLen);
+        if (pwstDynlibname)
+        {
+            os_swprintf(pwstDynlibname, iLen, FORMATGATEWAYLIBNAME_2, _pwstModuleName, SHARED_LIB_EXTW);
+        }
+        break;
+    case DYNLIB_NAME_FORMAT_3:
+        iLen = iLen + (int)wcslen(FORMATGATEWAYLIBNAME_3);
+        pwstDynlibname = (wchar_t*)MALLOC(sizeof(wchar_t) * iLen);
+        if (pwstDynlibname)
+        {
+            os_swprintf(pwstDynlibname, iLen, FORMATGATEWAYLIBNAME_3, _pwstModuleName, SHARED_LIB_EXTW);
+        }
+        break;
+    }
+    return pwstDynlibname;
+}
+/*--------------------------------------------------------------------------*/
+char* buildModuleDynLibraryName(const char* _pstModuleName, dynlib_name_format _iType)
+{
+    wchar_t* pwstModuleName = to_wide_string(_pstModuleName);
+    wchar_t* pwstDynLibName = buildModuleDynLibraryNameW(pwstModuleName, _iType);
+    char* pstDynLibName = wide_string_to_UTF8(pwstDynLibName);
+    FREE(pwstModuleName);
+    FREE(pwstDynLibName);
+    return pstDynLibName;
+}
+/*--------------------------------------------------------------------------*/
index 50b93b4..7cb5e8a 100644 (file)
@@ -60,7 +60,8 @@ libsciaction_binding_disable_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/ast/includes \
     -I$(top_srcdir)/modules/symbol/includes \
     -I$(top_srcdir)/modules/system_env/includes \
-    -I$(top_srcdir)/modules/types/includes
+    -I$(top_srcdir)/modules/types/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 # Includes need for the compilation
 libsciaction_binding_la_CFLAGS= \
@@ -90,7 +91,8 @@ libsciaction_binding_la_CPPFLAGS= \
     -I$(top_srcdir)/modules/ast/includes \
     -I$(top_srcdir)/modules/system_env/includes \
     -I$(top_srcdir)/modules/types/includes \
-       -I$(top_srcdir)/modules/commons/src/jni/
+       -I$(top_srcdir)/modules/commons/src/jni/ \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
index 459e8f3..b14bade 100644 (file)
@@ -484,7 +484,8 @@ libsciaction_binding_disable_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/ast/includes \
     -I$(top_srcdir)/modules/symbol/includes \
     -I$(top_srcdir)/modules/system_env/includes \
-    -I$(top_srcdir)/modules/types/includes
+    -I$(top_srcdir)/modules/types/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 
 # Includes need for the compilation
@@ -516,7 +517,8 @@ libsciaction_binding_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/ast/includes \
     -I$(top_srcdir)/modules/system_env/includes \
     -I$(top_srcdir)/modules/types/includes \
-       -I$(top_srcdir)/modules/commons/src/jni/
+       -I$(top_srcdir)/modules/commons/src/jni/ \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
index f7808df..81a51f7 100644 (file)
 #ifndef __ACTION_BINDING_GW_HXX__
 #define __ACTION_BINDING_GW_HXX__
 
-#include "dynlib_action_binding_gw.h"
-
 #include "cpp_gateway_prototype.hxx"
 
-class ActionBindingModule
+extern "C"
 {
-private :
-    ActionBindingModule() {};
-    ~ActionBindingModule() {};
-
-public :
-       ACTION_BINDING_GW_IMPEXP static int Load();
-};
+    #include "dynlib_action_binding_gw.h"
+}
 
-CPP_GATEWAY_PROTOTYPE(sci_notify);
+CPP_GATEWAY_PROTOTYPE_EXPORT(sci_notify, ACTION_BINDING_GW_IMPEXP);
 
 #endif /* !__ACTION_BINDING_GW_HXX__ */
index 2c87df1..da4fea5 100644 (file)
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
-<GATEWAY name="action_binding">
-<!-- =================== -->
+<!DOCTYPE module SYSTEM "../../functions/xml/gateway.dtd">
 <!--
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2011 - DIGITEO - Antoine ELIAS
+ *
+ *  This file must be used under the terms of the CeCILL.
+ *  This source file is licensed as described in the file COPYING, which
+ *  you should have received as part of this distribution.  The terms
+ *  are also available at
+ *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
  Scilab
  Interface description. In this file, we define the list of the function which
  will be available into Scilab and the link to the "native" function.
 
- gatewayId is the position in the hashtable 'Interfaces' defined in the
- file SCI/modules/core/src/c/callinterf.h
-
- primitiveId is the position in the hashtable '<module>Table Tab[]' defined
- in the file modules/<module>/sci_gateway/c/gw_<module>.c
-
- primitiveName is the name of the Scilab function
-
- @author Allan SIMON
- @date DIGITEO 2010
- ===================
  Don't touch if you do not know what you are doing
 -->
-<!-- =================== -->
-
-<PRIMITIVE gatewayId="65" primitiveId="1" primitiveName="notify" />
-</GATEWAY>
+<module name="action_binding">
+    <gateway name="sci_notify" function="notify" type="1"/>
+</module>
index 30d6485..f6c072c 100644 (file)
  *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-
-#include "action_binding_gw.hxx"
-#include "context.hxx"
-#include "types.hxx"
-
-extern "C"
-{
-#include "dynlib_action_binding.h"
-}
-
-#define MODULE_NAME L"action_binding"
-
-int ActionBindingModule::Load()
-{
-    symbol::Context::getInstance()->AddFunction(types::Function::createFunction(L"notify", &sci_notify, MODULE_NAME));
-    return 1;
-}
index b789ab1..e6e3618 100644 (file)
@@ -81,7 +81,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="action_binding_gw.cpp" />
     <ClCompile Include="sci_notify.cpp" />
   </ItemGroup>
   <ItemGroup>
index 3d4dabe..9f06d18 100644 (file)
@@ -14,9 +14,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="action_binding_gw.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_notify.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
index 6972fc3..717f532 100644 (file)
@@ -9,10 +9,3 @@
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-
-#include "action_binding_gw.hxx"
-
-int ActionBindingModule::Load()
-{
-       return true;
-}
index 5a5a2bc..d895030 100644 (file)
@@ -7,48 +7,50 @@
 
 
 API_SCILAB_CPP_SOURCES = \
-src/cpp/api_boolean.cpp \
-src/cpp/api_boolean_sparse.cpp \
-src/cpp/api_common.cpp \
-src/cpp/api_double.cpp \
-src/cpp/api_int.cpp \
-src/cpp/api_list.cpp \
-src/cpp/api_poly.cpp \
-src/cpp/api_sparse.cpp \
-src/cpp/api_string.cpp \
-src/cpp/api_pointer.cpp \
-src/cpp/api_oldstack.cpp \
-src/cpp/api_error.cpp \
-src/cpp/overload.cpp
-
-
-libsciapi_scilab_la_CFLAGS=-I$(srcdir)/includes/ \
--I$(srcdir)/src/c/ \
--I$(top_srcdir)/modules/core/includes \
--I$(top_srcdir)/modules/call_scilab/includes \
--I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(top_srcdir)/modules/localization/includes \
--I$(top_srcdir)/modules/output_stream/includes \
--I$(top_srcdir)/modules/string/includes \
--I$(top_srcdir)/modules/types/includes \
--I$(top_srcdir)/modules/symbol/includes \
--I$(top_srcdir)/modules/ast/includes \
--I$(top_srcdir)/modules/operations/includes
-
-libsciapi_scilab_la_CPPFLAGS=-I$(srcdir)/includes/ \
--I$(srcdir)/src/cpp/ \
--I$(top_srcdir)/modules/core/includes \
--I$(top_srcdir)/modules/call_scilab/includes \
--I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(top_srcdir)/modules/localization/includes \
--I$(top_srcdir)/modules/output_stream/includes \
--I$(top_srcdir)/modules/operations/includes \
--I$(top_srcdir)/modules/types/includes \
--I$(top_srcdir)/modules/symbol/includes \
--I$(top_srcdir)/modules/ast/includes \
--I$(top_srcdir)/modules/elementary_functions/includes \
--I$(top_srcdir)/modules/string/includes
-
+    src/cpp/api_boolean.cpp \
+    src/cpp/api_boolean_sparse.cpp \
+    src/cpp/api_common.cpp \
+    src/cpp/api_double.cpp \
+    src/cpp/api_int.cpp \
+    src/cpp/api_list.cpp \
+    src/cpp/api_poly.cpp \
+    src/cpp/api_sparse.cpp \
+    src/cpp/api_string.cpp \
+    src/cpp/api_pointer.cpp \
+    src/cpp/api_oldstack.cpp \
+    src/cpp/api_error.cpp \
+    src/cpp/overload.cpp
+
+
+libsciapi_scilab_la_CFLAGS= \
+    -I$(srcdir)/includes/ \
+    -I$(srcdir)/src/c/ \
+    -I$(top_srcdir)/modules/core/includes \
+    -I$(top_srcdir)/modules/call_scilab/includes \
+    -I$(top_srcdir)/libs/MALLOC/includes/ \
+    -I$(top_srcdir)/modules/localization/includes \
+    -I$(top_srcdir)/modules/output_stream/includes \
+    -I$(top_srcdir)/modules/string/includes \
+    -I$(top_srcdir)/modules/types/includes \
+    -I$(top_srcdir)/modules/symbol/includes \
+    -I$(top_srcdir)/modules/ast/includes \
+    -I$(top_srcdir)/modules/operations/includes
+
+libsciapi_scilab_la_CPPFLAGS= \
+    -I$(srcdir)/includes/ \
+    -I$(srcdir)/src/cpp/ \
+    -I$(top_srcdir)/modules/core/includes \
+    -I$(top_srcdir)/modules/call_scilab/includes \
+    -I$(top_srcdir)/libs/MALLOC/includes/ \
+    -I$(top_srcdir)/modules/localization/includes \
+    -I$(top_srcdir)/modules/output_stream/includes \
+    -I$(top_srcdir)/modules/operations/includes \
+    -I$(top_srcdir)/modules/types/includes \
+    -I$(top_srcdir)/modules/symbol/includes \
+    -I$(top_srcdir)/modules/ast/includes \
+    -I$(top_srcdir)/modules/elementary_functions/includes \
+    -I$(top_srcdir)/modules/string/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 pkglib_LTLIBRARIES = libsciapi_scilab.la
 
index f8d1108..1ee062d 100644 (file)
@@ -407,46 +407,49 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 yacc_present = @yacc_present@
 API_SCILAB_CPP_SOURCES = \
-src/cpp/api_boolean.cpp \
-src/cpp/api_boolean_sparse.cpp \
-src/cpp/api_common.cpp \
-src/cpp/api_double.cpp \
-src/cpp/api_int.cpp \
-src/cpp/api_list.cpp \
-src/cpp/api_poly.cpp \
-src/cpp/api_sparse.cpp \
-src/cpp/api_string.cpp \
-src/cpp/api_pointer.cpp \
-src/cpp/api_oldstack.cpp \
-src/cpp/api_error.cpp \
-src/cpp/overload.cpp
-
-libsciapi_scilab_la_CFLAGS = -I$(srcdir)/includes/ \
--I$(srcdir)/src/c/ \
--I$(top_srcdir)/modules/core/includes \
--I$(top_srcdir)/modules/call_scilab/includes \
--I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(top_srcdir)/modules/localization/includes \
--I$(top_srcdir)/modules/output_stream/includes \
--I$(top_srcdir)/modules/string/includes \
--I$(top_srcdir)/modules/types/includes \
--I$(top_srcdir)/modules/symbol/includes \
--I$(top_srcdir)/modules/ast/includes \
--I$(top_srcdir)/modules/operations/includes
-
-libsciapi_scilab_la_CPPFLAGS = -I$(srcdir)/includes/ \
--I$(srcdir)/src/cpp/ \
--I$(top_srcdir)/modules/core/includes \
--I$(top_srcdir)/modules/call_scilab/includes \
--I$(top_srcdir)/libs/MALLOC/includes/ \
--I$(top_srcdir)/modules/localization/includes \
--I$(top_srcdir)/modules/output_stream/includes \
--I$(top_srcdir)/modules/operations/includes \
--I$(top_srcdir)/modules/types/includes \
--I$(top_srcdir)/modules/symbol/includes \
--I$(top_srcdir)/modules/ast/includes \
--I$(top_srcdir)/modules/elementary_functions/includes \
--I$(top_srcdir)/modules/string/includes
+    src/cpp/api_boolean.cpp \
+    src/cpp/api_boolean_sparse.cpp \
+    src/cpp/api_common.cpp \
+    src/cpp/api_double.cpp \
+    src/cpp/api_int.cpp \
+    src/cpp/api_list.cpp \
+    src/cpp/api_poly.cpp \
+    src/cpp/api_sparse.cpp \
+    src/cpp/api_string.cpp \
+    src/cpp/api_pointer.cpp \
+    src/cpp/api_oldstack.cpp \
+    src/cpp/api_error.cpp \
+    src/cpp/overload.cpp
+
+libsciapi_scilab_la_CFLAGS = \
+    -I$(srcdir)/includes/ \
+    -I$(srcdir)/src/c/ \
+    -I$(top_srcdir)/modules/core/includes \
+    -I$(top_srcdir)/modules/call_scilab/includes \
+    -I$(top_srcdir)/libs/MALLOC/includes/ \
+    -I$(top_srcdir)/modules/localization/includes \
+    -I$(top_srcdir)/modules/output_stream/includes \
+    -I$(top_srcdir)/modules/string/includes \
+    -I$(top_srcdir)/modules/types/includes \
+    -I$(top_srcdir)/modules/symbol/includes \
+    -I$(top_srcdir)/modules/ast/includes \
+    -I$(top_srcdir)/modules/operations/includes
+
+libsciapi_scilab_la_CPPFLAGS = \
+    -I$(srcdir)/includes/ \
+    -I$(srcdir)/src/cpp/ \
+    -I$(top_srcdir)/modules/core/includes \
+    -I$(top_srcdir)/modules/call_scilab/includes \
+    -I$(top_srcdir)/libs/MALLOC/includes/ \
+    -I$(top_srcdir)/modules/localization/includes \
+    -I$(top_srcdir)/modules/output_stream/includes \
+    -I$(top_srcdir)/modules/operations/includes \
+    -I$(top_srcdir)/modules/types/includes \
+    -I$(top_srcdir)/modules/symbol/includes \
+    -I$(top_srcdir)/modules/ast/includes \
+    -I$(top_srcdir)/modules/elementary_functions/includes \
+    -I$(top_srcdir)/modules/string/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 pkglib_LTLIBRARIES = libsciapi_scilab.la
 libsciapi_scilab_la_LDFLAGS = -version-number $(SCILAB_LIBRARY_VERSION)
index cdfe92e..e5ca702 100644 (file)
@@ -77,7 +77,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -120,7 +120,7 @@ cd .. &gt;nul
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -164,7 +164,7 @@ cd .. &gt;nul
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -217,7 +217,7 @@ cd .. &gt;nul
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes;../operations/includes;../output_stream/includes;../localization/includes;../../libs/intl;../types/includes;../symbol/includes;../ast/includes;../elementary_functions/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;API_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 5848501..ecc4a64 100644 (file)
 pkglib_LTLIBRARIES     = libsciast.la
 
 libsciast_la_SOURCES = \
-                               src/cpp/libAst.cpp \
-                               src/cpp/visitor_common.cpp \
-                               src/cpp/printvisitor.cpp \
-                               src/cpp/debugvisitor.cpp \
-                               src/cpp/mutevisitor.cpp \
-                               src/cpp/shortcutvisitor.cpp \
-                               src/cpp/scilabexception.cpp
+       src/cpp/libAst.cpp \
+       src/cpp/visitor_common.cpp \
+       src/cpp/printvisitor.cpp \
+       src/cpp/debugvisitor.cpp \
+       src/cpp/mutevisitor.cpp \
+       src/cpp/shortcutvisitor.cpp \
+       src/cpp/scilabexception.cpp
 
 libsciast_la_CXXFLAGS = \
-       -I includes \
-       -I src/cpp \
-    -I $(top_srcdir)/modules/symbol/includes \
-       -I $(top_srcdir)/modules/types/includes \
-       -I $(top_srcdir)/modules/functions_manager/includes \
-       -I $(top_srcdir)/modules/elementary_functions/includes \
-       -I $(top_srcdir)/modules/operations/includes \
-       -I $(top_srcdir)/modules/output_stream/includes \
-       -I $(top_srcdir)/modules/system_env/includes \
-       -I $(top_srcdir)/modules/api_scilab/includes \
-       -I $(top_srcdir)/modules/string/includes \
-       -I $(top_srcdir)/modules/threads/includes
-
+       -Iincludes \
+       -Isrc/cpp \
+    -I$(top_srcdir)/modules/symbol/includes \
+       -I$(top_srcdir)/modules/types/includes \
+       -I$(top_srcdir)/modules/functions_manager/includes \
+       -I$(top_srcdir)/modules/elementary_functions/includes \
+       -I$(top_srcdir)/modules/operations/includes \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/string/includes \
+       -I$(top_srcdir)/modules/threads/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 
 libsciast_la_includedir=$(pkgincludedir)/ast
@@ -44,21 +44,25 @@ libsciast_la_include_HEADERS =
 ####################
 ## Automated test ##
 ####################
-check_INCLUDES                 = -I$(top_srcdir)/modules/symbol/includes \
-                       -Iincludes/ \
-                       -Isrc/cpp
+check_INCLUDES = \
+    -I$(top_srcdir)/modules/symbol/includes \
+       -Iincludes/ \
+       -Isrc/cpp
 
-check_LDADD            = $(top_builddir)/modules/symbol/libsciSymbol.la \
-                       $(top_builddir)/modules/ast/libsciast.la \
-                       $(top_builddir)/modules/types/libsciTypes.la
+check_LDADD    = \
+    $(top_builddir)/modules/symbol/libsciSymbol.la \
+       $(top_builddir)/modules/ast/libsciast.la \
+       $(top_builddir)/modules/types/libsciTypes.la
 
-check_PROGRAMS                 =       testConstExp \
-                                                                                       testVarExp \
+check_PROGRAMS = \
+    testConstExp \
+       testVarExp \
                                                                                        testControlExp
 
-TESTS                  =       testConstExp \
-                                                       testVarExp \
-                                                       testControlExp
+TESTS = \
+    testConstExp \
+       testVarExp \
+       testControlExp
 
 testConstExp_SOURCES   = src/cpp/testConstExp.cpp
 testConstExp_CXXFLAGS  = $(check_INCLUDES)
index 6db0dad..a1332a5 100644 (file)
@@ -397,40 +397,43 @@ top_srcdir = @top_srcdir@
 yacc_present = @yacc_present@
 pkglib_LTLIBRARIES = libsciast.la
 libsciast_la_SOURCES = \
-                               src/cpp/libAst.cpp \
-                               src/cpp/visitor_common.cpp \
-                               src/cpp/printvisitor.cpp \
-                               src/cpp/debugvisitor.cpp \
-                               src/cpp/mutevisitor.cpp \
-                               src/cpp/shortcutvisitor.cpp \
-                               src/cpp/scilabexception.cpp
+       src/cpp/libAst.cpp \
+       src/cpp/visitor_common.cpp \
+       src/cpp/printvisitor.cpp \
+       src/cpp/debugvisitor.cpp \
+       src/cpp/mutevisitor.cpp \
+       src/cpp/shortcutvisitor.cpp \
+       src/cpp/scilabexception.cpp
 
 libsciast_la_CXXFLAGS = \
-       -I includes \
-       -I src/cpp \
-    -I $(top_srcdir)/modules/symbol/includes \
-       -I $(top_srcdir)/modules/types/includes \
-       -I $(top_srcdir)/modules/functions_manager/includes \
-       -I $(top_srcdir)/modules/elementary_functions/includes \
-       -I $(top_srcdir)/modules/operations/includes \
-       -I $(top_srcdir)/modules/output_stream/includes \
-       -I $(top_srcdir)/modules/system_env/includes \
-       -I $(top_srcdir)/modules/api_scilab/includes \
-       -I $(top_srcdir)/modules/string/includes \
-       -I $(top_srcdir)/modules/threads/includes
+       -Iincludes \
+       -Isrc/cpp \
+    -I$(top_srcdir)/modules/symbol/includes \
+       -I$(top_srcdir)/modules/types/includes \
+       -I$(top_srcdir)/modules/functions_manager/includes \
+       -I$(top_srcdir)/modules/elementary_functions/includes \
+       -I$(top_srcdir)/modules/operations/includes \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/string/includes \
+       -I$(top_srcdir)/modules/threads/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 libsciast_la_includedir = $(pkgincludedir)/ast
 libsciast_la_include_HEADERS = 
 
 ####################
 ####################
-check_INCLUDES = -I$(top_srcdir)/modules/symbol/includes \
-                       -Iincludes/ \
-                       -Isrc/cpp
-
-check_LDADD = $(top_builddir)/modules/symbol/libsciSymbol.la \
-                       $(top_builddir)/modules/ast/libsciast.la \
-                       $(top_builddir)/modules/types/libsciTypes.la
+check_INCLUDES = \
+    -I$(top_srcdir)/modules/symbol/includes \
+       -Iincludes/ \
+       -Isrc/cpp
+
+check_LDADD = \
+    $(top_builddir)/modules/symbol/libsciSymbol.la \
+       $(top_builddir)/modules/ast/libsciast.la \
+       $(top_builddir)/modules/types/libsciTypes.la
 
 testConstExp_SOURCES = src/cpp/testConstExp.cpp
 testConstExp_CXXFLAGS = $(check_INCLUDES)
index e92c1ed..fdf6d38 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../core/includes;..\elementary_functions\includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../core/includes;..\elementary_functions\includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../core/includes;..\elementary_functions\includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../core/includes;..\elementary_functions\includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;AST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../core/includes;..\elementary_functions\includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../core/includes;..\elementary_functions\includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../core/includes;..\elementary_functions\includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../core/includes;..\elementary_functions\includes;../operations/includes;../localization/includes;../../libs/intl;../output_stream/includes;../system_env/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;AST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index fd4151e..97cf3d4 100644 (file)
@@ -11,7 +11,6 @@ BOOLEAN_CPP_SOURCES = \
 
 
 BOOLEAN_C_SOURCES = \
-    src/c/matboolean.c \
     src/c/vect_or.c \
     src/c/vect_and.c
 
@@ -24,14 +23,9 @@ GATEWAY_CPP_SOURCES = \
 
 GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_and.c \
-    sci_gateway/c/sci_or.c \
-    sci_gateway/c/sci_find.c \
-    sci_gateway/c/sci_bool2s.c \
-    sci_gateway/c/gw_boolean.c
+    sci_gateway/c/sci_or.c
 
-GATEWAY_FORTRAN_SOURCES = \
-    sci_gateway/fortran/sci_f_bool2s.f \
-    sci_gateway/fortran/sci_f_find.f
+GATEWAY_FORTRAN_SOURCES =
 
 libsciboolean_la_CFLAGS= \
     -I$(srcdir)/includes/ \
@@ -50,8 +44,8 @@ libsciboolean_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/core/includes \
     -I$(top_srcdir)/modules/operations/includes \
     -I$(top_srcdir)/modules/output_stream/includes \
-    -I$(top_srcdir)/modules/api_scilab/includes
-
+    -I$(top_srcdir)/modules/api_scilab/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 
 pkglib_LTLIBRARIES = libsciboolean.la
index b8e9918..d3e6190 100644 (file)
@@ -110,8 +110,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
        "$(DESTDIR)$(libsciboolean_la_sci_gatewaydir)"
 LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 libsciboolean_algo_la_LIBADD =
-am__objects_1 = libsciboolean_algo_la-matboolean.lo \
-       libsciboolean_algo_la-vect_or.lo \
+am__objects_1 = libsciboolean_algo_la-vect_or.lo \
        libsciboolean_algo_la-vect_and.lo
 am__objects_2 = logic.lo find.lo
 am__objects_3 = libsciboolean_algo_la-boolean_gw.lo
@@ -120,15 +119,13 @@ am_libsciboolean_algo_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
        $(am__objects_3) $(am__objects_4)
 libsciboolean_algo_la_OBJECTS = $(am_libsciboolean_algo_la_OBJECTS)
 libsciboolean_la_DEPENDENCIES = libsciboolean-algo.la
-am__objects_5 = libsciboolean_la-sci_and.lo libsciboolean_la-sci_or.lo \
-       libsciboolean_la-sci_find.lo libsciboolean_la-sci_bool2s.lo \
-       libsciboolean_la-gw_boolean.lo
-am__objects_6 = sci_f_bool2s.lo sci_f_find.lo
+am__objects_5 = libsciboolean_la-sci_and.lo libsciboolean_la-sci_or.lo
+am__objects_6 =
 am_libsciboolean_la_OBJECTS = $(am__objects_5) $(am__objects_6)
 libsciboolean_la_OBJECTS = $(am_libsciboolean_la_OBJECTS)
-libsciboolean_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \
-       $(libsciboolean_la_LDFLAGS) $(LDFLAGS) -o $@
+libsciboolean_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsciboolean_la_CFLAGS) \
+       $(CFLAGS) $(libsciboolean_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -424,7 +421,6 @@ BOOLEAN_CPP_SOURCES = \
     src/cpp/boolean_gw.cpp
 
 BOOLEAN_C_SOURCES = \
-    src/c/matboolean.c \
     src/c/vect_or.c \
     src/c/vect_and.c
 
@@ -437,15 +433,9 @@ GATEWAY_CPP_SOURCES = \
 
 GATEWAY_C_SOURCES = \
     sci_gateway/c/sci_and.c \
-    sci_gateway/c/sci_or.c \
-    sci_gateway/c/sci_find.c \
-    sci_gateway/c/sci_bool2s.c \
-    sci_gateway/c/gw_boolean.c
-
-GATEWAY_FORTRAN_SOURCES = \
-    sci_gateway/fortran/sci_f_bool2s.f \
-    sci_gateway/fortran/sci_f_find.f
+    sci_gateway/c/sci_or.c
 
+GATEWAY_FORTRAN_SOURCES = 
 libsciboolean_la_CFLAGS = \
     -I$(srcdir)/includes/ \
     -I$(srcdir)/src/c/ \
@@ -463,7 +453,8 @@ libsciboolean_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/core/includes \
     -I$(top_srcdir)/modules/operations/includes \
     -I$(top_srcdir)/modules/output_stream/includes \
-    -I$(top_srcdir)/modules/api_scilab/includes
+    -I$(top_srcdir)/modules/api_scilab/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 pkglib_LTLIBRARIES = libsciboolean.la
 noinst_LTLIBRARIES = libsciboolean-algo.la
@@ -639,14 +630,10 @@ distclean-compile:
        -rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciboolean_algo_la-boolean_gw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciboolean_algo_la-matboolean.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciboolean_algo_la-sci_bool2s.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciboolean_algo_la-vect_and.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciboolean_algo_la-vect_or.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciboolean_la-gw_boolean.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciboolean_la-sci_and.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciboolean_la-sci_bool2s.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciboolean_la-sci_find.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciboolean_la-sci_or.Plo@am__quote@
 
 .c.o:
@@ -670,13 +657,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
-libsciboolean_algo_la-matboolean.lo: src/c/matboolean.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_algo_la_CPPFLAGS) $(CPPFLAGS) $(libsciboolean_algo_la_CFLAGS) $(CFLAGS) -MT libsciboolean_algo_la-matboolean.lo -MD -MP -MF $(DEPDIR)/libsciboolean_algo_la-matboolean.Tpo -c -o libsciboolean_algo_la-matboolean.lo `test -f 'src/c/matboolean.c' || echo '$(srcdir)/'`src/c/matboolean.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciboolean_algo_la-matboolean.Tpo $(DEPDIR)/libsciboolean_algo_la-matboolean.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/matboolean.c' object='libsciboolean_algo_la-matboolean.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_algo_la_CPPFLAGS) $(CPPFLAGS) $(libsciboolean_algo_la_CFLAGS) $(CFLAGS) -c -o libsciboolean_algo_la-matboolean.lo `test -f 'src/c/matboolean.c' || echo '$(srcdir)/'`src/c/matboolean.c
-
 libsciboolean_algo_la-vect_or.lo: src/c/vect_or.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_algo_la_CPPFLAGS) $(CPPFLAGS) $(libsciboolean_algo_la_CFLAGS) $(CFLAGS) -MT libsciboolean_algo_la-vect_or.lo -MD -MP -MF $(DEPDIR)/libsciboolean_algo_la-vect_or.Tpo -c -o libsciboolean_algo_la-vect_or.lo `test -f 'src/c/vect_or.c' || echo '$(srcdir)/'`src/c/vect_or.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciboolean_algo_la-vect_or.Tpo $(DEPDIR)/libsciboolean_algo_la-vect_or.Plo
@@ -705,27 +685,6 @@ libsciboolean_la-sci_or.lo: sci_gateway/c/sci_or.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(libsciboolean_la_CFLAGS) $(CFLAGS) -c -o libsciboolean_la-sci_or.lo `test -f 'sci_gateway/c/sci_or.c' || echo '$(srcdir)/'`sci_gateway/c/sci_or.c
 
-libsciboolean_la-sci_find.lo: sci_gateway/c/sci_find.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(libsciboolean_la_CFLAGS) $(CFLAGS) -MT libsciboolean_la-sci_find.lo -MD -MP -MF $(DEPDIR)/libsciboolean_la-sci_find.Tpo -c -o libsciboolean_la-sci_find.lo `test -f 'sci_gateway/c/sci_find.c' || echo '$(srcdir)/'`sci_gateway/c/sci_find.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciboolean_la-sci_find.Tpo $(DEPDIR)/libsciboolean_la-sci_find.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_find.c' object='libsciboolean_la-sci_find.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(libsciboolean_la_CFLAGS) $(CFLAGS) -c -o libsciboolean_la-sci_find.lo `test -f 'sci_gateway/c/sci_find.c' || echo '$(srcdir)/'`sci_gateway/c/sci_find.c
-
-libsciboolean_la-sci_bool2s.lo: sci_gateway/c/sci_bool2s.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(libsciboolean_la_CFLAGS) $(CFLAGS) -MT libsciboolean_la-sci_bool2s.lo -MD -MP -MF $(DEPDIR)/libsciboolean_la-sci_bool2s.Tpo -c -o libsciboolean_la-sci_bool2s.lo `test -f 'sci_gateway/c/sci_bool2s.c' || echo '$(srcdir)/'`sci_gateway/c/sci_bool2s.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciboolean_la-sci_bool2s.Tpo $(DEPDIR)/libsciboolean_la-sci_bool2s.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_bool2s.c' object='libsciboolean_la-sci_bool2s.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(libsciboolean_la_CFLAGS) $(CFLAGS) -c -o libsciboolean_la-sci_bool2s.lo `test -f 'sci_gateway/c/sci_bool2s.c' || echo '$(srcdir)/'`sci_gateway/c/sci_bool2s.c
-
-libsciboolean_la-gw_boolean.lo: sci_gateway/c/gw_boolean.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(libsciboolean_la_CFLAGS) $(CFLAGS) -MT libsciboolean_la-gw_boolean.lo -MD -MP -MF $(DEPDIR)/libsciboolean_la-gw_boolean.Tpo -c -o libsciboolean_la-gw_boolean.lo `test -f 'sci_gateway/c/gw_boolean.c' || echo '$(srcdir)/'`sci_gateway/c/gw_boolean.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libsciboolean_la-gw_boolean.Tpo $(DEPDIR)/libsciboolean_la-gw_boolean.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/gw_boolean.c' object='libsciboolean_la-gw_boolean.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciboolean_la_CPPFLAGS) $(CPPFLAGS) $(libsciboolean_la_CFLAGS) $(CFLAGS) -c -o libsciboolean_la-gw_boolean.lo `test -f 'sci_gateway/c/gw_boolean.c' || echo '$(srcdir)/'`sci_gateway/c/gw_boolean.c
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -776,12 +735,6 @@ logic.lo: src/fortran/logic.f
 find.lo: src/fortran/find.f
        $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o find.lo `test -f 'src/fortran/find.f' || echo '$(srcdir)/'`src/fortran/find.f
 
-sci_f_bool2s.lo: sci_gateway/fortran/sci_f_bool2s.f
-       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_f_bool2s.lo `test -f 'sci_gateway/fortran/sci_f_bool2s.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_f_bool2s.f
-
-sci_f_find.lo: sci_gateway/fortran/sci_f_find.f
-       $(LIBTOOL)  --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -c -o sci_f_find.lo `test -f 'sci_gateway/fortran/sci_f_find.f' || echo '$(srcdir)/'`sci_gateway/fortran/sci_f_find.f
-
 mostlyclean-libtool:
        -rm -f *.lo
 
diff --git a/scilab/modules/boolean/includes/dynlib_boolean.h b/scilab/modules/boolean/includes/dynlib_boolean.h
new file mode 100644 (file)
index 0000000..a0d25df
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - 2009 - Allan CORNET
+* 
+* 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
+*
+*/
+
+/*--------------------------------------------------------------------------*/ 
+#ifndef __DYNLIB_BOOLEAN_H__
+#define __DYNLIB_BOOLEAN_H__
+
+#ifdef _MSC_VER
+       #ifdef BOOLEAN_EXPORTS
+               #define BOOLEAN_IMPEXP __declspec(dllexport)
+       #else
+               #define BOOLEAN_IMPEXP __declspec(dllimport)
+       #endif
+#else
+       #define BOOLEAN_IMPEXP
+#endif
+
+#endif /* __DYNLIB_BOOLEAN_H__ */
+/*--------------------------------------------------------------------------*/ 
index 3331e52..6f0723c 100644 (file)
 #include "machine.h"
 #include "api_scilab.h"
 #include "c_gateway_prototype.h"
+#include "dynlib_boolean.h"
+#include "dynlib_boolean_gw.h"
 /*--------------------------------------------------------------------------*/
-int gw_boolean(void);
-/*--------------------------------------------------------------------------*/
-int C2F(intand)(char *fname,unsigned long fname_len);
-int C2F(sci_find)(char *fname,unsigned long fname_len);
-int C2F(sci_bool2s)(char *fname,unsigned long fname_len);
-
-//YaSp
 C_GATEWAY_PROTOTYPE(sci_or);
 C_GATEWAY_PROTOTYPE(sci_and);
 /*--------------------------------------------------------------------------*/
similarity index 84%
rename from scilab/modules/boolean/src/c/vect_and.h
rename to scilab/modules/boolean/includes/vect_and.h
index 2cbbdd5..6998f69 100644 (file)
@@ -9,6 +9,7 @@
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
+#include "dynlib_boolean.h"
 
 /**
  * @TODO add comment
@@ -19,4 +20,4 @@
  * @param r 
  * @param opt   
  */
-void vect_and(int *v,int m, int n,int *r,int opt);
+BOOLEAN_IMPEXP void vect_and(int *v,int m, int n,int *r,int opt);
similarity index 84%
rename from scilab/modules/boolean/src/c/vect_or.h
rename to scilab/modules/boolean/includes/vect_or.h
index b2cb60d..0f304e0 100644 (file)
@@ -9,7 +9,7 @@
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-
+#include "dynlib_boolean.h"
 /**
  * @TODO add comment
  *
@@ -19,4 +19,4 @@
  * @param r 
  * @param opt   
  */
-void vect_or(int *v,int m,int n,int *r,int opt);
+BOOLEAN_IMPEXP void vect_or(int *v,int m,int n,int *r,int opt);
diff --git a/scilab/modules/boolean/sci_gateway/c/gw_boolean.c b/scilab/modules/boolean/sci_gateway/c/gw_boolean.c
deleted file mode 100644 (file)
index 071bc85..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Allan CORNET
- * 
- * 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 <string.h>
-/*--------------------------------------------------------------------------*/
-#include "gw_boolean.h"
-#include "callFunctionFromGateway.h"
-/*--------------------------------------------------------------------------*/
-static gw_generic_table Tab[] =
-{
-       {C2F(sci_find),"find"},
-       {C2F(sci_bool2s),"bool2s"},
-       {NULL, ""}, //or
-       {NULL, ""} //and
-};
-/*--------------------------------------------------------------------------*/
-int gw_boolean(void)
-{  
-       callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
index 28b7b72..5d0dccc 100644 (file)
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "stack-c.h"
+#include "gw_boolean.h"
 #include "MALLOC.h"
 #include "Scierror.h"
 #include "vect_and.h"
diff --git a/scilab/modules/boolean/sci_gateway/c/sci_bool2s.c b/scilab/modules/boolean/sci_gateway/c/sci_bool2s.c
deleted file mode 100644 (file)
index e820719..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Allan CORNET
- * 
- * 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 "gw_boolean.h"
-/*--------------------------------------------------------------------------*/
-extern int C2F(intsbool2s)();
-/*--------------------------------------------------------------------------*/
-int C2F(sci_bool2s)(char *fname,unsigned long fname_len)
-{
-       C2F(intsbool2s)();
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/boolean/sci_gateway/c/sci_find.c b/scilab/modules/boolean/sci_gateway/c/sci_find.c
deleted file mode 100644 (file)
index f4ee913..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - Allan CORNET
- * 
- * 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 "gw_boolean.h"
-/*--------------------------------------------------------------------------*/
-extern int C2F(intfind)();
-/*--------------------------------------------------------------------------*/
-int C2F(sci_find)(char *fname,unsigned long fname_len)
-{
-       C2F(intfind)();
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
index 0b78ec1..6fede3f 100644 (file)
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "stack-c.h"
+#include "gw_boolean.h"
 #include "MALLOC.h"
 #include "Scierror.h"
 #include "vect_or.h"
diff --git a/scilab/modules/boolean/sci_gateway/fortran/sci_f_bool2s.f b/scilab/modules/boolean/sci_gateway/fortran/sci_f_bool2s.f
deleted file mode 100644 (file)
index 042f9a0..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-c     ==================================================
-
-c Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-c Copyright (C) INRIA
-c 
-c This file must be used under the terms of the CeCILL.
-c This source file is licensed as described in the file COPYING, which
-c you should have received as part of this distribution.  The terms
-c are also available at    
-c http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-
-c     ==================================================
-      subroutine intsbool2s
-      include 'stack.h'
-
-      logical ref
-      integer sadr,iadr
-c
-      iadr(l)=l+l-1
-      sadr(l)=(l/2)+1
-c
-      lw=lstk(top+1)
-c
-
-   10 if(rhs.ne.1) then
-         call error(39)
-         return
-      endif
-      if(lhs.ne.1) then
-         call error(39)
-         return
-      endif
-
-      il1=iadr(lstk(top))
-      ilr=il1
-      if(istk(il1).lt.0) il1=iadr(istk(il1+1))
-      ref=ilr.ne.il1
-      mn1=istk(il1+1)*istk(il1+2)
-      if (mn1.eq.0) return
-
-      if(istk(il1).eq.4) then
-
-c     argument is a full boolean matrix
-         lr=sadr(ilr+4)
-         err=lr+mn1-lstk(bot)
-         if(err.gt.0) then
-            call error(17)
-            return
-         endif
-
-         do 13 k=mn1-1,0,-1
-            stk(lr+k)=istk(il1+3+k)
- 13      continue
-         istk(ilr)=1
-         istk(ilr+1)=istk(il1+1)
-         istk(ilr+2)=istk(il1+2)
-         istk(ilr+3)=0
-         lstk(top+1)=lr+mn1
-      elseif(istk(il1).eq.6) then
-c     argument is a sparse boolean matrix
-         m1=istk(il1+1)
-         n1=istk(il1+2)
-         nel1=istk(il1+4)
-c   
-         if(ref) then
-            err=sadr(ilr+5+m1+nel1)+nel1-lstk(bot)
-            if(err.gt.0) then
-               call error(17)
-               return
-            endif
-            call icopy(m1+nel1,istk(il1+5),1,istk(ilr+5),1)
-         endif
-         lj=sadr(ilr+5+m1+nel1)
-         call dset(nel1,1.0d0,stk(lj),1)
-         istk(ilr)=5
-         istk(ilr+1)=istk(il1+1)
-         istk(ilr+2)=istk(il1+2)
-         istk(ilr+3)=0
-         istk(ilr+4)=nel1
-         lstk(top+1)=lj+nel1
-      elseif(istk(il1).eq.1) then
-         if(istk(il1+3).ne.0) then
-            call putfunnam('bool2s',top)
-            fun=-1
-            return
-         endif
-         
-         if(mn1.eq.0) then
-            istk(ilr)=1
-            istk(ilr+1)=0
-            istk(ilr+2)=0
-            istk(ilr+3)=0
-            lstk(top+1)=lr
-         else
-            l1=sadr(il1+4)
-            lr=sadr(ilr+4)
-            if(ref) then
-               err=lr+mn1-lstk(bot)
-               if(err.gt.0) then
-                  call error(17)
-                  return
-               endif
-            endif
-            do 20 k=mn1-1,0,-1
-               if(stk(l1+k).ne.0.0d0) then
-                  stk(lr+k)=1.0d0
-               else
-                  stk(lr+k)=0.0d0
-               endif
- 20         continue
-            istk(ilr)=1
-            istk(ilr+1)=istk(il1+1)
-            istk(ilr+2)=istk(il1+2)
-            istk(ilr+3)=0
-            lstk(top+1)=lr+mn1
-         endif
-      elseif(istk(il1).eq.5) then
-c     argument is a sparse matrix
-         m1=istk(il1+1)
-         n1=istk(il1+2)
-         nel1=istk(il1+4)
-         if(istk(il1+3).ne.0) then
-            call putfunnam('bool2s',top)
-            fun=-1
-            return
-         endif
-c
-         if(ref) then
-            err=sadr(ilr+5+m1+nel1)+nel1-lstk(bot)
-            if(err.gt.0) then
-               call error(17)
-               return
-            endif
-            call icopy(m1+nel1,istk(il1+5),1,istk(ilr+5),1)
-         endif
-         lj=sadr(ilr+5+m1+nel1)
-         call dset(nel1,1.0d0,stk(lj),1)
-         istk(ilr)=5
-         istk(ilr+1)=istk(il1+1)
-         istk(ilr+2)=istk(il1+2)
-         istk(ilr+3)=0
-         istk(ilr+4)=nel1
-         lstk(top+1)=lj+nel1
-      else
-         call putfunnam('bool2s',top)
-         fun=-1
-         return
-      endif
-      end
-c     ==================================================
-
-      
diff --git a/scilab/modules/boolean/sci_gateway/fortran/sci_f_find.f b/scilab/modules/boolean/sci_gateway/fortran/sci_f_find.f
deleted file mode 100644 (file)
index 3486d97..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-c     ==================================================
-
-c Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-c Copyright (C) -2011 - INRIA - Serge Steer
-c 
-c This file must be used under the terms of the CeCILL.
-c This source file is licensed as described in the file COPYING, which
-c you should have received as part of this distribution.  The terms
-c are also available at    
-c http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
-
-c     ==================================================
-      subroutine intfind
-      include 'stack.h'
-c
-      external gettype
-      integer gettype,vt,top0
-c
-      top0=top
-      if(rhs.ne.1.and.rhs.ne.2) then
-         call error(39)
-         return
-      endif
-
-      if(rhs.eq.2) then
-c     max number of index to find
-         call getrmat('find', top, top, m2, n2, l2)
-         if(err.gt.0.or.err1.gt.0)  return
-         nmax=stk(l2)
-         if(nmax.le.0.and.nmax.ne.-1) then
-            err=2
-            call error(116)
-            return
-         endif
-         top=top-1
-      else
-         nmax=-1
-      endif
-
-
-      vt=gettype(top)
-      if(vt.eq.1.or.vt.eq.4) then
-         call intsfind(nmax)
-      elseif(vt.eq.5.or.vt.eq.6) then
-         call intspfind(nmax)
-      else
-c     .  overloaded find
-         call putfunnam('find',top)
-         top=top0
-         fun=-1
-         return
-      endif
-      return
-      end
-c     ==================================================
diff --git a/scilab/modules/boolean/src/c/LibScilab_Import.def b/scilab/modules/boolean/src/c/LibScilab_Import.def
deleted file mode 100644 (file)
index c425cb5..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-       LIBRARY    Libscilab.dll
-
-
-EXPORTS
-;
-;core
-;
-stack_
-com_
-vstk_
-createvar_
-putlhsvar_
-intersci_
-iop_
-getrhsvar_
-overload_
-vartype_
-checklhs_
-checkrhs_
-callFunctionFromGateway
index aaedd57..049e0f2 100644 (file)
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <PreLinkEvent>
-      <Message>Build $(ProjectName).def</Message>
-      <Command>setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-$(SolutionDir)bin\dumpexts -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName)_Export.def &gt;nul
-del *.def &gt;nul
-cd ..
-
-</Command>
+      <Command>
+      </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>LibScilab.lib;boolean_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>boolean_Export.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
@@ -106,10 +95,10 @@ cd ..
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
     <PreBuildEvent>
-      <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)boolean_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)boolean_f.lib" 1&gt;NUL 2&gt;NUL
-</Command>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -124,22 +113,11 @@ lib /DEF:"$(ProjectDir)boolean_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <PreLinkEvent>
-      <Message>Build $(ProjectName).def</Message>
-      <Command>setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-$(SolutionDir)bin\dumpexts -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName)_Export.def &gt;nul
-del *.def &gt;nul
-cd ..
-
-</Command>
+      <Command>
+      </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>LibScilab.lib;boolean_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>boolean_Export.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
@@ -148,10 +126,10 @@ cd ..
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
     <PreBuildEvent>
-      <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)boolean_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)boolean_f.lib" 1&gt;NUL 2&gt;NUL
-</Command>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -165,23 +143,9 @@ lib /DEF:"$(ProjectDir)boolean_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
       <WarningLevel>Level3</WarningLevel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
-    <PreLinkEvent>
-      <Message>Build $(ProjectName).def</Message>
-      <Command>setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-$(SolutionDir)bin\dumpexts -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName)_Export.def &gt;nul
-del *.def &gt;nul
-cd ..
-
-</Command>
-    </PreLinkEvent>
+    <PreLinkEvent />
     <Link>
-      <AdditionalDependencies>LibScilab.lib;boolean_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>boolean_Export.def</ModuleDefinitionFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -192,10 +156,10 @@ cd ..
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
     <PreBuildEvent>
-      <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)boolean_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)boolean_f.lib" 1&gt;NUL 2&gt;NUL
-</Command>
+      <Command>
+      </Command>
+      <Message>
+      </Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -212,23 +176,9 @@ lib /DEF:"$(ProjectDir)boolean_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
       <WarningLevel>Level3</WarningLevel>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
-    <PreLinkEvent>
-      <Message>Build $(ProjectName).def</Message>
-      <Command>setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-$(SolutionDir)bin\dumpexts -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName)_Export.def &gt;nul
-del *.def &gt;nul
-cd ..
-
-</Command>
-    </PreLinkEvent>
+    <PreLinkEvent />
     <Link>
-      <AdditionalDependencies>LibScilab.lib;boolean_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>boolean_Export.def</ModuleDefinitionFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -239,31 +189,24 @@ cd ..
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
     </Link>
     <PreBuildEvent>
-      <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)boolean_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)boolean_f.lib" 1&gt;NUL 2&gt;NUL
-</Command>
+      <Command>
+      </Command>
+      <Message>
+      </Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="DllmainBoolean.c" />
-    <ClCompile Include="..\..\sci_gateway\c\gw_boolean.c" />
-    <ClCompile Include="matboolean.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_and.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_bool2s.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_find.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_or.c" />
     <ClCompile Include="vect_and.c" />
     <ClCompile Include="vect_or.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="vect_and.h" />
-    <ClInclude Include="vect_or.h" />
+    <ClInclude Include="..\..\includes\dynlib_boolean.h" />
+    <ClInclude Include="..\..\includes\vect_and.h" />
+    <ClInclude Include="..\..\includes\vect_or.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\locales\boolean.pot" />
-    <None Include="boolean_f_Import.def" />
-    <None Include="LibScilab_Import.def" />
     <None Include="..\..\boolean.iss" />
     <None Include="..\..\Makefile.am" />
   </ItemGroup>
index 1b029d7..4c66dcf 100644 (file)
     <Filter Include="localization">
       <UniqueIdentifier>{8f6c9d89-6623-4ca0-82a0-1b3f216e71bd}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Libraries Dependencies">
-      <UniqueIdentifier>{db6b18f6-6ded-4b54-a08f-886668f69653}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Libraries Dependencies\Imports">
-      <UniqueIdentifier>{bdd1e514-ed54-45e6-9e38-146da92c1894}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{d3d6fc04-eeff-42c8-9ac1-f20fb74b6b26}</UniqueIdentifier>
     </Filter>
     <ClCompile Include="DllmainBoolean.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\gw_boolean.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="matboolean.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_and.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_bool2s.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_find.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_or.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="vect_and.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="vect_and.h">
+    <ClInclude Include="..\..\includes\vect_and.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\includes\vect_or.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="vect_or.h">
+    <ClInclude Include="..\..\includes\dynlib_boolean.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="boolean_f_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
-    <None Include="LibScilab_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
     <None Include="..\..\boolean.iss" />
     <None Include="..\..\Makefile.am" />
     <None Include="..\..\locales\boolean.pot" />
diff --git a/scilab/modules/boolean/src/c/boolean_f_Import.def b/scilab/modules/boolean/src/c/boolean_f_Import.def
deleted file mode 100644 (file)
index 5afb68a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-       LIBRARY    boolean_f.dll
-
-
-EXPORTS
-;
-;boolean_f
-;
-intsbool2s_
-intfind_ 
diff --git a/scilab/modules/boolean/src/c/matboolean.c b/scilab/modules/boolean/src/c/matboolean.c
deleted file mode 100644 (file)
index 7c3e919..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) INRIA
-* 
-* 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 "MALLOC.h"
-#include "stack-c.h"
-#include "Scierror.h"
-#include "core_math.h"
-#include "matboolean.h"
-#include "BOOL.h"
-#include "localization.h"
-/*--------------------------------------------------------------------------*/
-int C2F(matlog)(void)
-{
-       static int or = 57;
-       static int non = 61;
-
-       static int j= 0;
-       static double e1, e2;
-
-       static int i1, i2, l1, l2, m2, n2, m1, n1, op, lw, il1, il2, mn2, it1, it2, mn1, top0;
-
-       top0 = Top;
-       op = Fin;
-       lw = C2F(vstk).lstk[Top] + 1;
-
-       if (Rhs == 2)
-       {
-               il2 = C2F(vstk).lstk[Top - 1] + C2F(vstk).lstk[Top - 1] - 1;
-               if (*istk(il2) < 0) 
-               {
-                       il2 = iadr(*istk(il2+1));
-               }
-               m2 = *istk(il2 + 1);
-               n2 = *istk(il2 + 2);
-               it2 = *istk(il2 + 3);
-               l2 = (il2 + 4) / 2 + 1;
-               mn2 = m2 * n2;
-               --Top;
-       }
-
-       il1 = C2F(vstk).lstk[Top - 1] + C2F(vstk).lstk[Top - 1] - 1;
-       if (*istk(il1) < 0) 
-       {
-               il1 = iadr(*istk(il1+1));
-       }
-       m1 = *istk(il1 + 1);
-       n1 = *istk(il1 + 2);
-       it1 = *istk(il1 + 3);
-
-       l1 = (il1 + 4) / 2 + 1;
-       mn1 = m1 * n1;
-       if (Fin == non) 
-       {
-               if (mn1 == 0) 
-               {
-                       *istk(il1) = 1;
-                       *istk(il1 + 1) = 0;
-                       *istk(il1 + 2) = 0;
-                       *istk(il1 + 3) = 0;
-
-                       C2F(vstk).lstk[Top] = (il1 + 4) / 2 + 1;
-                       return 0;
-               }
-               else
-               {
-                       *istk(il1) = 4;
-                       for (j = 0; j <= mn1 - 1; ++j) 
-                       {
-                               e1 = *stk(l1 + j);
-                               if (e1 == 0.) 
-                               {
-                                       *istk(il1 + 3 + j) = 1;
-                               }
-                               else
-                               {
-                                       *istk(il1 + 3 + j) = 0;
-                               }
-                       }
-                       C2F(vstk).lstk[Top] = (il1 + 3 + mn1) / 2 + 1;
-               }
-       }
-       else
-       {
-               BOOL *matBool = NULL;
-               if (mn1 == 0 || mn2 == 0) 
-               {
-                       *istk(il1) = 1;
-                       *istk(il1 + 1) = 0;
-                       *istk(il1 + 2) = 0;
-                       *istk(il1 + 3) = 0;
-
-                       C2F(vstk).lstk[Top] = (il1 + 4) / 2 + 1;
-                       return 0;
-               }
-
-               if (mn1 == 1) 
-               {
-                       i1 = 0;
-                       mn1 = mn2;
-               }
-               else 
-               {
-                       i1 = 1;
-               }
-
-               if (mn2 == 1) 
-               {
-                       i2 = 0;
-                       mn2 = mn1;
-               }
-               else 
-               {
-                       i2 = 1;
-               }
-
-               if (mn1 != mn2) 
-               {
-                       SciError(60);
-                       return 0;
-               }
-
-               matBool = (BOOL*)MALLOC(sizeof(BOOL) * mn1);
-               if (matBool == NULL)
-               {
-                       if (Fin == or) 
-                       {
-                               Scierror(999,_("%s: No more memory.\n"),"boolean operation '|'");
-                       }
-                       else
-                       {
-                               Scierror(999,_("%s: No more memory.\n"),"boolean operation '&'");
-                       }
-                       return 0;
-               }
-
-               if (Fin == or) 
-               {
-                       for (j = 0; j <= mn1 - 1; ++j) 
-                       {
-                               int j_m_i1 = (int)(j * i1);
-                               int j_m_i2 = (int)(j * i2);
-
-                               int e1tmp = (int)*stk(l1 + j_m_i1);
-                               int e2tmp = (int)*stk(l2 + j_m_i2);
-
-                               if (e1tmp || e2tmp) 
-                               {
-                                       matBool[j] = TRUE;
-                               }
-                               else 
-                               {
-                                       matBool[j] = FALSE;
-                               }
-                       }
-               }
-               else
-               {
-                       for (j = 0; j <= mn1 - 1; ++j) 
-                       {
-                               int j_m_i1 = (int)(j * i1);
-                               int j_m_i2 = (int)(j * i2);
-
-                               int e1tmp = (int)*stk(l1 + j_m_i1);
-                               int e2tmp = (int)*stk(l2 + j_m_i2);
-
-                               if (e1tmp && e2tmp) 
-                               {
-                                       matBool[j] = TRUE;
-                               }
-                               else
-                               {
-                                       matBool[j] = FALSE;
-                               }
-                       }
-               }
-
-               for (j = 0; j <= mn1 - 1; ++j) 
-               {
-                       *istk(il1 + 3 + j) = (int)matBool[j];
-               }
-
-               FREE(matBool);
-               matBool = NULL;
-
-               *istk(il1) = 4;
-               *istk(il1 + 1) = Max(m1,m2);
-               *istk(il1 + 2) = Max(n1,n2);
-
-               C2F(vstk).lstk[Top] = (il1 + 3 + mn1) / 2 + 1;
-               return 0;
-       }
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
-
-
index 82e0acd..74386d4 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BOOLEAN_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BOOLEAN_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BOOLEAN_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BOOLEAN_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_bool2s.cpp" />
+    <ClCompile Include="..\..\sci_gateway\c\sci_and.c" />
+    <ClCompile Include="..\..\sci_gateway\c\sci_or.c" />
     <ClCompile Include="boolean_gw.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\boolean_gw.hxx" />
     <ClInclude Include="..\..\includes\dynlib_boolean_gw.h" />
+    <ClInclude Include="..\..\includes\gw_boolean.h" />
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\..\..\..\bin\blasplus.lib" />
index 67df5fb..bbe315b 100644 (file)
     <ClCompile Include="..\..\sci_gateway\cpp\sci_bool2s.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\c\sci_and.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\c\sci_or.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\boolean_gw.hxx">
@@ -29,6 +35,9 @@
     <ClInclude Include="..\..\includes\dynlib_boolean_gw.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\includes\gw_boolean.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\..\..\..\bin\blasplus.lib" />
diff --git a/scilab/modules/boolean/src/fortran/boolean_Import.def b/scilab/modules/boolean/src/fortran/boolean_Import.def
deleted file mode 100644 (file)
index 4711867..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY    boolean.dll
-
-
-EXPORTS
index 394e185..e2d825c 100644 (file)
@@ -19,7 +19,6 @@ copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
 del *.def &gt;nul
 cd .." Description="Build $(ProjectName).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)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.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"/>
@@ -39,14 +38,13 @@ copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
 del *.def &gt;nul
 cd .." Description="Build $(ProjectName).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)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.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="boolean_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\boolean_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib boolean.lib elementary_functions.lib output_stream.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="boolean_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\boolean_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib elementary_functions.lib output_stream.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -59,7 +57,6 @@ copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
 del *.def &gt;nul
 cd .." Description="Build $(ProjectName).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)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Output_stream.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"/>
@@ -79,7 +76,6 @@ copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
 del *.def &gt;nul
 cd .." Description="Build $(ProjectName).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)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Output_stream.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"/>
@@ -87,17 +83,13 @@ lib /DEF:&quot;$(InputDir)Elementary_functions_Import.def&quot; /SUBSYSTEM:WINDO
        <Files>
                <Filter Name="Header Files" Filter="fi;fd"/>
                <Filter Name="Library Dependencies">
-               <File RelativePath=".\boolean_Import.def"/>
                <File RelativePath=".\Elementary_functions_Import.def"/>
                <File RelativePath=".\LibScilab_Import.def"/>
                <File RelativePath=".\Output_stream_Import.def"/></Filter>
                <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
                <File RelativePath=".\boolean_f.rc"/></Filter>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
-               <File RelativePath=".\find.f"/>
-               <File RelativePath=".\logic.f"/>
-               <File RelativePath="..\..\sci_gateway\fortran\sci_f_bool2s.f"/>
-               <File RelativePath="..\..\sci_gateway\fortran\sci_f_find.f"/></Filter>
+               <File RelativePath=".\logic.f"/></Filter>
                <File RelativePath="..\..\..\..\bin\blasplus.lib"/>
                <File RelativePath="..\..\..\..\bin\lapack.lib"/>
                <File RelativePath="..\..\Makefile.am"/></Files>
index 914ca93..1fb8c07 100644 (file)
@@ -50,21 +50,23 @@ libscicompletion_la_CFLAGS=         $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/operations/
 
-libscicompletion_la_CPPFLAGS=          $(JAVA_JNI_INCLUDE) \
-                               -I$(srcdir)/includes/ \
-                               -I$(srcdir)/src/c/ \
-                               -I$(srcdir)/src/cpp/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/symbol/includes/ \
-                               -I$(top_srcdir)/modules/ast/includes/ \
-                               -I$(top_srcdir)/modules/types/includes/ \
-                               -I$(top_srcdir)/modules/graphics/includes/ \
-                               -I$(top_srcdir)/modules/fileio/includes/ \
-                               -I$(top_srcdir)/modules/functions/includes/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/string/includes \
-                               -I$(top_srcdir)/modules/operations/includes
+libscicompletion_la_CPPFLAGS= \
+    $(JAVA_JNI_INCLUDE) \
+       -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/c/ \
+       -I$(srcdir)/src/cpp/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/symbol/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/ \
+       -I$(top_srcdir)/modules/types/includes/ \
+       -I$(top_srcdir)/modules/graphics/includes/ \
+       -I$(top_srcdir)/modules/fileio/includes/ \
+       -I$(top_srcdir)/modules/functions/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/string/includes \
+       -I$(top_srcdir)/modules/operations/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
index 4959ca1..54f86dd 100644 (file)
@@ -482,21 +482,23 @@ libscicompletion_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/operations/
 
-libscicompletion_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
-                               -I$(srcdir)/includes/ \
-                               -I$(srcdir)/src/c/ \
-                               -I$(srcdir)/src/cpp/ \
-                               -I$(top_srcdir)/libs/MALLOC/includes/ \
-                               -I$(top_srcdir)/modules/symbol/includes/ \
-                               -I$(top_srcdir)/modules/ast/includes/ \
-                               -I$(top_srcdir)/modules/types/includes/ \
-                               -I$(top_srcdir)/modules/graphics/includes/ \
-                               -I$(top_srcdir)/modules/fileio/includes/ \
-                               -I$(top_srcdir)/modules/functions/includes/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/string/includes \
-                               -I$(top_srcdir)/modules/operations/includes
+libscicompletion_la_CPPFLAGS = \
+    $(JAVA_JNI_INCLUDE) \
+       -I$(srcdir)/includes/ \
+       -I$(srcdir)/src/c/ \
+       -I$(srcdir)/src/cpp/ \
+       -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/symbol/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/ \
+       -I$(top_srcdir)/modules/types/includes/ \
+       -I$(top_srcdir)/modules/graphics/includes/ \
+       -I$(top_srcdir)/modules/fileio/includes/ \
+       -I$(top_srcdir)/modules/functions/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/string/includes \
+       -I$(top_srcdir)/modules/operations/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
index be0f380..3765e5d 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../cpp;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes;../../../functions/includes;../../../operations/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../cpp;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes;../../../functions/includes;../../../operations/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../cpp;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes;../../../functions/includes;../../../operations/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../cpp;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes;../../../functions/includes;../../../operations/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../cpp;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes;../../../functions/includes;../../../operations/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../cpp;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes;../../../functions/includes;../../../operations/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../cpp;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes;../../../functions/includes;../../../operations/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../cpp;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes;../../../functions/includes;../../../operations/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 0930533..745e47c 100644 (file)
@@ -138,7 +138,7 @@ libsciconsole_disable_la_CFLAGS = \
        -I$(top_srcdir)/modules/system_env/includes \
        -I$(top_srcdir)/modules/threads/includes \
        -I$(top_srcdir)/modules/string/includes \
-       -I$(top_srcdir)/modules/ui_data/includes/
+       -I$(top_srcdir)/modules/ui_data/includes/ 
 
 # Includes need for the compilation
 libsciconsole_la_CPPFLAGS = \
@@ -163,8 +163,8 @@ libsciconsole_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/symbol/includes \
        -I$(top_srcdir)/modules/string/includes \
-       -I$(top_srcdir)/modules/commons/src/jni
-
+       -I$(top_srcdir)/modules/commons/src/jni \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 
 # Includes need for the compilation
@@ -190,8 +190,9 @@ libsciconsole_disable_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/symbol/includes \
        -I$(top_srcdir)/modules/string/includes \
-       -I$(top_srcdir)/modules/commons/src/jni/
-
+       -I$(top_srcdir)/modules/commons/src/jni/ \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
+    
 # Includes need for the compilation
 libsciconsole_la_CFLAGS= \
     $(JAVA_JNI_INCLUDE) \
index 49d6e56..5773d44 100644 (file)
@@ -582,7 +582,7 @@ libsciconsole_disable_la_CFLAGS = \
        -I$(top_srcdir)/modules/system_env/includes \
        -I$(top_srcdir)/modules/threads/includes \
        -I$(top_srcdir)/modules/string/includes \
-       -I$(top_srcdir)/modules/ui_data/includes/
+       -I$(top_srcdir)/modules/ui_data/includes/ 
 
 
 # Includes need for the compilation
@@ -608,7 +608,8 @@ libsciconsole_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/symbol/includes \
        -I$(top_srcdir)/modules/string/includes \
-       -I$(top_srcdir)/modules/commons/src/jni
+       -I$(top_srcdir)/modules/commons/src/jni \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 
 # Includes need for the compilation
@@ -634,7 +635,8 @@ libsciconsole_disable_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/symbol/includes \
        -I$(top_srcdir)/modules/string/includes \
-       -I$(top_srcdir)/modules/commons/src/jni/
+       -I$(top_srcdir)/modules/commons/src/jni/ \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 
 # Includes need for the compilation
index a90dee0..29d5976 100644 (file)
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index a0920bc..cbe97d9 100644 (file)
@@ -53,7 +53,6 @@ CORE_C_SOURCES = \
     src/c/freeArrayOfString.c \
     src/c/getstaticdebuginfo.c \
     src/c/getdynamicdebuginfo.c \
-    src/c/callDynamicGateway.c \
     src/c/gw_dynamic_generic.c \
     src/c/dynamic_gateways.c \
     src/c/readGateway.c \
@@ -294,7 +293,8 @@ libscicore_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/string/includes/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(top_srcdir)/modules/threads/includes \
-    -I$(top_srcdir)/modules/fileio/includes
+    -I$(top_srcdir)/modules/fileio/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 # Used by sci_getdebuginfo:
 if TCLTK
index ae9ed59..71c0e50 100644 (file)
@@ -140,14 +140,13 @@ am__libscicore_algo_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.c \
        src/c/callFunctionFromGateway.c src/c/getvariablesname.c \
        src/c/commandwords.c src/c/freeArrayOfString.c \
        src/c/getstaticdebuginfo.c src/c/getdynamicdebuginfo.c \
-       src/c/callDynamicGateway.c src/c/gw_dynamic_generic.c \
-       src/c/dynamic_gateways.c src/c/readGateway.c \
-       src/c/comparehandles.c src/c/setPrecisionFPU.c \
-       src/c/LaunchScilabSignal.c src/c/getos.c src/c/mode_exec.c \
-       src/c/predef.c src/c/transposeMatrix.c \
-       src/c/recursionFunction.c src/c/typename.c \
-       src/c/inittypenames.c src/c/funcprot.c src/c/eqid.c \
-       src/c/exitCodeValue.c src/c/getversion.c \
+       src/c/gw_dynamic_generic.c src/c/dynamic_gateways.c \
+       src/c/readGateway.c src/c/comparehandles.c \
+       src/c/setPrecisionFPU.c src/c/LaunchScilabSignal.c \
+       src/c/getos.c src/c/mode_exec.c src/c/predef.c \
+       src/c/transposeMatrix.c src/c/recursionFunction.c \
+       src/c/typename.c src/c/inittypenames.c src/c/funcprot.c \
+       src/c/eqid.c src/c/exitCodeValue.c src/c/getversion.c \
        src/c/dynamic_tclsci.c src/c/dynamic_parallel.c \
        src/c/backtrace.c src/c/signal_mgmt.c src/c/scimem64.c \
        src/cpp/core_gw.cpp src/cpp/hashtable_core.cpp \
@@ -220,7 +219,6 @@ am__objects_2 = libscicore_algo_la-inffic.lo \
        libscicore_algo_la-freeArrayOfString.lo \
        libscicore_algo_la-getstaticdebuginfo.lo \
        libscicore_algo_la-getdynamicdebuginfo.lo \
-       libscicore_algo_la-callDynamicGateway.lo \
        libscicore_algo_la-gw_dynamic_generic.lo \
        libscicore_algo_la-dynamic_gateways.lo \
        libscicore_algo_la-readGateway.lo \
@@ -616,14 +614,13 @@ CORE_C_SOURCES = src/c/inffic.c src/c/cs2st.c src/c/intmacr2tree.c \
        src/c/callFunctionFromGateway.c src/c/getvariablesname.c \
        src/c/commandwords.c src/c/freeArrayOfString.c \
        src/c/getstaticdebuginfo.c src/c/getdynamicdebuginfo.c \
-       src/c/callDynamicGateway.c src/c/gw_dynamic_generic.c \
-       src/c/dynamic_gateways.c src/c/readGateway.c \
-       src/c/comparehandles.c src/c/setPrecisionFPU.c \
-       src/c/LaunchScilabSignal.c src/c/getos.c src/c/mode_exec.c \
-       src/c/predef.c src/c/transposeMatrix.c \
-       src/c/recursionFunction.c src/c/typename.c \
-       src/c/inittypenames.c src/c/funcprot.c src/c/eqid.c \
-       src/c/exitCodeValue.c src/c/getversion.c \
+       src/c/gw_dynamic_generic.c src/c/dynamic_gateways.c \
+       src/c/readGateway.c src/c/comparehandles.c \
+       src/c/setPrecisionFPU.c src/c/LaunchScilabSignal.c \
+       src/c/getos.c src/c/mode_exec.c src/c/predef.c \
+       src/c/transposeMatrix.c src/c/recursionFunction.c \
+       src/c/typename.c src/c/inittypenames.c src/c/funcprot.c \
+       src/c/eqid.c src/c/exitCodeValue.c src/c/getversion.c \
        src/c/dynamic_tclsci.c src/c/dynamic_parallel.c \
        src/c/backtrace.c src/c/signal_mgmt.c $(am__append_1)
 CORE_FORTRAN_SOURCES = src/fortran/clunit.f src/fortran/getlin.f \
@@ -781,7 +778,8 @@ libscicore_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/string/includes/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
     -I$(top_srcdir)/modules/threads/includes \
-    -I$(top_srcdir)/modules/fileio/includes
+    -I$(top_srcdir)/modules/fileio/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 pkglib_LTLIBRARIES = libscicore.la
 noinst_LTLIBRARIES = libscicore-algo.la
@@ -1005,7 +1003,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-TerminateCore.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-backtrace.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-banner.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-callDynamicGateway.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-callFunctionFromGateway.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-callinterf.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_algo_la-commandwords.Plo@am__quote@
@@ -1458,13 +1455,6 @@ libscicore_algo_la-getdynamicdebuginfo.lo: src/c/getdynamicdebuginfo.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -c -o libscicore_algo_la-getdynamicdebuginfo.lo `test -f 'src/c/getdynamicdebuginfo.c' || echo '$(srcdir)/'`src/c/getdynamicdebuginfo.c
 
-libscicore_algo_la-callDynamicGateway.lo: src/c/callDynamicGateway.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -MT libscicore_algo_la-callDynamicGateway.lo -MD -MP -MF $(DEPDIR)/libscicore_algo_la-callDynamicGateway.Tpo -c -o libscicore_algo_la-callDynamicGateway.lo `test -f 'src/c/callDynamicGateway.c' || echo '$(srcdir)/'`src/c/callDynamicGateway.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_algo_la-callDynamicGateway.Tpo $(DEPDIR)/libscicore_algo_la-callDynamicGateway.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/callDynamicGateway.c' object='libscicore_algo_la-callDynamicGateway.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -c -o libscicore_algo_la-callDynamicGateway.lo `test -f 'src/c/callDynamicGateway.c' || echo '$(srcdir)/'`src/c/callDynamicGateway.c
-
 libscicore_algo_la-gw_dynamic_generic.lo: src/c/gw_dynamic_generic.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_algo_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_algo_la_CFLAGS) $(CFLAGS) -MT libscicore_algo_la-gw_dynamic_generic.lo -MD -MP -MF $(DEPDIR)/libscicore_algo_la-gw_dynamic_generic.Tpo -c -o libscicore_algo_la-gw_dynamic_generic.lo `test -f 'src/c/gw_dynamic_generic.c' || echo '$(srcdir)/'`src/c/gw_dynamic_generic.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_algo_la-gw_dynamic_generic.Tpo $(DEPDIR)/libscicore_algo_la-gw_dynamic_generic.Plo
index d68e4f6..1105697 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;..\parse\includes;..\ast\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\parse\includes;..\ast\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__CORE_YASP__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;..\parse\includes;..\ast\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\parse\includes;..\ast\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__CORE_YASP__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>includes;..\parse\includes;..\ast\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\parse\includes;..\ast\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;__CORE_YASP__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>includes;..\parse\includes;..\ast\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\parse\includes;..\ast\includes;..\symbol\includes;..\types\includes;..\functions_manager\includes;../console/includes;..\system_env\includes;..\elementary_functions\includes;../operations/includes;../localization/includes;..\windows_tools\includes;$(SolutionDir)libs\MALLOC\includes;../shell/includes;$(SolutionDir)libs\intl;../history_manager/includes;../fileio/includes;../output_stream/includes;../string/includes;../api_scilab/includes;../threads/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;__CORE_YASP__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
diff --git a/scilab/modules/core/src/c/callDynamicGateway.c b/scilab/modules/core/src/c/callDynamicGateway.c
deleted file mode 100644 (file)
index 82f45a7..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Allan CORNET
- * Copyright (C) 2008 - INRIA - Sylvestre LEDRU
- * Copyright (C) 2010 - DIGITEO - Allan CORNET
- *
- * 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 <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "machine.h"
-#include "callDynamicGateway.h"
-#include "MALLOC.h"
-#include "Scierror.h"
-#include "sciprint.h"
-#include "localization.h"
-#include "getshortpathname.h"
-#include "BOOL.h"
-#include "charEncoding.h"
-#include "sci_path.h"
-/*--------------------------------------------------------------------------*/
-dynamic_gateway_error_code callDynamicGateway(char *moduleName,
-                                              char *dynLibName,
-                                              char *gw_name,
-                                              DynLibHandle *hlib,
-                                              PROC_GATEWAY *ptrGateway)
-{
-    if (*hlib == NULL)
-    {
-        /* Under Linux/Unix, load thanks to dlopen */
-#ifdef _MSC_VER
-        wchar_t *wcdynLibName = to_wide_string(dynLibName);
-        if (wcdynLibName)
-        {
-            *hlib = LoadDynLibraryW(wcdynLibName);
-            FREE(wcdynLibName);
-            wcdynLibName = NULL;
-        }
-        if (*hlib == NULL)
-        {
-            return DYN_GW_LOAD_LIBRARY_ERROR;
-        }
-#else
-        *hlib = LoadDynLibrary(dynLibName);
-
-        if (*hlib == NULL)
-        {
-            char *previousError = GetLastDynLibError();
-
-            /* Haven't been able to find the lib with dlopen...
-             * This can happen for two reasons:
-             * - the lib must be dynamically linked
-             * - Some silly issues under Suse (see bug #2875)
-             * Note that we are handling only the "source tree build"
-             * because libraries are split (they are in the same directory
-             * in the binary)
-             */
-            char *SciPath = getSCI();
-            #define PATHTOMODULE "/modules/"
-            #ifndef LT_OBJDIR
-            #define LT_OBJDIR ".libs/"
-            #endif
-
-            /* Build the full path to the library */
-            char *pathToLib=(char*) MALLOC((strlen(SciPath)+strlen(PATHTOMODULE)+strlen(moduleName)+strlen("/")+strlen(LT_OBJDIR)+strlen(dynLibName)+1)*sizeof(char));
-            sprintf(pathToLib,"%s%s%s/%s%s",SciPath,PATHTOMODULE,moduleName,LT_OBJDIR,dynLibName);
-
-            *hlib = LoadDynLibrary(pathToLib);
-
-            if (*hlib == NULL)
-            {
-                if (previousError != NULL)
-                {
-                    sciprint("A previous error has been detected while loading %s: %s\n",dynLibName, previousError);
-                }
-                if (SciPath) {FREE(SciPath); SciPath = NULL;}
-                if (pathToLib) {FREE(pathToLib); pathToLib = NULL;}
-                return DYN_GW_LOAD_LIBRARY_ERROR;
-            }
-            if (SciPath) {FREE(SciPath); SciPath = NULL;}
-            if (pathToLib) {FREE(pathToLib); pathToLib = NULL;}
-        }
-#endif
-    }
-
-    if (*ptrGateway == NULL)
-    {
-        *ptrGateway = (PROC_GATEWAY) GetDynLibFuncPtr(*hlib,gw_name);
-        if (*ptrGateway == NULL)
-        {
-            return DYN_GW_PTR_FUNCTION_ERROR ;
-        }
-    }
-
-    if ( (*hlib) && (*ptrGateway) )
-    {
-        (*ptrGateway)();
-        return DYN_GW_NO_ERROR;
-    }
-
-    return DYN_GW_CALL_FUNCTION_ERROR;
-}
-/*--------------------------------------------------------------------------*/
-char *buildModuleDynLibraryName(char *modulename, dynlib_name_format iType)
-{
-    char *dynlibname = NULL;
-    int lenName = (int)(strlen(modulename)+strlen(SHARED_LIB_EXT));
-    switch (iType)
-    {
-    case DYNLIB_NAME_FORMAT_AUTO: default:
-#ifdef _MSC_VER
-        lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_1);
-#else
-        lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_3);
-#endif
-        dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
-        if (dynlibname)
-        {
-#ifdef _MSC_VER
-            sprintf(dynlibname,FORMATGATEWAYLIBNAME_1,modulename,SHARED_LIB_EXT);
-#else
-            sprintf(dynlibname,FORMATGATEWAYLIBNAME_3,modulename,SHARED_LIB_EXT);
-#endif
-        }
-        break;
-    case DYNLIB_NAME_FORMAT_1:
-        lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_1);
-        dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
-        if (dynlibname)
-        {
-            sprintf(dynlibname,FORMATGATEWAYLIBNAME_1,modulename,SHARED_LIB_EXT);
-        }
-        break;
-    case DYNLIB_NAME_FORMAT_2:
-        lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_2);
-        dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
-        if (dynlibname)
-        {
-            sprintf(dynlibname,FORMATGATEWAYLIBNAME_2,modulename,SHARED_LIB_EXT);
-        }
-        break;
-    case DYNLIB_NAME_FORMAT_3:
-        lenName = lenName + (int)strlen(FORMATGATEWAYLIBNAME_3);
-        dynlibname = (char*)MALLOC(sizeof(char)*(lenName+1));
-        if (dynlibname)
-        {
-            sprintf(dynlibname,FORMATGATEWAYLIBNAME_3,modulename,SHARED_LIB_EXT);
-        }
-        break;
-    }
-    return dynlibname;
-}
-/*--------------------------------------------------------------------------*/
-char *buildGatewayName(char *modulename)
-{
-    /* example gw_scicos */
-#define FORMATGATEWAYNAME "gw_%s"
-
-    char *gatewayname = NULL;
-    int lenName = (int)(strlen(modulename)+strlen(FORMATGATEWAYNAME));
-    gatewayname = (char*)MALLOC(sizeof(char)*(lenName+1));
-
-    if (gatewayname)
-    {
-        sprintf(gatewayname,FORMATGATEWAYNAME,modulename);
-    }
-
-    return gatewayname;
-}
-/*--------------------------------------------------------------------------*/
-void displayErrorGateway(dynamic_gateway_error_code err,char *libraryname,char *functionname)
-{
-    switch (err)
-    {
-    case DYN_GW_NO_ERROR :
-        /* NO ERROR */
-        break;
-    case DYN_GW_LOAD_LIBRARY_ERROR :
-        Scierror(999,_("Impossible to load %s library: %s\n"),libraryname,GetLastDynLibError());
-        break;
-    case DYN_GW_PTR_FUNCTION_ERROR :
-        Scierror(999,_("Impossible to load %s function in %s library: %s\n"),functionname,libraryname, GetLastDynLibError());
-        break;
-    case DYN_GW_CALL_FUNCTION_ERROR :
-        Scierror(999,_("Impossible to call %s in %s library: %s\n"),functionname,libraryname,GetLastDynLibError());
-        break;
-    }
-}
-/*--------------------------------------------------------------------------*/
-BOOL freeDynamicGateway(char **dynLibName,
-                        char **gw_name,
-                        DynLibHandle *hlib,
-                        PROC_GATEWAY *ptrGateway)
-{
-    if (*dynLibName)
-    {
-        FREE(*dynLibName);
-        *dynLibName = NULL;
-    }
-
-    if (*gw_name)
-    {
-        FREE(*gw_name);
-        *gw_name = NULL;
-    }
-
-    if (*hlib)
-    {
-        FreeDynLibrary(*hlib);
-        *hlib = NULL;
-    }
-
-    if (*ptrGateway)
-    {
-        *ptrGateway = NULL;
-    }
-
-    if ((*hlib == NULL) && (*ptrGateway == NULL)) return TRUE;
-
-    return FALSE;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/core/src/c/callDynamicGateway.h b/scilab/modules/core/src/c/callDynamicGateway.h
deleted file mode 100644 (file)
index f0bb853..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008 - INRIA - Allan CORNET
- * Copyright (C) 2010 - DIGITEO - Allan CORNET
- * 
- * 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
- *
- */
-#ifndef __CALLDYNAMICGATEWAY_H__
-#define __CALLDYNAMICGATEWAY_H__
-
-#include "BOOL.h"
-#include "dynamiclibrary.h"
-
-typedef int (*PROC_GATEWAY) (void);
-
-typedef enum { DYN_GW_NO_ERROR = 0,
-DYN_GW_LOAD_LIBRARY_ERROR = 1,
-DYN_GW_PTR_FUNCTION_ERROR = 2,
-DYN_GW_CALL_FUNCTION_ERROR =3
-
-} dynamic_gateway_error_code;
-
-typedef enum { DYNLIB_NAME_FORMAT_AUTO = 0, 
-DYNLIB_NAME_FORMAT_1 = 1,
-DYNLIB_NAME_FORMAT_2 = 2,
-DYNLIB_NAME_FORMAT_3 = 3
-} dynlib_name_format;
-
-#define FORMATGATEWAYLIBNAME_1 "%s%s"
-#define FORMATGATEWAYLIBNAME_2 "sci%s%s"
-#define FORMATGATEWAYLIBNAME_3 "libsci%s%s"
-
-/**
-* load and call a scilab gateway
-* @param[in] name of the Scilab module
-* @param[in] name of dynamic library
-* @param[in] gateway name
-* @param[in, out] handle on dynamic library
-* @param[in, out] pointer on gateway function
-* @return error code (DYN_GW_NO_ERROR if it is ok)
-*/
-dynamic_gateway_error_code callDynamicGateway(char *moduleName,
-                                              char *dynLibName,
-                                              char *gw_name,
-                                              DynLibHandle *hlib,
-                                              PROC_GATEWAY *ptrGateway);
-
-/**
-* Build name of dynamic library based on module name
-* @param[in] module name
-* @param[in] generated dynamic lib name type
-* @return name of dynamic library
-*/
-char *buildModuleDynLibraryName(char *modulename, dynlib_name_format iType);
-
-/**
-* Build gateway name based on module name
-* @param[in] module name
-* @return gateway name
-*/
-char *buildGatewayName(char *modulename);
-
-/**
-* Display error after a call to callDynamicGateway
-* @param[in] error code returned by callDynamicGateway
-* @param[in] name of dynamic library
-* @param[in] gateway name
-*/
-void displayErrorGateway(dynamic_gateway_error_code err,
-                         char *libraryname,
-                         char *functionname);
-
-
-/**
-* free hlib and ptrGateway associated to a dynamic gateway
-* @return TRUE or FALSE
-*/
-BOOL freeDynamicGateway(char **dynLibName,
-                        char **gw_name,
-                        DynLibHandle *hlib,
-                        PROC_GATEWAY *ptrGateway);
-
-#endif /* __CALLDYNAMICGATEWAY_H__ */
-/*--------------------------------------------------------------------------*/
index 2b5758a..2aba8ce 100644 (file)
@@ -53,12 +53,12 @@ static OpTab Interfaces[INTERFACES_MAX] = {
     /* 15  */ {gw_user}, /* free position may be used */
     /* 16  */ {gw_polynomials},
     /* 17  */ {gw_data_structures1},
-    /* 18  */ {gw_dynamic_signal_processing},
+    /* 18  */ {NULL}, //gw_dynamic_signal_processing
     /* 19  */ {gw_dynamic_interpolation},
     /* 20  */ {gw_cacsd3},
     /* 21  */ {gw_string},
     /* 22  */ {gw_dynamic_symbolic},
-    /* 23  */ {gw_boolean},
+    /* 23  */ {NULL}, //gw_boolean
     /* 24  */ {gw_user2}, /* RESERVED (see callinter.h) */
     /* 25  */ {gw_gui},
     /* 26  */ {gw_differential_equations2},
@@ -66,19 +66,19 @@ static OpTab Interfaces[INTERFACES_MAX] = {
     /* 28  */ {gw_slicot},
     /* 29  */ {gw_differential_equations3},
     /* 30  */ {gw_differential_equations4},
-    /* 31  */ {gw_dynamic_functions},
+    /* 31  */ {NULL}, //gw_dynamic_functions
     /* 32  */ {gw_differential_equations6},
     /* 33  */ {gw_output_stream},
     /* 34  */ {gw_fileio},
     /* 35  */ {gw_dynamic_arnoldi},
     /* 36  */ {gw_user}, /* free position may be used */
-    /* 37  */ {gw_dynamic_statistics},
+    /* 37  */ {NULL}, //gw_dynamic_statistics
     /* 38  */ {gw_dynamic_randlib},
     /* 39  */ {gw_dynamic_special_functions},
     /* 40  */ {gw_dynamic_tclsci},
     /* 41  */ {gw_data_structures2},
     /* 42  */ {gw_user}, /* free position may be used */
-    /* 43  */ {gw_integer},
+    /* 43  */ {NULL}, //gw_integer
     /* 44  */ {gw_linear_algebra2},
     /* 45  */ {gw_dynamic_scicos},
     /* 46  */ {gw_dynamic_link},
@@ -94,13 +94,13 @@ static OpTab Interfaces[INTERFACES_MAX] = {
     /* 56  */ {gw_dynamic_spreadsheet},
     /* 57  */ {gw_dynamic_graphic_export},
     /* 58  */ {gw_dynamic_umfpack},
-    /* 59  */ {gw_dynamic_matio},
-    /* 60  */ {gw_dynamic_helptools},
+    /* 59  */ {NULL}, //gw_dynamic_matio
+    /* 60  */ {NULL}, //gw_dynamic_helptools
     /* 61  */ {gw_call_scilab},
-    /* 62  */ {gw_dynamic_hdf5},
-    /* 63  */ {gw_dynamic_scinotes},
+    /* 62  */ {NULL}, //gw_dynamic_hdf5
+    /* 63  */ {NULL}, //gw_dynamic_scinotes
     /* 64  */ {gw_dynamic_xcos},
-    /* 65  */ {gw_dynamic_action_binding},
+    /* 65  */ {NULL}, //gw_dynamic_action_binding
     /* 66  */ {gw_dynamic_parallel},
     /* 67  */ {gw_dynamic_ui_data},
     /* 68  */ {gw_dynamic_xml}
index 5bfe081..f10ecc4 100644 (file)
@@ -237,7 +237,6 @@ cd.. &gt;nul
   <ItemGroup>
     <ClCompile Include="..\..\..\mexlib\src\cpp\mexlib.cpp" />
     <ClCompile Include="..\..\..\mexlib\src\cpp\sci_gateway.cpp" />
-    <ClCompile Include="callDynamicGateway.c" />
     <ClCompile Include="callFunctionFromGateway.c" />
     <ClCompile Include="callinterf.c" />
     <ClCompile Include="commandwords.c" />
@@ -308,7 +307,6 @@ cd.. &gt;nul
     <ClCompile Include="..\..\sci_gateway\c\sci_format.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_funcprot.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_funptr.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_getdebuginfo.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_getmd5.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_getmemory.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_getvariablesonstack.c" />
@@ -329,7 +327,6 @@ cd.. &gt;nul
     <ClCompile Include="..\..\sci_gateway\c\sci_return.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_setbpt.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_stacksize.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_type.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_typename.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_warning.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_what.c" />
index 0cdd9a4..c933302 100644 (file)
@@ -17,9 +17,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="callDynamicGateway.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="callFunctionFromGateway.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_funptr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_getdebuginfo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_getmd5.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_stacksize.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_type.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_typename.c">
       <Filter>Source Files</Filter>
     </ClCompile>
index 0eb9b07..f3bb748 100644 (file)
@@ -12,7 +12,7 @@
 */
 #include <stdlib.h>
 #include "dynamic_gateways.h"
-#include "callDynamicGateway.h"
+//#include "callDynamicGateway.h"
 #include "gw_dynamic_generic.h"
 #include "dynamic_parallel.h"
 #include "MALLOC.h"
 /* special_functions module */
 #define SPECIAL_FUNCTIONS_MODULE_NAME "special_functions"
 static DynLibHandle hSpecial_functionsLib = NULL;
-static PROC_GATEWAY ptr_gw_special_functions = NULL;
+static void* ptr_gw_special_functions = NULL;
 static char* dynlibname_special_functions = NULL;
 static char* gatewayname_special_functions = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_special_functions(void)
 {
-    return gw_dynamic_generic(SPECIAL_FUNCTIONS_MODULE_NAME,
-        &dynlibname_special_functions,
-        &gatewayname_special_functions,
-        &hSpecial_functionsLib,
-        &ptr_gw_special_functions);
-}
-/*--------------------------------------------------------------------------*/
-/* helptools module */
-#define HELPTOOLS_MODULE_NAME "helptools"
-static DynLibHandle hHelptoolsLib = NULL;
-static PROC_GATEWAY ptr_gw_helptools = NULL;
-static char* dynlibname_helptools = NULL;
-static char* gatewayname_helptools = NULL;
-/*--------------------------------------------------------------------------*/
-int gw_dynamic_helptools(void)
-{
-    return gw_dynamic_generic(HELPTOOLS_MODULE_NAME,
-        &dynlibname_helptools,
-        &gatewayname_helptools,
-        &hHelptoolsLib,
-        &ptr_gw_helptools);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* optimization module */
 #define OPTIMIZATION_MODULE_NAME "optimization"
 static DynLibHandle hOptimizationLib = NULL;
-static PROC_GATEWAY ptr_gw_optimization = NULL;
+static void* ptr_gw_optimization = NULL;
 static char* dynlibname_optimization = NULL;
 static char* gatewayname_optimization = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_optimization(void)
 {
-    return gw_dynamic_generic(OPTIMIZATION_MODULE_NAME,
-        &dynlibname_optimization,
-        &gatewayname_optimization,
-        &hOptimizationLib,
-        &ptr_gw_optimization);
-}
-/*--------------------------------------------------------------------------*/
-/* matio module */
-#define MATIO_MODULE_NAME "matio"
-static DynLibHandle hMatioLib = NULL;
-static PROC_GATEWAY ptr_gw_matio = NULL;
-static char* dynlibname_matio = NULL;
-static char* gatewayname_matio = NULL;
-/*--------------------------------------------------------------------------*/
-int gw_dynamic_matio(void)
-{
-    return gw_dynamic_generic(MATIO_MODULE_NAME,
-        &dynlibname_matio,
-        &gatewayname_matio,
-        &hMatioLib,
-        &ptr_gw_matio);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* UMFPACK module */
 #define UMFPACK_MODULE_NAME "umfpack"
 static DynLibHandle hUmfpackLib = NULL;
-static PROC_GATEWAY ptr_gw_umfpack = NULL;
+static void* ptr_gw_umfpack = NULL;
 static char* dynlibname_umfpack = NULL;
 static char* gatewayname_umfpack = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_umfpack(void)
 {
-    return gw_dynamic_generic(UMFPACK_MODULE_NAME,
-        &dynlibname_umfpack,
-        &gatewayname_umfpack,
-        &hUmfpackLib,
-        &ptr_gw_umfpack);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* spreadsheet module */
 #define SPREADSHEET_MODULE_NAME "spreadsheet"
 static DynLibHandle hSpreadsheetLib = NULL;
-static PROC_GATEWAY ptr_gw_spreadsheet = NULL;
+static void* ptr_gw_spreadsheet = NULL;
 static char* dynlibname_spreadsheet = NULL;
 static char* gatewayname_spreadsheet = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_spreadsheet(void)
 {
-    return gw_dynamic_generic(SPREADSHEET_MODULE_NAME,
-        &dynlibname_spreadsheet,
-        &gatewayname_spreadsheet,
-        &hSpreadsheetLib,
-        &ptr_gw_spreadsheet);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* sound module */
 #define SOUND_MODULE_NAME "sound"
 static DynLibHandle hSoundLib = NULL;
-static PROC_GATEWAY ptr_gw_sound = NULL;
+static void* ptr_gw_sound = NULL;
 static char* dynlibname_sound = NULL;
 static char* gatewayname_sound = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_sound(void)
 {
-    return gw_dynamic_generic(SOUND_MODULE_NAME,
-        &dynlibname_sound,
-        &gatewayname_sound,
-        &hSoundLib,
-        &ptr_gw_sound);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* scicos module */
 #define SCICOS_MODULE_NAME "scicos"
 static DynLibHandle hScicosLib = NULL;
-static PROC_GATEWAY ptr_gw_scicos = NULL;
+static void* ptr_gw_scicos = NULL;
 static char* dynlibname_scicos = NULL;
 static char* gatewayname_scicos = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_scicos(void)
 {
-    return gw_dynamic_generic(SCICOS_MODULE_NAME,
-        &dynlibname_scicos,
-        &gatewayname_scicos,
-        &hScicosLib,
-        &ptr_gw_scicos);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* randlib module */
 #define RANDLIB_MODULE_NAME "randlib"
 static DynLibHandle hRandlibLib = NULL;
-static PROC_GATEWAY ptr_gw_randlib = NULL;
+static void* ptr_gw_randlib = NULL;
 static char* dynlibname_randlib = NULL;
 static char* gatewayname_randlib = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_randlib(void)
 {
-    return gw_dynamic_generic(RANDLIB_MODULE_NAME,
-        &dynlibname_randlib,
-        &gatewayname_randlib,
-        &hRandlibLib,
-        &ptr_gw_randlib);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* arnoldi module */
 #define ARNOLDI_MODULE_NAME "arnoldi"
 static DynLibHandle hArnoldiLib = NULL;
-static PROC_GATEWAY ptr_gw_arnoldi = NULL;
+static void* ptr_gw_arnoldi = NULL;
 static char* dynlibname_arnoldi = NULL;
 static char* gatewayname_arnoldi = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_arnoldi(void)
 {
-    return gw_dynamic_generic(ARNOLDI_MODULE_NAME,
-        &dynlibname_arnoldi,
-        &gatewayname_arnoldi,
-        &hArnoldiLib,
-        &ptr_gw_arnoldi);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* symbolic module */
 #define SYMBOLIC_MODULE_NAME "symbolic"
 static DynLibHandle hSymbolicLib = NULL;
-static PROC_GATEWAY ptr_gw_symbolic = NULL;
+static void* ptr_gw_symbolic = NULL;
 static char* dynlibname_symbolic = NULL;
 static char* gatewayname_symbolic = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_symbolic(void)
 {
-    return gw_dynamic_generic(SYMBOLIC_MODULE_NAME,
-        &dynlibname_symbolic,
-        &gatewayname_symbolic,
-        &hSymbolicLib,
-        &ptr_gw_symbolic);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* interpolation module */
 #define INTERPOLATION_MODULE_NAME "interpolation"
 static DynLibHandle hInterpolationLib = NULL;
-static PROC_GATEWAY ptr_gw_interpolation = NULL;
+static void* ptr_gw_interpolation = NULL;
 static char* dynlibname_interpolation = NULL;
 static char* gatewayname_interpolation = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_interpolation(void)
 {
-    return gw_dynamic_generic(INTERPOLATION_MODULE_NAME,
-        &dynlibname_interpolation,
-        &gatewayname_interpolation,
-        &hInterpolationLib,
-        &ptr_gw_interpolation);
-}
-/*--------------------------------------------------------------------------*/
-/* statistics module */
-#define STATISTICS_MODULE_NAME "statistics"
-static DynLibHandle hStatisticsLib = NULL;
-static PROC_GATEWAY ptr_gw_statistics = NULL;
-static char* dynlibname_statistics = NULL;
-static char* gatewayname_statistics = NULL;
-/*--------------------------------------------------------------------------*/
-int gw_dynamic_statistics(void)
-{
-    return gw_dynamic_generic(STATISTICS_MODULE_NAME,
-        &dynlibname_statistics,
-        &gatewayname_statistics,
-        &hStatisticsLib,
-        &ptr_gw_statistics);
-}
-/*--------------------------------------------------------------------------*/
-/* signal_processing module */
-#define SIGNAL_PROCESSING_MODULE_NAME "signal_processing"
-static DynLibHandle hSignal_processingLib = NULL;
-static PROC_GATEWAY ptr_gw_signal_processing = NULL;
-static char* dynlibname_signal_processing = NULL;
-static char* gatewayname_signal_processing = NULL;
-/*--------------------------------------------------------------------------*/
-int gw_dynamic_signal_processing(void)
-{
-    return gw_dynamic_generic(SIGNAL_PROCESSING_MODULE_NAME,
-        &dynlibname_signal_processing,
-        &gatewayname_signal_processing,
-        &hSignal_processingLib,
-        &ptr_gw_signal_processing);
-}
-/*--------------------------------------------------------------------------*/
-/* functions module */
-#define FUNCTIONS_MODULE_NAME "functions"
-static DynLibHandle hFunctionsLib = NULL;
-static PROC_GATEWAY ptr_gw_functions = NULL;
-static char* dynlibname_functions = NULL;
-static char* gatewayname_functions = NULL;
-/*--------------------------------------------------------------------------*/
-int gw_dynamic_functions(void)
-{
-    return gw_dynamic_generic(FUNCTIONS_MODULE_NAME,
-        &dynlibname_functions,
-        &gatewayname_functions,
-        &hFunctionsLib,
-        &ptr_gw_functions);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* xcos module */
 #define XCOS_MODULE_NAME "xcos"
 static DynLibHandle hXcosLib = NULL;
-static PROC_GATEWAY ptr_gw_xcos = NULL;
+static void* ptr_gw_xcos = NULL;
 static char* dynlibname_xcos = NULL;
 static char* gatewayname_xcos = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_xcos(void)
 {
-    return gw_dynamic_generic(XCOS_MODULE_NAME,
-        &dynlibname_xcos,
-        &gatewayname_xcos,
-        &hXcosLib,
-        &ptr_gw_xcos);
-}
-/*--------------------------------------------------------------------------*/
-/* scinotes module */
-#define SCINOTES_MODULE_NAME "scinotes"
-static DynLibHandle hSciNotesLib = NULL;
-static PROC_GATEWAY ptr_gw_scinotes = NULL;
-static char* dynlibname_scinotes = NULL;
-static char* gatewayname_scinotes = NULL;
-/*--------------------------------------------------------------------------*/
-int gw_dynamic_scinotes(void)
-{
-#ifdef _MSC_VER
-    if (dynlibname_scinotes == NULL)
-    {
-        dynlibname_scinotes = buildModuleDynLibraryName(SCINOTES_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
-    }
-#endif
-    return gw_dynamic_generic(SCINOTES_MODULE_NAME,
-        &dynlibname_scinotes,
-        &gatewayname_scinotes,
-        &hSciNotesLib,
-        &ptr_gw_scinotes);
-}
-/*--------------------------------------------------------------------------*/
-/* hdf5 module */
-#define HDF5_MODULE_NAME "hdf5"
-static DynLibHandle hHdf5Lib = NULL;
-static PROC_GATEWAY ptr_gw_hdf5 = NULL;
-static char* dynlibname_hdf5 = NULL;
-static char* gatewayname_hdf5 = NULL;
-/*--------------------------------------------------------------------------*/
-int gw_dynamic_hdf5(void)
-{
-    int r = gw_dynamic_generic(HDF5_MODULE_NAME,
-        &dynlibname_hdf5,
-        &gatewayname_hdf5,
-        &hHdf5Lib,
-        &ptr_gw_hdf5);
-
-    freeDynamicGateway(&dynlibname_hdf5,
-        &gatewayname_hdf5,
-        &hHdf5Lib,
-        &ptr_gw_hdf5);
-
-    return r;
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* graphic_exports module */
 #define GRAPHIC_EXPORT_MODULE_NAME "graphic_export"
 static DynLibHandle hGraphic_exportLib = NULL;
-static PROC_GATEWAY ptr_gw_graphic_export = NULL;
+static void* ptr_gw_graphic_export = NULL;
 static char* dynlibname_graphic_export = NULL;
 static char* gatewayname_graphic_export = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_graphic_export(void)
 {
-#ifdef _MSC_VER
-    if (dynlibname_graphic_export == NULL)
-    {
-        dynlibname_graphic_export = buildModuleDynLibraryName(GRAPHIC_EXPORT_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
-    }
-#endif
-    return gw_dynamic_generic(GRAPHIC_EXPORT_MODULE_NAME,
-        &dynlibname_graphic_export,
-        &gatewayname_graphic_export,
-        &hGraphic_exportLib ,
-        &ptr_gw_graphic_export);
-}
-/*--------------------------------------------------------------------------*/
-/* graphic_exports module */
-#define ACTION_BINDING_MODULE_NAME "action_binding"
-static DynLibHandle hAction_bindingLib = NULL;
-static PROC_GATEWAY ptr_gw_action_binding = NULL;
-static char* dynlibname_action_binding = NULL;
-static char* gatewayname_action_binding = NULL;
-/*--------------------------------------------------------------------------*/
-int gw_dynamic_action_binding(void)
-{
-#ifdef _MSC_VER
-    if (dynlibname_action_binding == NULL)
-    {
-        dynlibname_action_binding = buildModuleDynLibraryName(ACTION_BINDING_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
-    }
-#endif
-    return gw_dynamic_generic(ACTION_BINDING_MODULE_NAME,
-        &dynlibname_action_binding,
-        &gatewayname_action_binding,
-        &hAction_bindingLib ,
-        &ptr_gw_action_binding);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* ui_data module */
 #define UI_DATA_MODULE_NAME "ui_data"
 static DynLibHandle hUi_dataLib = NULL;
-static PROC_GATEWAY ptr_gw_ui_data = NULL;
+static void* ptr_gw_ui_data = NULL;
 static char* dynlibname_ui_data = NULL;
 static char* gatewayname_ui_data = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_ui_data(void)
 {
-#ifdef _MSC_VER
-    if (dynlibname_ui_data == NULL)
-    {
-        dynlibname_ui_data = buildModuleDynLibraryName(UI_DATA_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
-    }
-#endif
-
-    return gw_dynamic_generic(UI_DATA_MODULE_NAME,
-        &dynlibname_ui_data,
-        &gatewayname_ui_data,
-        &hUi_dataLib,
-        &ptr_gw_ui_data);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 /* xml module */
 #define XML_MODULE_NAME "xml"
 static DynLibHandle hXmlLib = NULL;
-static PROC_GATEWAY ptr_gw_xml = NULL;
+static void* ptr_gw_xml = NULL;
 static char* dynlibname_xml = NULL;
 static char* gatewayname_xml = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_xml(void)
 {
-    return gw_dynamic_generic(XML_MODULE_NAME,
-        &dynlibname_xml,
-        &gatewayname_xml,
-        &hXmlLib,
-        &ptr_gw_xml);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 void freeAllDynamicGateways(void)
 {
-    freeDynamicGateway(&dynlibname_special_functions,
-        &gatewayname_special_functions,
-        &hSpecial_functionsLib,
-        &ptr_gw_special_functions);
-
-    freeDynamicGateway(&dynlibname_helptools,
-        &gatewayname_helptools,
-        &hHelptoolsLib,
-        &ptr_gw_helptools);
-
-    freeDynamicGateway(&dynlibname_optimization,
-        &gatewayname_optimization,
-        &hOptimizationLib,
-        &ptr_gw_optimization);
-
-    freeDynamicGateway(&dynlibname_matio,
-        &gatewayname_matio,&hMatioLib,
-        &ptr_gw_matio);
-
-    freeDynamicGateway(&dynlibname_umfpack,
-        &gatewayname_umfpack,
-        &hUmfpackLib,
-        &ptr_gw_umfpack);
-
-    freeDynamicGateway(&dynlibname_spreadsheet,
-        &gatewayname_spreadsheet,
-        &hSpreadsheetLib,
-        &ptr_gw_spreadsheet);
-
-    freeDynamicGateway(&dynlibname_sound,
-        &gatewayname_sound,
-        &hSoundLib,
-        &ptr_gw_sound);
-
-    freeDynamicGateway(&dynlibname_scicos,
-        &gatewayname_scicos,
-        &hScicosLib,
-        &ptr_gw_scicos);
-
-    freeDynamicGateway(&dynlibname_randlib,
-        &gatewayname_randlib,
-        &hRandlibLib,
-        &ptr_gw_randlib);
-
-    freeDynamicGateway(&dynlibname_arnoldi,
-        &gatewayname_arnoldi,
-        &hArnoldiLib,
-        &ptr_gw_arnoldi);
-
-    freeDynamicGateway(&dynlibname_symbolic,
-        &gatewayname_symbolic,
-        &hSymbolicLib,
-        &ptr_gw_symbolic);
-
-    freeDynamicGateway(&dynlibname_interpolation,
-        &gatewayname_interpolation,
-        &hInterpolationLib,
-        &ptr_gw_interpolation);
-
-    freeDynamicGateway(&dynlibname_statistics,
-        &gatewayname_statistics,
-        &hStatisticsLib,
-        &ptr_gw_statistics);
-
-    freeDynamicGateway(&dynlibname_signal_processing,
-        &gatewayname_signal_processing,
-        &hSignal_processingLib,
-        &ptr_gw_signal_processing);
-
-    freeDynamicGateway(&dynlibname_functions,
-        &gatewayname_functions,
-        &hFunctionsLib,
-        &ptr_gw_functions);
-
-    freeDynamicGateway(&dynlibname_xcos,
-        &gatewayname_xcos,
-        &hXcosLib,
-        &ptr_gw_xcos);
-
-    freeDynamicGateway(&dynlibname_scinotes,
-        &gatewayname_scinotes,
-        &hSciNotesLib,
-        &ptr_gw_scinotes);
-
-    freeDynamicGateway(&dynlibname_hdf5,
-        &gatewayname_hdf5,
-        &hHdf5Lib,
-        &ptr_gw_hdf5);
-
-    freeDynamicGateway(&dynlibname_graphic_export,
-        &gatewayname_graphic_export,
-        &hGraphic_exportLib,
-        &ptr_gw_graphic_export);
-
-    freeDynamicGateway(&dynlibname_action_binding,
-        &gatewayname_action_binding,
-        &hAction_bindingLib,
-        &ptr_gw_action_binding);
-
-    dynTerminateParallel();
-
-    freeDynamicGateway(&dynlibname_ui_data,
-        &gatewayname_ui_data,
-        &hUi_dataLib,
-        &ptr_gw_ui_data);
-
-    freeDynamicGateway(&dynlibname_xml,
-        &gatewayname_xml,
-        &hXmlLib,
-        &ptr_gw_xml);
 }
 /*--------------------------------------------------------------------------*/
 
index 352f4da..3618209 100644 (file)
@@ -40,20 +40,6 @@ int gw_dynamic_ui_data(void);
 int gw_dynamic_xcos(void);
 
 /**
-* scinotes gateway
-* functions is loaded dynamically at runtime
-* load gw_functions in SCI/modules/scinotes/sci_gateway/gw_scinotes.c
-*/
-int gw_dynamic_scinotes(void);
-
-/**
-* functions gateway
-* functions is loaded dynamically at runtime
-* load gw_functions in SCI/modules/functions/sci_gateway/gw_functions.c
-*/
-int gw_dynamic_functions(void);
-
-/**
 * interpolation gateway
 * interpolation is loaded dynamically at runtime
 * load gw_interpolation in SCI/modules/interpolation/sci_gateway/gw_interpolation.c
@@ -61,30 +47,6 @@ int gw_dynamic_functions(void);
 int gw_dynamic_interpolation(void);
 
 /**
-* statistics gateway
-* statistics is loaded dynamically at runtime
-* load gw_statistics in SCI/modules/statistics/sci_gateway/gw_statistics.c
-*/
-int gw_dynamic_statistics(void);
-
-
-/**
-* signal_processing gateway
-* signal_processing is loaded dynamically at runtime
-* load gw_signal_processing in SCI/modules/signal_processing/sci_gateway/gw_signal_processing.c
-*/
-int gw_dynamic_signal_processing(void);
-
-
-/**
-* helptools gateway
-* helptools is loaded dynamically at runtime
-* load gw_helptools in SCI/modules/helptools/sci_gateway/gw_helptools.c
-*/
-int gw_dynamic_helptools(void);
-
-
-/**
 * optimization gateway
 * optimization is loaded dynamically at runtime
 * load gw_optimization in SCI/modules/optimization/sci_gateway/gw_optimization.c
@@ -92,13 +54,6 @@ int gw_dynamic_helptools(void);
 int gw_dynamic_optimization(void);
 
 /**
-* matio gateway
-* matio is loaded dynamically at runtime
-* load gw_matio in SCI/modules/matio/sci_gateway/gw_matio.c
-*/
-int gw_dynamic_matio(void);
-
-/**
 * UMFPACK gateway
 * UMFPACK is loaded dynamically at runtime
 * load gw_umfpack in SCI/modules/umfpack/sci_gateway/gw_umfpack.c
@@ -148,13 +103,6 @@ int gw_dynamic_arnoldi(void);
 int gw_dynamic_symbolic(void);
 
 /**
-* hdf5 gateway
-* hdf5 is loaded dynamically at runtime
-* load gw_hdf5 in SCI/modules/hdf5/sci_gateway/gw_hdf5.c
-*/
-int gw_dynamic_hdf5(void);
-
-/**
 * graphic_export gateway
 * graphic_export is loaded dynamically at runtime
 * load gw_graphic_export in SCI/modules/graphic_export/sci_gateway/gw_graphic_export.c
@@ -162,16 +110,9 @@ int gw_dynamic_hdf5(void);
 int gw_dynamic_graphic_export(void);
 
 /**
-* action_binding gateway
-* action_binding is loaded dynamically at runtime
-* load gw_action_binding in SCI/modules/action_binding/sci_gateway/gw_action_binding.c
-*/
-int gw_dynamic_action_binding(void);
-
-/**
-* action_binding gateway
-* action_binding is loaded dynamically at runtime
-* load gw_action_binding in SCI/modules/xml/sci_gateway/gw_xml.c
+* xml gateway
+* xml is loaded dynamically at runtime
+* load xml in SCI/modules/xml/sci_gateway/gw_xml.c
 */
 int gw_dynamic_xml(void);
 
index 02b3575..f0c574b 100644 (file)
@@ -10,7 +10,7 @@
 *
 */
 /*--------------------------------------------------------------------------*/
-#include "callDynamicGateway.h"
+//#include "callDynamicGateway.h"
 #include "gw_dynamic_generic.h"
 #include "MALLOC.h"
 #include "dynamic_parallel.h"
 /* PARALLEL module */
 #define PARALLEL_MODULE_NAME "parallel"
 static DynLibHandle hParallelLib = NULL;
-static PROC_GATEWAY ptr_gw_parallel = NULL;
+static void* ptr_gw_parallel = NULL;
 static char* dynlibname_parallel = NULL;
 static char* gatewayname_parallel = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_parallel(void)
 {
-    return gw_dynamic_generic(PARALLEL_MODULE_NAME,
-        &dynlibname_parallel,
-        &gatewayname_parallel,
-        &hParallelLib,
-        &ptr_gw_parallel);
+    //return gw_dynamic_generic(PARALLEL_MODULE_NAME,
+    //    &dynlibname_parallel,
+    //    &gatewayname_parallel,
+    //    &hParallelLib,
+    //    &ptr_gw_parallel);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 #define PARALLEL_CONCURRENCY_NAME "parallelConcurrency"
@@ -73,10 +74,11 @@ BOOL dynTerminateParallel(void)
 {
     if (ptr_parallel_concurrency) ptr_parallel_concurrency = NULL;
     if (ptr_parallel_forbidden) ptr_parallel_forbidden = NULL;
-    return freeDynamicGateway(&dynlibname_parallel,
-        &gatewayname_parallel,
-        &hParallelLib,
-        &ptr_gw_parallel);
+    //return freeDynamicGateway(&dynlibname_parallel,
+    //    &gatewayname_parallel,
+    //    &hParallelLib,
+    //    &ptr_gw_parallel);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 
index 4f1d618..d88d468 100644 (file)
@@ -11,7 +11,7 @@
 */
 /*--------------------------------------------------------------------------*/
 #include "dynamic_tclsci.h"
-#include "callDynamicGateway.h"
+//#include "callDynamicGateway.h"
 #include "gw_dynamic_generic.h"
 #include "sci_mode.h"
 #include "with_module.h"
@@ -20,7 +20,7 @@
 /* tclsci module */
 #define TCLSCI_MODULE_NAME "tclsci"
 static DynLibHandle hTclsciLib = NULL;
-static PROC_GATEWAY ptr_gw_tclsci = NULL;
+static void* ptr_gw_tclsci = NULL;
 static char* dynlibname_tclsci = NULL;
 static char* gatewayname_tclsci = NULL;
 /*--------------------------------------------------------------------------*/
@@ -34,11 +34,12 @@ static PROC_TERMINATETCLTK ptr_TerminatTclTk = NULL;
 /*--------------------------------------------------------------------------*/
 int gw_dynamic_tclsci(void)
 {
-    return gw_dynamic_generic(TCLSCI_MODULE_NAME,
-        &dynlibname_tclsci,
-        &gatewayname_tclsci,
-        &hTclsciLib,
-        &ptr_gw_tclsci);
+    //return gw_dynamic_generic(TCLSCI_MODULE_NAME,
+    //    &dynlibname_tclsci,
+    //    &gatewayname_tclsci,
+    //    &hTclsciLib,
+    //    &ptr_gw_tclsci);
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 int dynamic_setenvtcl(char *string,char *value)
@@ -69,10 +70,10 @@ BOOL dynamic_TerminateTclTk(void)
         }
         bResult = (ptr_TerminatTclTk)();
 
-        freeDynamicGateway(&dynlibname_tclsci,
-            &gatewayname_tclsci,
-            &hTclsciLib,
-            &ptr_gw_tclsci);
+        //freeDynamicGateway(&dynlibname_tclsci,
+        //    &gatewayname_tclsci,
+        //    &hTclsciLib,
+        //    &ptr_gw_tclsci);
 
         return bResult;
     }
index e146235..0ef653e 100644 (file)
@@ -18,25 +18,25 @@ int gw_dynamic_generic(char *moduleName,
                                           char **dynlibName,
                                           char **gatewayName,
                                           DynLibHandle *hModuleLib,
-                                          PROC_GATEWAY *ptrGatewayFunction)
+                                          void* ptrGatewayFunction)
 {
-       dynamic_gateway_error_code err;
-       if (*dynlibName == NULL)
-       {
-               *dynlibName = buildModuleDynLibraryName(moduleName, DYNLIB_NAME_FORMAT_AUTO);
-       }
+       //dynamic_gateway_error_code err;
+       //if (*dynlibName == NULL)
+       //{
+       //      *dynlibName = buildModuleDynLibraryName(moduleName, DYNLIB_NAME_FORMAT_AUTO);
+       //}
 
-       if (*gatewayName == NULL)
-       {
-               *gatewayName = buildGatewayName(moduleName);
-       }
+       //if (*gatewayName == NULL)
+       //{
+       //      *gatewayName = buildGatewayName(moduleName);
+       //}
 
-       err = callDynamicGateway(moduleName,*dynlibName,
-                                                       *gatewayName,
-                                                       hModuleLib,
-                                                       ptrGatewayFunction);
-       displayErrorGateway(err,*dynlibName,*gatewayName);
-       
+       //err = callDynamicGateway(moduleName,*dynlibName,
+       //                                              *gatewayName,
+       //                                              hModuleLib,
+       //                                              ptrGatewayFunction);
+       //displayErrorGateway(err,*dynlibName,*gatewayName);
+       //
        return 0;
 }
 /*--------------------------------------------------------------------------*/
index 6729960..4b6b166 100644 (file)
@@ -14,7 +14,7 @@
 #ifndef __GW_DYNAMIC_GENERIC_H__
 #define __GW_DYNAMIC_GENERIC_H__
 
-#include "callDynamicGateway.h"
+#include "dynamiclibrary.h"
 
 /**
 * generic function to call a gateway dynamically loaded
@@ -29,7 +29,7 @@ int gw_dynamic_generic(char *moduleName,
                                           char **dynlibName,
                                           char **gatewayName,
                                           DynLibHandle *hModuleLib,
-                                          PROC_GATEWAY *ptrGatewayFunction);
+                                          void* ptrGatewayFunction);
 
 #endif /* __GW_DYNAMIC_GENERIC_H__ */
 /*--------------------------------------------------------------------------*/
index 8e2a8ae..333c12d 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../string/includes;../../../fileio/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\sci_gateway\cpp\sci_sciargs.cpp" />
+    <ClCompile Include="..\..\sci_gateway\c\sci_getdebuginfo.c" />
+    <ClCompile Include="..\..\sci_gateway\c\sci_type.c" />
     <ClCompile Include="banner.cpp" />
     <ClCompile Include="core_gw.cpp" />
     <ClCompile Include="runner.cpp" />
index e3da6b5..d5ba524 100644 (file)
     <ClCompile Include="..\..\sci_gateway\cpp\sci_sciargs.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\c\sci_type.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sci_gateway\c\sci_getdebuginfo.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\includes\banner.hxx">
index f0d024a..1371de2 100644 (file)
@@ -38,7 +38,7 @@ extern int C2F( matrc)();
 extern int C2F(mattr)();
 extern int C2F(matadd)();
 extern int C2F(matcmp)();
-extern int C2F(matlog)();
+//extern int C2F(matlog)();
 extern int C2F(mattrc)();
 extern int C2F(vecmul)();
 extern int C2F(matpow)();
@@ -241,7 +241,7 @@ int ChooseOtherOperation(int op)
        }
        if (op == et || op == ou || op == non)
        {
-               C2F(matlog)();
+               //C2F(matlog)();
                return 0;
        }
        if (op >= less)
index b5ffd82..0137b3c 100644 (file)
@@ -77,7 +77,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../../libs/MALLOC/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../../libs/MALLOC/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../../libs/MALLOC/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../../libs/MALLOC/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../../libs/MALLOC/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../../libs/MALLOC/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../../libs/MALLOC/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../../libs/MALLOC/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 33d16e4..f864260 100644 (file)
@@ -423,7 +423,8 @@ libscielementary_functions_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/threads/includes \
        -I$(top_srcdir)/modules/system_env/includes \
        -I$(top_srcdir)/modules/string/includes \
-       -I$(top_builddir)/modules/operations/includes
+       -I$(top_builddir)/modules/operations/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 # Includes need for the compilation
 libscielementary_functions_la_CFLAGS= \
index 6aa91cd..98e2c37 100644 (file)
@@ -1035,7 +1035,8 @@ libscielementary_functions_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/threads/includes \
        -I$(top_srcdir)/modules/system_env/includes \
        -I$(top_srcdir)/modules/string/includes \
-       -I$(top_builddir)/modules/operations/includes
+       -I$(top_builddir)/modules/operations/includes \
+    -I$(top_srcdir)/libs/dynamiclibrary/includes
 
 
 # Includes need for the compilation
index 86b65af..55b719c 100644 (file)
 #define BY_ALL                 0
 #define        BY_MTLB                 -1
 
-double dceilsEx(double _dblVal, int _iPrecision);
-double dceils(double _dblVal);
-double wasums(int _iNbElem, double* _pdblReal, double* _pdblImg);
+ELEMENTARY_FUNCTIONS_IMPEXP double dceilsEx(double _dblVal, int _iPrecision);
+ELEMENTARY_FUNCTIONS_IMPEXP double dceils(double _dblVal);
+ELEMENTARY_FUNCTIONS_IMPEXP double wasums(int _iNbElem, double* _pdblReal, double* _pdblImg);
 
-void vCupro(int _iNbElem, double* _piIn, double* _piOut);
-void vCuproi(int _iNbElem, double* _piRealIn, double* _piImgIn, double* _piRealOut, double* _piImgOut);
-void vDvmul(int _iNbElem, double* _piIn1, double* _piIn2, int _iIncIn1, int _iIncIn2, double* _piOut);
-void vWvmul(int _iNbElem, double* _piRealIn1, double* _piImgIn1, double* _piRealIn2, double* _piImgIn2, int _iIncIn1, int _iIncIn2, double* _piRealOut, double* _piImgOut);
-void vCusum(int _iNbElem, double *_dblIn, double *_dblOut);
-void vDadd(int _iNbElem, double* _pdblIn1, double* _pdblIn2, int _iIncIn1, int _iIncIn2, double* _pdblOut);
-void vDless(int _iNbElem, double* _pdblIn1, double* _pdblIn2, int _iIncIn1, int _iIncIn2, double* _pdblOut);
-void vDset(int _iNbElem, double _dblVal, double* _pdblIn, int _iInc);
-void vDsearchC(double *_pdblX, int _iNbElemX, double *_pdblVal, int _iNbElemVal, double* _pdblInd, double *_pdblOcc, double *_pdblInfo);
-void vDsearchD(double *_pdblX, int _iNbElemX, double *_pdblVal, int _iNbElemVal, double* _pdblInd, double *_pdblOcc, double *_pdblInfo);
-double dfloors(double _dblVal);
-double dfrexps(double _dblVal, double *_pdblExp);
-double dblNearFloat(double _dblVal, double _dblMode);
+ELEMENTARY_FUNCTIONS_IMPEXP void vCupro(int _iNbElem, double* _piIn, double* _piOut);
+ELEMENTARY_FUNCTIONS_IMPEXP void vCuproi(int _iNbElem, double* _piRealIn, double* _piImgIn, double* _piRealOut, double* _piImgOut);
+ELEMENTARY_FUNCTIONS_IMPEXP void vDvmul(int _iNbElem, double* _piIn1, double* _piIn2, int _iIncIn1, int _iIncIn2, double* _piOut);
+ELEMENTARY_FUNCTIONS_IMPEXP void vWvmul(int _iNbElem, double* _piRealIn1, double* _piImgIn1, double* _piRealIn2, double* _piImgIn2, int _iIncIn1, int _iIncIn2, double* _piRealOut, double* _piImgOut);
+ELEMENTARY_FUNCTIONS_IMPEXP void vCusum(int _iNbElem, double *_dblIn, double *_dblOut);
+ELEMENTARY_FUNCTIONS_IMPEXP void vDadd(int _iNbElem, double* _pdblIn1, double* _pdblIn2, int _iIncIn1, int _iIncIn2, double* _pdblOut);
+ELEMENTARY_FUNCTIONS_IMPEXP void vDless(int _iNbElem, double* _pdblIn1, double* _pdblIn2, int _iIncIn1, int _iIncIn2, double* _pdblOut);
+ELEMENTARY_FUNCTIONS_IMPEXP void vDset(int _iNbElem, double _dblVal, double* _pdblIn, int _iInc);
+ELEMENTARY_FUNCTIONS_IMPEXP void vDsearchC(double *_pdblX, int _iNbElemX, double *_pdblVal, int _iNbElemVal, double* _pdblInd, double *_pdblOcc, double *_pdblInfo);
+ELEMENTARY_FUNCTIONS_IMPEXP void vDsearchD(double *_pdblX, int _iNbElemX, double *_pdblVal, int _iNbElemVal, double* _pdblInd, double *_pdblOcc, double *_pdblInfo);
+ELEMENTARY_FUNCTIONS_IMPEXP double dfloors(double _dblVal);
+ELEMENTARY_FUNCTIONS_IMPEXP double dfrexps(double _dblVal, double *_pdblExp);
+ELEMENTARY_FUNCTIONS_IMPEXP double dblNearFloat(double _dblVal, double _dblMode);
 
-void vDmProd(int _iMode, double* _pdblIn, int _iLeadDim, int _iRows, int _iCols, double* _pdblOut, int _iInc);
-void vWDmProd(int _iMode, double* _pdblIn1, double* _pdblIn2, int _iLeadDim, int _iRows, int _iCols, double* _pdblOut1, double* _pdblOut2, int _iInc);
+ELEMENTARY_FUNCTIONS_IMPEXP void vDmProd(int _iMode, double* _pdblIn, int _iLeadDim, int _iRows, int _iCols, double* _pdblOut, int _iInc);
+ELEMENTARY_FUNCTIONS_IMPEXP void vWDmProd(int _iMode, double* _pdblIn1, double* _pdblIn2, int _iLeadDim, int _iRows, int _iCols, double* _pdblOut1, double* _pdblOut2, int _iInc);
 
 ELEMENTARY_FUNCTIONS_IMPEXP double durands(int *_iVal);
-int nint(double _iVal);
-double danints(double _dblVal);
+ELEMENTARY_FUNCTIONS_IMPEXP int nint(double _iVal);
+ELEMENTARY_FUNCTIONS_IMPEXP double danints(double _dblVal);
 
-void ddmsums(int _iMode, double *_pdblIn, int _iRows, int _iCols, double *_pdblOut);
-void zdmsums(int _iMode, double *_pdblRealIn, double *_pdblImgIn, int _iRows, int _iCols, double *_pdblRealOut, double *_pdblImgOut);
+ELEMENTARY_FUNCTIONS_IMPEXP void ddmsums(int _iMode, double *_pdblIn, int _iRows, int _iCols, double *_pdblOut);
+ELEMENTARY_FUNCTIONS_IMPEXP void zdmsums(int _iMode, double *_pdblRealIn, double *_pdblImgIn, int _iRows, int _iCols, double *_pdblRealOut, double *_pdblImgOut);
 
-void franck_matrix(int _iSize, double *_pData);
-void hilb_matrix(int _iSize, double *_pData);
-void magic_matrix(int _iSize, double *_pData);
+ELEMENTARY_FUNCTIONS_IMPEXP void franck_matrix(int _iSize, double *_pData);
+ELEMENTARY_FUNCTIONS_IMPEXP void hilb_matrix(int _iSize, double *_pData);
+ELEMENTARY_FUNCTIONS_IMPEXP void magic_matrix(int _iSize, double *_pData);
 
-void deyes(double *_pdblOut, int _iRows, int _iCols);
+ELEMENTARY_FUNCTIONS_IMPEXP void deyes(double *_pdblOut, int _iRows, int _iCols);
 
 #endif //__BASIC_FUNCTION__
diff --git a/scilab/modules/elementary_functions/includes/dynlib_elementary_functions_gw.h b/scilab/modules/elementary_functions/includes/dynlib_elementary_functions_gw.h
new file mode 100644 (file)
index 0000000..8533981
--- /dev/null
@@ -0,0 +1,21 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2011 - DIGITEO - Antoine ELIAS
+*
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+/*--------------------------------------------------------------------------*/
+#ifdef _MSC_VER
+       #if ELEM_FUNC_GW_EXPORTS
+               #define EXTERN_EF_GW __declspec (dllexport)
+       #else
+               #define EXTERN_EF_GW __declspec (dllimport)
+       #endif
+#else
+       #define EXTERN_EF_GW
+#endif
index fd96c92..63f0c41 100644 (file)
 #define __ELEM_FUNC_GW_HXX__
 
 #include "cpp_gateway_prototype.hxx"
-
-#ifdef _MSC_VER
-       #if ELEM_FUNC_GW_EXPORTS
-               #define EXTERN_EF_GW __declspec (dllexport)
-       #else
-               #define EXTERN_EF_GW __declspec (dllimport)
-       #endif
-#else
-       #define EXTERN_EF_GW
-#endif
+#include "dynlib_elementary_functions_gw.h"
 
 class ElemFuncModule
 {
index 902daa9..6000f8c 100644 (file)
@@ -24,46 +24,45 @@ int sci_spones(char *fname,unsigned long fname_len);
 int sci_isequalbitwise(char *fname, unsigned long fname_len);
 
 // YaSp
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_abs);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_acos);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_asin);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_atan);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_ceil);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_clean);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_conj);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_cos);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_cumprod);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_cumsum);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_diag);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_dsearch);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_exp);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_expm);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_floor);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_frexp);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_gsort);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_imag);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_imult);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_int);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_isreal);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_kron);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_log);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_log1p);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_scimatrix);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_maxi);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_mini);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_nearfloat);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_number_properties);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_prod);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_real);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_round);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_sign);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_sin);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_sqrt);
-//ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_sum);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_tan);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_testmatrix);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_tril);
-ELEMENTARY_FUNCTIONS_IMPEXP C_GATEWAY_PROTOTYPE(sci_triu);
+C_GATEWAY_PROTOTYPE(sci_abs);
+C_GATEWAY_PROTOTYPE(sci_acos);
+C_GATEWAY_PROTOTYPE(sci_asin);
+C_GATEWAY_PROTOTYPE(sci_atan);
+C_GATEWAY_PROTOTYPE(sci_ceil);
+C_GATEWAY_PROTOTYPE(sci_clean);
+C_GATEWAY_PROTOTYPE(sci_conj);
+C_GATEWAY_PROTOTYPE(sci_cos);
+C_GATEWAY_PROTOTYPE(sci_cumprod);
+C_GATEWAY_PROTOTYPE(sci_cumsum);
+C_GATEWAY_PROTOTYPE(sci_diag);
+C_GATEWAY_PROTOTYPE(sci_dsearch);
+C_GATEWAY_PROTOTYPE(sci_exp);
+C_GATEWAY_PROTOTYPE(sci_expm);
+C_GATEWAY_PROTOTYPE(sci_floor);
+C_GATEWAY_PROTOTYPE(sci_frexp);
+C_GATEWAY_PROTOTYPE(sci_gsort);
+C_GATEWAY_PROTOTYPE(sci_imag);
+C_GATEWAY_PROTOTYPE(sci_imult);
+C_GATEWAY_PROTOTYPE(sci_int);
+C_GATEWAY_PROTOTYPE(sci_isreal);
+C_GATEWAY_PROTOTYPE(sci_kron);
+C_GATEWAY_PROTOTYPE(sci_log);
+C_GATEWAY_PROTOTYPE(sci_log1p);
+C_GATEWAY_PROTOTYPE(sci_scimatrix);
+C_GATEWAY_PROTOTYPE(sci_maxi);
+C_GATEWAY_PROTOTYPE(sci_mini);
+C_GATEWAY_PROTOTYPE(sci_nearfloat);
+C_GATEWAY_PROTOTYPE(sci_number_properties);
+C_GATEWAY_PROTOTYPE(sci_prod);
+C_GATEWAY_PROTOTYPE(sci_real);
+C_GATEWAY_PROTOTYPE(sci_round);
+C_GATEWAY_PROTOTYPE(sci_sign);
+C_GATEWAY_PROTOTYPE(sci_sin);
+C_GATEWAY_PROTOTYPE(sci_sqrt);
+C_GATEWAY_PROTOTYPE(sci_tan);
+C_GATEWAY_PROTOTYPE(sci_testmatrix);
+C_GATEWAY_PROTOTYPE(sci_tril);
+C_GATEWAY_PROTOTYPE(sci_triu);
 
 #endif /*  __GW_ELEMENTARIES_FUNCTIONS__ */
 /*--------------------------------------------------------------------------*/
index f589e35..44d8b85 100644 (file)
@@ -68,7 +68,7 @@ static gw_generic_table Tab[] =
        {NULL, ""}, //isequal
        {sci_spones,"spones"},
        {NULL, ""}, //gsort
-       {sci_isequalbitwise,"isequalbitwise"},
+       {NULL, ""}, //isequalbitwise
     {NULL, ""}, //rat
 };
 /*--------------------------------------------------------------------------*/
index 86eaaef..bede37a 100644 (file)
 *
 */
 /*--------------------------------------------------------------------------*/
+#include <stdio.h>
 #include "gw_elementary_functions.h"
 #include "stack-c.h"
 #include "basic_functions.h"
 #include "elementary_functions.h"
-#include "double.h"
+//#include "double.h"
 #include "api_scilab.h"
 #include "Scierror.h"
 #include "api_oldstack.h"
 #include "msgs.h"
 #include "elem_common.h"
+#include "matrix_right_division.h"
+#include "matrix_left_division.h"
+#include "matrix_multiplication.h"
+#include "dynlib_elementary_functions_gw.h"
 
 #ifdef _MSC_VER
 /* BUG 3863 */
@@ -29,7 +34,7 @@ typedef struct {
        int ndng;
 } DCOEFF_struct;
 
-__declspec(dllexport) DCOEFF_struct C2F(dcoeff);
+EXTERN_EF_GW DCOEFF_struct C2F(dcoeff);
 
 #endif
 
diff --git a/scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/cacsd_f_Import.def b/scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/cacsd_f_Import.def
new file mode 100644 (file)
index 0000000..f3357a3
--- /dev/null
@@ -0,0 +1,8 @@
+       LIBRARY    cacsd_f.dll
+
+
+EXPORTS
+;
+;cacsd_f
+;
+shrslv_
\ No newline at end of file
diff --git a/scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/eispack_f_Import.def b/scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/eispack_f_Import.def
new file mode 100644 (file)
index 0000000..a846aca
--- /dev/null
@@ -0,0 +1,10 @@
+LIBRARY    eispack_f.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; eispack_f
+; --------------------------------------- 
+balbak_
+hqror2_
+cdiv_
index 13f8da7..dd5df1d 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;../../../../../libs/dynamiclibrary/includes;../../../../double/includes;..\..\..\src\c;../../../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <PreLinkEvent>
-      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL</Command>
+      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)eispack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)eispack_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)linpack_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)cacsd_f.lib" 1&gt;NUL 2&gt;NUL
+</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>LibScilab.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\ifconsol.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libifcoremdd.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libmmdd.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libirc.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\svml_disp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cacsd_f.lib;eispack_f.lib;linpack_f.lib;LibScilab.lib;elementary_functions_f.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\ifconsol.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libifcoremdd.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libmmdd.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libirc.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\svml_disp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;../../../../../libs/dynamiclibrary/includes;../../../../double/includes;..\..\..\src\c;../../../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </ClCompile>
     <PreLinkEvent>
       <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)eispack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)eispack_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)linpack_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)cacsd_f.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>LibScilab.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\ifconsol.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libifcoremdd.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libmmdd.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libirc.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\svml_disp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cacsd_f.lib;eispack_f.lib;linpack_f.lib;LibScilab.lib;elementary_functions_f.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\ifconsol.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libifcoremdd.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libmmdd.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libirc.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\svml_disp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;../../../../../libs/dynamiclibrary/includes;../../../../double/includes;..\..\..\src\c;../../../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <PreLinkEvent>
-      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL</Command>
+      <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)eispack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)eispack_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)linpack_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)cacsd_f.lib" 1&gt;NUL 2&gt;NUL
+</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>LibScilab.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\ifconsol.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libifcoremd.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libmmd.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libirc.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\svml_disp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cacsd_f.lib;eispack_f.lib;linpack_f.lib;LibScilab.lib;elementary_functions_f.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\ifconsol.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libifcoremd.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libmmd.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\libirc.lib;$(IFORT_COMPILER12)\compiler\lib\ia32\svml_disp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../ast/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/;../../../../threads/includes;../../../../system_env/includes;../../../../string/includes;../../../../../libs/dynamiclibrary/includes;../../../../double/includes;..\..\..\src\c;../../../../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     </ClCompile>
     <PreLinkEvent>
       <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)eispack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)eispack_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)linpack_f.lib" 1&gt;NUL 2&gt;NUL
+lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)cacsd_f.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>LibScilab.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\ifconsol.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libifcoremd.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libmmd.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libirc.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\svml_disp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>cacsd_f.lib;eispack_f.lib;linpack_f.lib;LibScilab.lib;elementary_functions_f.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\ifconsol.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libifcoremd.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libmmd.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\libirc.lib;$(IFORT_COMPILER12)\compiler\lib\intel64\svml_disp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\cpp\getmode.cpp" />
+    <ClCompile Include="..\..\c\sci_abs.c" />
+    <ClCompile Include="..\..\c\sci_acos.c" />
+    <ClCompile Include="..\..\c\sci_asin.c" />
+    <ClCompile Include="..\..\c\sci_atan.c" />
+    <ClCompile Include="..\..\c\sci_ceil.c" />
+    <ClCompile Include="..\..\c\sci_clean.c" />
+    <ClCompile Include="..\..\c\sci_conj.c" />
+    <ClCompile Include="..\..\c\sci_cos.c" />
+    <ClCompile Include="..\..\c\sci_cumprod.c" />
+    <ClCompile Include="..\..\c\sci_cumsum.c" />
+    <ClCompile Include="..\..\c\sci_diag.c" />
+    <ClCompile Include="..\..\c\sci_dsearch.c" />
+    <ClCompile Include="..\..\c\sci_exp.c" />
+    <ClCompile Include="..\..\c\sci_expm.c" />
+    <ClCompile Include="..\..\c\sci_floor.c" />
+    <ClCompile Include="..\..\c\sci_frexp.c" />
+    <ClCompile Include="..\..\c\sci_gsort.c" />
+    <ClCompile Include="..\..\c\sci_imag.c" />
+    <ClCompile Include="..\..\c\sci_imult.c" />
+    <ClCompile Include="..\..\c\sci_int.c" />
+    <ClCompile Include="..\..\c\sci_isequalbitwise.c" />
+    <ClCompile Include="..\..\c\sci_isreal.c" />
+    <ClCompile Include="..\..\c\sci_kron.c" />
+    <ClCompile Include="..\..\c\sci_log.c" />
+    <ClCompile Include="..\..\c\sci_log1p.c" />
+    <ClCompile Include="..\..\c\sci_matrix.c" />
+    <ClCompile Include="..\..\c\sci_maxi.c" />
+    <ClCompile Include="..\..\c\sci_nearfloat.c" />
+    <ClCompile Include="..\..\c\sci_number_properties.c" />
+    <ClCompile Include="..\..\c\sci_prod.c" />
+    <ClCompile Include="..\..\c\sci_rat.c" />
+    <ClCompile Include="..\..\c\sci_real.c" />
+    <ClCompile Include="..\..\c\sci_round.c" />
+    <ClCompile Include="..\..\c\sci_sign.c" />
+    <ClCompile Include="..\..\c\sci_sin.c" />
+    <ClCompile Include="..\..\c\sci_sqrt.c" />
+    <ClCompile Include="..\..\c\sci_tan.c" />
+    <ClCompile Include="..\..\c\sci_testmatrix.c" />
+    <ClCompile Include="..\..\c\sci_tril.c" />
+    <ClCompile Include="..\..\c\sci_triu.c" />
     <ClCompile Include="..\elem_func_gw.cpp" />
     <ClCompile Include="..\sci_eye.cpp" />
     <ClCompile Include="..\sci_isequal.cpp" />
     <ClCompile Include="..\sci_zeros.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\includes\dynlib_elementary_functions_gw.h" />
     <ClInclude Include="..\..\..\includes\elem_func_gw.hxx" />
     <ClInclude Include="..\..\..\includes\getmode.hxx" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="cacsd_f_Import.def" />
+    <None Include="eispack_f_Import.def" />
+    <None Include="elementary_functions_f_Import.def" />
     <None Include="libScilab_import.def" />
+    <None Include="linpack_f_Import.def" />
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\..\..\..\..\bin\blasplus.lib" />
index 8a78ba7..155ab2e 100644 (file)
     <ClCompile Include="..\sci_rand.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\c\sci_abs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_log1p.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_acos.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_asin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_atan.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_ceil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_clean.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_conj.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_cos.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_cumprod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_cumsum.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_diag.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_dsearch.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_exp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_expm.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_floor.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_frexp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_gsort.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_imag.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_imult.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_int.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_isequalbitwise.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_isreal.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_kron.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_log.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_matrix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_maxi.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_nearfloat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_number_properties.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_prod.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_rat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_real.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_round.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_sign.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_sin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_sqrt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_tan.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_testmatrix.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_tril.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\c\sci_triu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\includes\elem_func_gw.hxx">
     <ClInclude Include="..\..\..\includes\getmode.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\includes\dynlib_elementary_functions_gw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="libScilab_import.def">
       <Filter>Libraries Dependencies</Filter>
     </None>
+    <None Include="elementary_functions_f_Import.def">
+      <Filter>Libraries Dependencies</Filter>
+    </None>
+    <None Include="eispack_f_Import.def">
+      <Filter>Libraries Dependencies</Filter>
+    </None>
+    <None Include="cacsd_f_Import.def">
+      <Filter>Libraries Dependencies</Filter>
+    </None>
+    <None Include="linpack_f_Import.def">
+      <Filter>Libraries Dependencies</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Library Include="..\..\..\..\..\bin\blasplus.lib" />
diff --git a/scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elementary_functions_f_Import.def b/scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elementary_functions_f_Import.def
new file mode 100644 (file)
index 0000000..70fd26e
--- /dev/null
@@ -0,0 +1,15 @@
+LIBRARY    elementary_functions_f.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; elementary_functions_f
+; --------------------------------------- 
+intrat_ 
+coef_
+inteye_
+dad_
+dmcopy_
+dmmul_
+dclmat_
+cerr_
diff --git a/scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/linpack_f_Import.def b/scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/linpack_f_Import.def
new file mode 100644 (file)
index 0000000..7e4ebf2
--- /dev/null
@@ -0,0 +1,28 @@
+LIBRARY    linpack_f.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; linpack_f
+; --------------------------------------- 
+       dgbfa_
+       dgeco_
+       dgedi_
+       dgefa_
+       dgesl_
+       dpofa_
+       dqrdc_
+       dqrsl_
+       dqrsm_
+       hhdml_
+       icopy_
+       pade_
+       spofa_
+       dpori_
+       dposl_
+       wcopy_
+       wgeco_
+       wgefa_
+       wgesl_
+       wpade_
+\1a
\ No newline at end of file
index dd306a8..7eb225f 100644 (file)
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)elem_func_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elem_func.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)sparse_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)sparse.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)cacsd_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)api_scilab.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)operations_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)operations.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)eispack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)eispack_f.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)linpack_f.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>LibScilab.lib;elementary_functions_f.lib;elem_func.lib;sparse.lib;cacsd_f.lib;operations.lib;api_scilab.lib;eispack_f.lib;linpack_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LibScilab.lib;elementary_functions_f.lib;sparse.lib;cacsd_f.lib;eispack_f.lib;linpack_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -120,17 +117,14 @@ lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)elem_func_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elem_func.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)sparse_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)sparse.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)cacsd_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)api_scilab.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)operations_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)operations.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)eispack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)eispack_f.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)linpack_f.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>LibScilab.lib;elementary_functions_f.lib;elem_func.lib;sparse.lib;cacsd_f.lib;operations.lib;api_scilab.lib;eispack_f.lib;linpack_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LibScilab.lib;elementary_functions_f.lib;sparse.lib;cacsd_f.lib;eispack_f.lib;linpack_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -155,17 +149,14 @@ lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)elem_func_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elem_func.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)sparse_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)sparse.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)cacsd_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)api_scilab.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)operations_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)operations.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)eispack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)eispack_f.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)linpack_f.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>LibScilab.lib;elementary_functions_f.lib;elem_func.lib;sparse.lib;cacsd_f.lib;operations.lib;api_scilab.lib;eispack_f.lib;linpack_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LibScilab.lib;elementary_functions_f.lib;sparse.lib;cacsd_f.lib;eispack_f.lib;linpack_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -195,17 +186,14 @@ lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
       <Message>Make dependencies</Message>
       <Command>lib /DEF:"$(ProjectDir)LibScilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)LibScilab.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)elem_func_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)elem_func.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)sparse_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)sparse.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)cacsd_f.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)api_scilab_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)api_scilab.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)operations_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)operations.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)eispack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)eispack_f.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(PlatformShortName) /OUT:"$(ProjectDir)linpack_f.lib" 1&gt;NUL 2&gt;NUL
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>LibScilab.lib;elementary_functions_f.lib;elem_func.lib;sparse.lib;cacsd_f.lib;operations.lib;api_scilab.lib;eispack_f.lib;linpack_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>LibScilab.lib;elementary_functions_f.lib;sparse.lib;cacsd_f.lib;eispack_f.lib;linpack_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -243,50 +231,9 @@ lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
     <ClCompile Include="qsort-string.c" />
     <ClCompile Include="qsort.c" />
     <ClCompile Include="rea2db.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_abs.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_acos.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_asin.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_atan.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_ceil.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_chinesehat.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_clean.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_conj.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_cos.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_cumprod.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_cumsum.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_diag.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_dsearch.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_exp.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_expm.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_floor.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_frexp.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_gsort.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_imag.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_imult.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_int.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_isequalbitwise.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_isreal.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_kron.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_log.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_log1p.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_matrix.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_maxi.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_nearfloat.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_number_properties.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_prod.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_rat.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_real.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_round.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_sign.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_sin.c" />
     <ClCompile Include="..\..\sci_gateway\c\sci_spones.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_sqrt.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_sum.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_tan.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_testmatrix.c" />
     <ClCompile Include="sci_tools.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_tril.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_triu.c" />
     <ClCompile Include="scidcopy.c" />
     <ClCompile Include="sub_vector.c" />
     <ClCompile Include="unsfdcopy.c">
@@ -321,12 +268,9 @@ lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\locales\elementary_functions.pot" />
-    <None Include="api_scilab_Import.def" />
     <None Include="cacsd_f_Import.def" />
-    <None Include="elem_func_Import.def" />
     <None Include="elementary_functions_f_Import.def" />
     <None Include="LibScilab_Import.def" />
-    <None Include="Operations_Import.def" />
     <None Include="sparse_Import.def" />
     <None Include="..\..\elementary_functions.iss" />
     <None Include="..\..\sci_gateway\elementary_functions_gateway.xml" />
index 26e69e9..e2d1f0a 100644 (file)
     <ClCompile Include="rea2db.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_abs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_acos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_asin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_atan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_ceil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_chinesehat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_clean.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_conj.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_cos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_cumprod.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_cumsum.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_diag.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_dsearch.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_exp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_expm.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_floor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_frexp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_gsort.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_imag.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_imult.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_int.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_isequalbitwise.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_isreal.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_kron.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_log.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_log1p.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_matrix.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_maxi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_nearfloat.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_number_properties.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_prod.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_rat.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_real.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_round.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_sign.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_sin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\sci_gateway\c\sci_spones.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_sqrt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_sum.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_tan.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_testmatrix.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_tools.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_tril.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_triu.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="scidcopy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="api_scilab_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
     <None Include="cacsd_f_Import.def">
       <Filter>Libraries Dependencies\Imports</Filter>
     </None>
-    <None Include="elem_func_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
     <None Include="elementary_functions_f_Import.def">
       <Filter>Libraries Dependencies\Imports</Filter>
     </None>
     <None Include="LibScilab_Import.def">
       <Filter>Libraries Dependencies\Imports</Filter>
     </None>
-    <None Include="Operations_Import.def">
-      <Filter>Libraries Dependencies\Imports</Filter>
-    </None>
     <None Include="sparse_Import.def">
       <Filter>Libraries Dependencies\Imports</Filter>
     </None>
index bdd15d1..0f69009 100644 (file)
 #define LIST_SORT 'l'
 #define GLOBAL_SORT 'g'
 
+#include "dynlib_elementary_functions.h"
 
-void C2F(gsorts)(char **data, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
-int C2F(gsortd)(double *xD, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
-int C2F(gsortint)(int *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
-int C2F(gsortuint)(unsigned int *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
-int C2F(gsortshort)(short *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
-int C2F(gsortushort)(unsigned short *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
-int C2F(gsortchar)(char *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
-int C2F(gsortuchar)(unsigned char *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
+ELEMENTARY_FUNCTIONS_IMPEXP void C2F(gsorts)(char **data, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(gsortd)(double *xD, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(gsortint)(int *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(gsortuint)(unsigned int *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(gsortshort)(short *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(gsortushort)(unsigned short *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(gsortchar)(char *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(gsortuchar)(unsigned char *xI, int *ind, int *iflag, int *m, int *n, char *type, char *iord);
 
 #endif /* _GSORT_H_ */
index f42c723..ccbc05d 100644 (file)
@@ -95,6 +95,7 @@ lib /DEF:&quot;$(InputDir)sparse_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:
        <Files>
                <Filter Name="Header Files" Filter="fi;fd"/>
                <Filter Name="Library Dependencies">
+               <File RelativePath=".\elementary_functions_gw_Import.def"/>
                <File RelativePath=".\elementary_functions_Import.def"/>
                <File RelativePath=".\Integer_Import.def"/>
                <File RelativePath=".\LibScilab_Import.def"/>
diff --git a/scilab/modules/elementary_functions/src/fortran/elementary_functions_gw_Import.def b/scilab/modules/elementary_functions/src/fortran/elementary_functions_gw_Import.def
new file mode 100644 (file)
index 0000000..df0f7f4
--- /dev/null
@@ -0,0 +1,5 @@
+LIBRARY    elem_func_gw.dll
+
+
+EXPORTS
+dcoeff_
index 95a6ff6..cbb3aa5 100644 (file)
@@ -127,6 +127,7 @@ libscifileio_la_CPPFLAGS=   -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/shell/includes \
                                -I$(top_srcdir)/modules/threads/includes \
                                -I$(top_srcdir)/modules/console/includes \
+                -I$(top_srcdir)/libs/dynamiclibrary/includes \
                                $(HDF5_CFLAGS)
 
 libscifileio_la_CFLAGS=                -I$(srcdir)/includes/ \
index 188afc9..61e2da2 100644 (file)
@@ -606,6 +606,7 @@ libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/shell/includes \
                                -I$(top_srcdir)/modules/threads/includes \
                                -I$(top_srcdir)/modules/console/includes \
+                -I$(top_srcdir)/libs/dynamiclibrary/includes \
                                $(HDF5_CFLAGS)
 
 libscifileio_la_CFLAGS = -I$(srcdir)/includes/ \
index 21b0571..bceff88 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -105,7 +105,7 @@ lib /DEF:"$(ProjectDir)System_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -132,7 +132,7 @@ lib /DEF:"$(ProjectDir)System_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -166,7 +166,7 @@ lib /DEF:"$(ProjectDir)System_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/dynamiclibrary/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -195,7 +195,6 @@ lib /DEF:"$(ProjectDir)System_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\cpp\scilab_sscanf.cpp" />
-    <ClCompile Include="sci_gateway\c\sci_tempname.c" />
     <ClCompile Include="src\c\addfile.c" />
     <ClCompile Include="src\c\basename.c" />
     <ClCompile Include="src\c\cluni0.c" />
@@ -245,18 +244,6 @@ lib /DEF:"$(ProjectDir)System_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
     <ClCompile Include="src\c\readline.c" />
     <ClCompile Include="src\c\removedir.c" />
     <ClCompile Include="src\c\scanf_functions.c" />
-    <ClCompile Include="sci_gateway\c\sci_chdir.c" />
-    <ClCompile Include="sci_gateway\c\sci_copyfile.c" />
-    <ClCompile Include="sci_gateway\c\sci_fprintfMat.c" />
-    <ClCompile Include="sci_gateway\c\sci_fscanfMat.c" />
-    <ClCompile Include="sci_gateway\c\sci_fullpath.c" />
-    <ClCompile Include="sci_gateway\c\sci_get_absolute_file_path.c" />
-    <ClCompile Include="sci_gateway\c\sci_getlongpathname.c" />
-    <ClCompile Include="sci_gateway\c\sci_getrelativefilename.c" />
-    <ClCompile Include="sci_gateway\c\sci_maxfiles.c" />
-    <ClCompile Include="sci_gateway\c\sci_movefile.c" />
-    <ClCompile Include="sci_gateway\c\sci_newest.c" />
-    <ClCompile Include="sci_gateway\c\sci_pwd.c" />
     <ClCompile Include="src\c\scicurdir.c" />
     <ClCompile Include="src\c\splitpath.c" />
     <ClCompile Include="src\c\Status2Mode.c" />
index 5a13d6f..468e933 100644 (file)
     <ClCompile Include="src\c\scanf_functions.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_chdir.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_copyfile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_fprintfMat.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_fscanfMat.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_fullpath.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_get_absolute_file_path.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_getlongpathname.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_getrelativefilename.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_maxfiles.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_movefile.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_newest.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_pwd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\scicurdir.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\c\createtempfilename.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_tempname.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\cpp\scilab_sscanf.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
index b79b158..811e7ff 100644 (file)
 /*--------------------------------------------------------------------------*/
 FILEIO_IMPEXP int gw_fileio(void);
 /*--------------------------------------------------------------------------*/
-
-//YaSp
-FILEIO_IMPEXP C_GATEWAY_PROTOTYPE(sci_pwd);
-FILEIO_IMPEXP C_GATEWAY_PROTOTYPE(sci_chdir);
-FILEIO_IMPEXP C_GATEWAY_PROTOTYPE(sci_copyfile);
-FILEIO_IMPEXP C_GATEWAY_PROTOTYPE(sci_movefile);
-FILEIO_IMPEXP C_GATEWAY_PROTOTYPE(sci_fscanfMat);
-FILEIO_IMPEXP C_GATEWAY_PROTOTYPE(sci_fprintfMat);
+C_GATEWAY_PROTOTYPE(sci_pwd);
+C_GATEWAY_PROTOTYPE(sci_chdir);
+C_GATEWAY_PROTOTYPE(sci_copyfile);
+C_GATEWAY_PROTOTYPE(sci_movefile);
+C_GATEWAY_PROTOTYPE(sci_fscanfMat);
+C_GATEWAY_PROTOTYPE(sci_fprintfMat);
 
 /*--------------------------------------------------------------------------*/
 #endif /* __GW_FILEIO_H__ */
index aa84d5f..009e230 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;../../../../libs/dynamiclibrary/includes;../../../io/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;../../../../libs/dynamiclibrary/includes;../../../io/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;../../../../libs/dynamiclibrary/includes;../../../io/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes;../../../windows_tools/includes;../../../threads/includes;../../../console/includes;../../../../libs/dynamiclibrary/includes;../../../io/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\c\sci_chdir.c" />
+    <ClCompile Include="..\c\sci_copyfile.c" />
+    <ClCompile Include="..\c\sc