remove some extern, clean some includes, good way to export symbols in elementary_fun... 87/987/3
Allan CORNET [Fri, 11 Jun 2010 11:01:18 +0000 (13:01 +0200)]
Change-Id: Iafc10216f6937ed1b909468f95e8f0bc2db1a85a

79 files changed:
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/console.vcproj
scilab/modules/console/src/c/dropFiles.c
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/Os_specific.h [deleted file]
scilab/modules/core/src/c/SCIHOME.c
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/getmodules.c
scilab/modules/core/src/c/inisci-c.c
scilab/modules/core/src/c/loadversion.c
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/src/c/dassl.c
scilab/modules/differential_equations/src/c/differential_equations.vcproj
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/src/c/addinter.c
scilab/modules/dynamic_link/src/c/dynamic_link.c
scilab/modules/dynamic_link/src/c/dynamic_link.vcproj
scilab/modules/elementary_functions/includes/dynlib_elementary_functions.h [new file with mode: 0644]
scilab/modules/elementary_functions/includes/elementary_functions.h
scilab/modules/elementary_functions/includes/finite.h
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/includes/idmax.h
scilab/modules/elementary_functions/includes/idmin.h
scilab/modules/elementary_functions/includes/int2db.h
scilab/modules/elementary_functions/includes/rea2db.h
scilab/modules/elementary_functions/includes/sci_tools.h
scilab/modules/elementary_functions/includes/scidcopy.h
scilab/modules/elementary_functions/includes/unsfdcopy.h
scilab/modules/elementary_functions/includes/vfinite.h
scilab/modules/elementary_functions/includes/xerhlt.h
scilab/modules/elementary_functions/src/c/cmp.c
scilab/modules/elementary_functions/src/c/cmp.h [new file with mode: 0644]
scilab/modules/elementary_functions/src/c/elementary_functions.def [deleted file]
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/elementary_functions/src/c/elementary_functions_header.def [deleted file]
scilab/modules/elementary_functions/src/c/vceil.c
scilab/modules/elementary_functions/src/c/vceil.h [new file with mode: 0644]
scilab/modules/elementary_functions/src/c/vfloor.c
scilab/modules/elementary_functions/src/c/vfloor.h [new file with mode: 0644]
scilab/modules/elementary_functions/src/c/vfrexp.c
scilab/modules/elementary_functions/src/c/vfrexp.h [new file with mode: 0644]
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcproj
scilab/modules/graphics/sci_gateway/c/sci_glue.c
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/jvm/src/c/addToLibrarypath.c
scilab/modules/jvm/src/c/loadClasspath.c
scilab/modules/jvm/src/c/loadLibrarypath.c
scilab/modules/jvm/src/c/loadOnUseClassPath.c
scilab/modules/linear_algebra/sci_gateway/c/sci_dgeev.c
scilab/modules/linear_algebra/sci_gateway/c/sci_dggev.c
scilab/modules/linear_algebra/sci_gateway/c/sci_dsyev.c
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/mexlib/src/c/mexlib.c
scilab/modules/mexlib/src/libmat/libmat.vcproj
scilab/modules/mexlib/src/libmex/libmex.vcproj
scilab/modules/mexlib/src/libmx/libmx.vcproj
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/src/c/basout.c
scilab/modules/output_stream/src/c/output_stream.vcproj
scilab/modules/output_stream/src/c/sciprint_full.c
scilab/modules/pvm/src/c/pvm_send.c
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/src/c/mspelm.c
scilab/modules/sparse/src/c/sparse.vcproj
scilab/modules/spreadsheet/sci_gateway/c/sci_xls_open.c
scilab/modules/spreadsheet/src/c/xls.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVersion.c
scilab/modules/tclsci/src/c/ScilabEval.c
scilab/modules/xcos/Makefile.in

index 17a8b3a..caef1cb 100644 (file)
@@ -74,6 +74,7 @@ libsciconsole_la_CFLAGS=      $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
+                               -I$(top_srcdir)/modules/fileio/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
 # Name of the library
index a90a257..7d2d464 100644 (file)
@@ -481,6 +481,7 @@ libsciconsole_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
+                               -I$(top_srcdir)/modules/fileio/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
 
index d07e089..59a66c3 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 39d59e4..fd12b5c 100644 (file)
@@ -16,9 +16,9 @@
 #include <stdlib.h>
 #include "dropFiles.h"
 #include "MALLOC.h"
-#include "../../../core/includes/storeCommand.h" /* storecommand */
-#include "../../../fileio/includes/FindFileExtension.h"
-#include "../../../fileio/includes/URIFileToFilename.h"
+#include "storeCommand.h" /* storecommand */
+#include "FindFileExtension.h"
+#include "URIFileToFilename.h"
 #include "../../../string/includes/stricmp.h"
 #include "../../../core/src/c/with_module.h"
 #if _MSC_VER
index a88073f..5493f57 100644 (file)
@@ -288,6 +288,7 @@ libscicore_la_CFLAGS = -I$(srcdir)/includes/ \
        -I$(top_srcdir)/modules/action_binding/includes \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/localization/includes \
+       -I$(top_srcdir)/modules/io/includes \
        -I$(top_srcdir)/modules/tclsci/includes \
        -I$(top_srcdir)/modules/dynamic_link/includes \
        -I$(top_srcdir)/modules/pvm/includes \
index 508609e..8beca88 100644 (file)
@@ -795,6 +795,7 @@ libscicore_la_CFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/modules/action_binding/includes \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/localization/includes \
+       -I$(top_srcdir)/modules/io/includes \
        -I$(top_srcdir)/modules/tclsci/includes \
        -I$(top_srcdir)/modules/dynamic_link/includes \
        -I$(top_srcdir)/modules/pvm/includes \
diff --git a/scilab/modules/core/includes/Os_specific.h b/scilab/modules/core/includes/Os_specific.h
deleted file mode 100644 (file)
index 6fa88ca..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- * Copyright (C) INRIA - 2008 - Bruno JOFRET
- *
- * 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 SUNSCI_PROTO
-#define  SUNSCI_PROTO
-
-#include "machine.h"
-
-typedef long int ftnlen ;
-
-/*  "addinter-n.c.X1" */
-
-void C2F(addinter)(int *iflag,int *descla, int *ptrdescla, int *nvla, char *iname,
-                  int *desc, int *ptrdesc, int *nv, char *c_cpp,
-                  int *lib_cpp, int *err);
-
-
-/*  "basin-n.c.X1" */
-
-extern int C2F(basin)(int *ierr, int *lunit, char *string, char *fmt, ftnlen string_len, ftnlen fmt_len);
-
-/*  "basout-n.c.X1" */
-extern int C2F(basou1)(int *lunit, char *string, ftnlen string_len);
-/*  "cgpath-n.c.X1" */
-extern void C2F(cgpath)(char *nomfic, int *ln);
-/*  "clunit-n.c.X1" */
-extern int C2F(clunit)(int *lunit, char *name, int *mode, ftnlen name_len);
-/*  "dbasin-n.c.X1" */
-extern int C2F(dbasin)(int *ierr, int *lunit, char *fmt, double *v, int *iv, int *n, ftnlen fmt_len);
-extern int C2F(s2val)(char *str, double *v, int *iv, int *n, int *maxv, int *ierr, ftnlen str_len);
-extern int C2F(nextv)(char *str, double *v, int *nv, int *ir, int *ierr, ftnlen str_len);
-extern int C2F(s2int)(char *str, int *nlz, int *v, int *ir, int *ierr, ftnlen str_len);
-/*  "fgetarg-n.c.X1" */
-extern int C2F(fgetarg)(int *n, char *str, ftnlen str_len);
-
-/*  "getpidc-n.c.X1" */
-extern int C2F(getpidc)(int *id1);
-
-/*  "inffic-n.c.X1" */
-extern void C2F(inffic)(int *iopt, char *name, int *nc);
-extern void C2F(infficl)(int *iopt, int *nc);
-/*  "inibrk-n.c.X1" */
-extern int C2F(inibrk)(void);
-extern int C2F(sunieee)(void);
-extern int C2F(my_handler_)(int *sig, int *code, int *sigcontext, int *addr);
-extern int C2F(my_ignore_)(int *sig, int *code, int *sigcontext, int *addr);
-
-/*  "plevel-n.c.X1" */
-extern int C2F(plevel)(int *n);
-/*  "sigbas-n.c.X1" */
-extern int C2F(systemc)(char *command, int *stat);
-/*  "timer-n.c.X1" */
-extern int C2F(stimer)(void);
-/*  "tmpdir-n.c.X1" */
-extern void C2F(settmpdir)(void);
-extern void C2F(tmpdirc)(void);
-
-/* link.c */
-extern int LinkStatus (void);
-
-
-#endif /* SUNSCI_PROTO */
index 09ae69c..aed696c 100644 (file)
@@ -18,7 +18,7 @@
 #include "PATH_MAX.h"
 #include "createdirectory.h"
 #include "isdir.h"
-#include "../../../io/includes/getenvc.h"
+#include "getenvc.h"
 #include "scilabDefaults.h"
 #ifdef _MSC_VER
 #include "getshortpathname.h"
index 810b461..15bb61a 100644 (file)
@@ -17,7 +17,6 @@
 #include <signal.h>
 #include "csignal.h"
 #include "addinter.h" /* for DynInterfStart */
-#include "Os_specific.h" /* for DynInterfStart */
 #include "callinterf.h"
 #include "sciprint.h"
 #include "Scierror.h"
index fcd75e2..3bd48d5 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
                                PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
                                PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\Os_specific.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\includes\PARAMS.h"
                                >
                        </File>
index e6dc0cf..f11c65a 100644 (file)
@@ -23,7 +23,7 @@
 #include "sciprint.h"
 #include "GetXmlFileEncoding.h"
 #include "scilabDefaults.h"
-#include "../../../fileio/includes/FileExist.h"
+#include "FileExist.h"
 #ifdef _MSC_VER
 #include "strdup_windows.h"
 #endif
index 9bbe59c..22482b6 100644 (file)
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h> /* getenv ! */
-#include "../../../io/includes/getenvc.h"
-#include "../../../fileio/includes/FileExist.h"
+#include "getenvc.h"
+#include "FileExist.h"
 #include "localization.h"
-#include "Os_specific.h"
 #include "core_math.h" 
 #include "setgetSCIpath.h"
 #include "MALLOC.h"
index 5a3b572..f3e63e2 100644 (file)
@@ -22,7 +22,7 @@
 #include "scilabDefaults.h"
 #include "localization.h"
 #include "stricmp.h"
-#include "../../../fileio/includes/FileExist.h"
+#include "FileExist.h"
 #ifdef _MSC_VER
 #include "strdup_windows.h"
 #endif
index 84141c5..5dbc47b 100644 (file)
@@ -130,6 +130,7 @@ sci_gateway/fortran/bbvode.f
 libscidifferential_equations_la_CFLAGS=        -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/elementary_functions/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes
 
 pkglib_LTLIBRARIES = libscidifferential_equations.la
index d786416..719e155 100644 (file)
@@ -564,6 +564,7 @@ sci_gateway/fortran/bbvode.f
 libscidifferential_equations_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/elementary_functions/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes
 
 pkglib_LTLIBRARIES = libscidifferential_equations.la
index 1698018..e8922c6 100644 (file)
@@ -12,7 +12,7 @@
  */
 
 /* C driver over ddassl to handle longjump from xerhlt*/
-#include "../../../elementary_functions/includes/xerhlt.h"
+#include "xerhlt.h"
 
 
 extern void C2F(ddassl)(void *res, int *neq, double *t, double *y, double *yprime, 
index a85c1d2..1aa1f37 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 5de12f7..bfc7903 100644 (file)
@@ -26,6 +26,7 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/fileio/includes \
 -I$(top_srcdir)/modules/localization/includes \
+-I$(top_srcdir)/modules/string/includes \
 -I$(top_srcdir)/modules/io/includes \
 -I$(top_srcdir)/libs/dynamiclibrary/includes \
 -I$(srcdir)/src/c/ \
index 01e3bff..01cd234 100644 (file)
@@ -435,6 +435,7 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/fileio/includes \
 -I$(top_srcdir)/modules/localization/includes \
+-I$(top_srcdir)/modules/string/includes \
 -I$(top_srcdir)/modules/io/includes \
 -I$(top_srcdir)/libs/dynamiclibrary/includes \
 -I$(srcdir)/src/c/ \
index 68c2601..c117893 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "core_math.h"
 #include "dynamic_link.h"
-#include "../../../string/includes/men_Sutils.h"
+#include "men_Sutils.h"
 #include "addinter.h" 
 
 #include "do_error_number.h"
index 7f6a4e1..419aae6 100644 (file)
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include "dynamic_link.h"
 #include "dynamiclibrary.h"
-#include "../../../string/includes/men_Sutils.h"
+#include "men_Sutils.h"
 #include "MALLOC.h" /* MALLOC */
 #include "warningmode.h"
 #include "sciprint.h"
index dc4d10e..e1eeb6b 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
diff --git a/scilab/modules/elementary_functions/includes/dynlib_elementary_functions.h b/scilab/modules/elementary_functions/includes/dynlib_elementary_functions.h
new file mode 100644 (file)
index 0000000..8ec23f1
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - 2010 - 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_ELEMENTARY_FUNCTIONS_H__
+#define __DYNLIB_ELEMENTARY_FUNCTIONS_H__
+
+#ifdef _MSC_VER
+       #ifdef ELEMENTARY_FUNCTIONS_EXPORTS
+               #define ELEMENTARY_FUNCTIONS_IMPEXP __declspec(dllexport)
+       #else
+               #define ELEMENTARY_FUNCTIONS_IMPEXP __declspec(dllimport)
+       #endif
+#else
+       #define ELEMENTARY_FUNCTIONS_IMPEXP
+#endif
+
+#endif /* __DYNLIB_ELEMENTARY_FUNCTIONS_H__ */
+/*--------------------------------------------------------------------------*/ 
index 4e7f9da..b8e5d02 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * Scilab( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright(C) INRIA
+ * Copyright(C) DIGITEO - 2010 - 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
  *
  */
 
-#ifndef __CALELM_H 
-#define  __CALELM_H 
+#ifndef __ELEMENTARY_FUNCTIONS_H__
+#define __ELEMENTARY_FUNCTIONS_H__
 
-#include "machine.h" /* int , C2F */
+#include "machine.h" /* C2F */
 
-typedef int(*I_fp)();
+/* these functions as fortran subroutines of elementary_functions */
 
-int C2F(vfinite)(int *n, double *v);
+int C2F(dmcopy)(double *a, int *na, double *b, int *nb, int *m, int *n);
+int C2F(dset)(int *n, double *dx, double *dy, int *incy);
+int C2F(wwrdiv)(double *ar, double *ai, int *ia, double *br, double *bi, int *ib, double *rr, double *ri, int *ir, int *n, int *ierr);
+int C2F(dmmul)(double *a, int *na, double *b, int *nb, double *c__, int *nc, int *l, int *m, int *n);
+int C2F(dsort)(double *count, int *n, int *index);
 
+#endif /* __ELEMENTARY_FUNCTIONS_H__ */
 
-extern int C2F(rcsort)(I_fp test, int *isz, int *iptr, int *iv, int *n, int *index);
-
-extern double C2F(arcosh)(double *x);
-extern double C2F(arsinh)(double *x);
-extern int C2F(calerf)(double *arg, double *result, int *jint);
-extern double C2F(derf)(double *x);
-extern double C2F(derfc)(double *x);
-extern double C2F(derfcx)(double *x);
-extern int C2F(dgefa)(double *a, int *lda, int *n, int *ipvt, int *info);
-extern int C2F(ccopy)(int *n, char *dx, int *incx, char *dy, int *incy, int dx_len, int dy_len);
-extern double C2F(coshin)(double *x);
-extern int C2F(cupro)(int *n, double *w);
-extern int C2F(cuproi)(int *n, double *wr, double *wi);
-extern int C2F(cusum)(int *n, double *w);
-extern int C2F(dadd)(int *n, double *dx, int *incx, double *dy, int *incy);
-extern int C2F(dad)(double *a, int *na, int *i1, int *i2, int *j1, int *j2, double *r__, int *isw);
-extern int C2F(ddif)(int *n, double *a, int *na, double *b, int *nb);
-extern int C2F(ddpow1)(int *n, double *v, int *iv, double *p, int *ip, double *rr, double *ri, int *ir, int *ierr, int *iscmpl);
-extern int C2F(ddpowe)(double *v, double *p, double *rr, double *ri, int *ierr, int *iscmpl);
-extern int C2F(ddpow)(int *n, double *vr, double *vi, int *iv, double *dpow, int *ierr, int *iscmpl);
-extern int C2F(ddrdiv)(double *a, int *ia, double *b, int *ib, double *r__, int *ir, int *n, int *ierr);
-extern int C2F(dipowe)(double *v, int *p, double *r__, int *ierr);
-extern int C2F(dipow)(int *n, double *v, int *iv, int *ipow, int *ierr);
-extern int C2F(dlblks)(char *name__, int *nbc, int name_len);
-extern double C2F(dlgama)(double *x);
-extern int C2F(dmcopy)(double *a, int *na, double *b, int *nb, int *m, int *n);
-extern int C2F(dmmul1)(double *a, int *na, double *b, int *nb, double *c__, int *nc, int *l, int *m, int *n);
-extern int C2F(dmmul)(double *a, int *na, double *b, int *nb, double *c__, int *nc, int *l, int *m, int *n);
-extern int C2F(dmprod)(int *flag__, double *a, int *na, int *m, int *n, double *v, int *nv);
-extern int C2F(dmsum)(int *flag__, double *a, int *na, int *m, int *n, double *v, int *nv);
-extern int C2F(drdiv)(double *a, int *ia, double *b, int *ib, double *r__, int *ir, int *n, int *ierr);
-extern int C2F(dset)(int *n, double *dx, double *dy, int *incy);
-extern int C2F(dsort)(double *count, int *n, int *index);
-extern double C2F(dsum)(int *n, double *dx, int *incx);
-extern int C2F(dtild)(int *n, double *x, int *incx);
-extern int C2F(dvmul)(int *n, double *dx, int *incx, double *dy, int *incy);
-extern int C2F(dwdiv)(double *ar, double *br, double *bi, double *cr, double *ci, int *ierr);
-extern int C2F(dwpow1)(int *n, double *v, int *iv, double *pr, double *pi, int *ip, double *rr, double *ri, int *ir, int *ierr);
-extern int C2F(dwpowe)(double *v, double *pr, double *pi, double *rr, double *ri, int *ierr);
-extern int C2F(dwpow)(int *n, double *vr, double *vi, int *iv, double *powr, double *powi, int *ierr);
-extern int C2F(dwrdiv)(double *ar, int *ia, double *br, double *bi, int *ib, double *rr, double *ri, int *ir, int *n, int *ierr);
-extern int C2F(franck)(double *a, int *na, int *n, int *job);
-extern double C2F(dgamma)(double *x);
-extern int C2F(gdcp2i)(int *n, int *itab, int *m);
-extern int C2F(hilber)(double *a, int *lda, int *n);
-
-extern int C2F(idmax)(int *n, double *dx, int *incx);
-extern int C2F(idmin)(int *n, double *dx, int *incx);
-extern int C2F(imcopy)(int *a, int *na, int *b, int *nb, int *m, int *n);
-extern double C2F(infinity)(double *x);
-extern int C2F(intp)(double *x, double *xd, double *yd, int *n, int *nc, double *y);
-extern int C2F(isort)(int *count, int *n, int *index);
-extern int C2F(isova0)(double *a, int *lda, int *m, int *n, double *path, int *kpath, int *ir, int *ic, int *dir, int *pend, int *h__, int *v, double *c__);
-extern int C2F(isoval)(double *a, int *lda, int *m, int *n, double *c__, double *path, int *npath, int *maxp, int *ierr, int *iw, int *job);
-extern int C2F(ivimp)(int *i1, int *i2, int *pas, int *iv);
-extern int C2F(iwamax)(int *n, double *xr, double *xi, int *incx);
-extern int C2F(kronc)(double *ar, double *ai, int *ia, int *ma, int *na, double *br, double *bi, int *ib, int *mb, int *nb, double *pkr, double *pki, int *ik);
-extern int C2F(kronr)(double *a, int *ia, int *ma, int *na, double *b, int *ib, int *mb, int *nb, double *pk, int *ik);
-extern int C2F(lnblnk)(char *str, int str_len);
-extern int C2F(magic)(double *a, int *lda, int *n);
-extern int C2F(mtran)(double *a, int *na, double *b, int *nb, int *m, int *n);
-extern double C2F(nearfloat)(double *x, double *dir);
-extern double C2F(psi)(double *xx);
-extern double C2F(pythag)(double *a, double *b);
-extern int C2F(rat)(double *x, double *eps, int *n, int *d__, int *fail);
-extern int C2F(ribesl)(double *x, double *alpha, int *nb, int *ize, double *b, int *ncalc);
-extern int C2F(rjbesl)(double *x, double *alpha, int *nb, double *b, int *ncalc);
-extern int C2F(rkbesl)(double *x, double *alpha, int *nb, int *ize, double *bk, int *ncalc);
-/*extern double C2F(round)(double *x1);*/
-extern int C2F(rybesl)(double *x, double *alpha, int *nb, double *by, int *ncalc);
-extern double C2F(urand)(int *iy);
-extern int C2F(vpythag)(int *n, double *xr, double *xi);
-extern int C2F(wacos)(double *zr, double *zi, double *ar, double *ai);
-extern int C2F(wasin)(double *zr, double *zi, double *ar, double *ai);
-extern double C2F(wasum)(int *n, double *xr, double *xi, int *incx);
-extern int C2F(watan)(double *xr, double *xi, double *yr, double *yi);
-extern double C2F(lnp1m1)(double *s);
-extern double C2F(logp1)(double *x);
-/* comlen stack_ 16 */
-/* comlen vstk_ 65568 */
-/* comlen recu_ 8212 */
-/* comlen iop_ 65620 */
-/* comlen errgst_ 24 */
-/* comlen com_ 68 */
-/* comlen cha1_ 4222 */
-/* comlen dbg_ 976 */
-/* comlen adre_ 260 */
-/* comlen intersci_ 1924 */
-extern int C2F(waxpy)(int *n, double *sr, double *si, double *xr, double *xi, int *incx, double *yr, double *yi, int *incy);
-extern int C2F(wcopy)(int *n, double *dxr, double *dxi, int *incx, double *dyr, double *dyi, int *incy);
-extern int C2F(wddiv)(double *ar, double *ai, double *br, double *cr, double *ci, int *ierr);
-extern int C2F(wdiv)(double *ar, double *ai, double *br, double *bi, double *cr, double *ci);
-extern double C2F(wdotci)(int *n, double *xr, double *xi, int *incx, double *yr, double *yi, int *incy);
-extern double C2F(wdotcr)(int *n, double *xr, double *xi, int *incx, double *yr, double *yi, int *incy);
-extern int C2F(wdpow1)(int *n, double *vr, double *vi, int *iv, double *p, int *ip, double *rr, double *ri, int *ir, int *ierr);
-extern int C2F(wdpowe)(double *vr, double *vi, double *p, double *rr, double *ri, int *ierr);
-extern int C2F(wdpow)(int *n, double *vr, double *vi, int *iv, double *dpow, int *ierr);
-extern int C2F(wdrdiv)(double *ar, double *ai, int *ia, double *br, int *ib, double *rr, double *ri, int *ir, int *n, int *ierr);
-extern int C2F(wipowe)(double *vr, double *vi, int *p, double *rr, double *ri, int *ierr);
-extern int C2F(wipow)(int *n, double *vr, double *vi, int *iv, int *ipow, int *ierr);
-extern int C2F(wlog)(double *xr, double *xi, double *yr, double *yi);
-extern int C2F(wmmul)(double *ar, double *ai, int *na, double *br, double *bi, int *nb, double *cr, double *ci, int *nc, int *l, int *m, int *n);
-extern int C2F(wmprod)(int *flag__, double *ar, double *ai, int *na, int *m, int *n, double *vr, double *vi, int *nv);
-extern int C2F(wmsum)(int *flag__, double *ar, double *ai, int *na, int *m, int *n, double *vr, double *vi, int *nv);
-extern int C2F(wmul)(double *ar, double *ai, double *br, double *bi, double *cr, double *ci);
-extern double C2F(wnrm2)(int *n, double *xr, double *xi, int *incx);
-extern int C2F(wrscal)(int *n, double *s, double *xr, double *xi, int *incx);
-extern int C2F(wscal)(int *n, double *sr, double *si, double *xr, double *xi, int *incx);
-extern int C2F(wsign)(double *xr, double *xi, double *yr, double *yi, double *zr, double *zi);
-extern int C2F(rptest)(double *r1, double *i1, double *r2, double *i2);
-extern int C2F(modtest)(double *r1, double *i1, double *r2, double *i2);
-extern int C2F(wsqrt)(double *xr, double *xi, double *yr, double *yi);
-extern int C2F(wswap)(int *n, double *xr, double *xi, int *incx, double *yr, double *yi, int *incy);
-extern int C2F(wtan)(double *xr, double *xi, double *yr, double *yi);
-extern int C2F(wvmul)(int *n, double *dxr, double *dxi, int *incx, double *dyr, double *dyi, int *incy);
-extern int C2F(wwdiv)(double *ar, double *ai, double *br, double *bi, double *cr, double *ci, int *ierr);
-extern int C2F(wwpow1)(int *n, double *vr, double *vi, int *iv, double *pr, double *pi, int *ip, double *rr, double *ri, int *ir, int *ierr);
-extern int C2F(wwpowe)(double *vr, double *vi, double *pr, double *pi, double *rr, double *ri, int *ierr);
-extern int C2F(wwpow)(int *n, double *vr, double *vi, int *iv, double *powr, double *powi, int *ierr);
-extern int C2F(wwrdiv)(double *ar, double *ai, int *ia, double *br, double *bi, int *ib, double *rr, double *ri, int *ir, int *n, int *ierr);
-#endif /** SCI_   **/
index e9e7506..2b98797 100644 (file)
  *
  */
 
-#ifndef __FINITE__
-#define __FINITE__
+#ifndef __FINITE_H__
+#define __FINITE_H__
 
 #include "doublecomplex.h" 
+#include "dynlib_elementary_functions.h"
 
 #ifndef HAVE_FINITE
-int finite(double x);
+ELEMENTARY_FUNCTIONS_IMPEXP int finite(double x);
 #endif
 
-int finiteComplex(doublecomplex x);
-#endif /* !__FINITE__ */
+ELEMENTARY_FUNCTIONS_IMPEXP int finiteComplex(doublecomplex x);
+
+#endif /* __FINITE_H__ */
index 0580e95..619587c 100644 (file)
@@ -14,9 +14,9 @@
 #define __GW_ELEMENTARIES_FUNCTIONS__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
-#include "api_common.h"
+#include "dynlib_elementary_functions.h"
 /*--------------------------------------------------------------------------*/
-int gw_elementary_functions(void);
+ELEMENTARY_FUNCTIONS_IMPEXP int gw_elementary_functions(void);
 /*--------------------------------------------------------------------------*/
 int C2F(sci_abs)(char *fname,unsigned long fname_len);
 int C2F(sci_real)(char *fname,unsigned long fname_len);
index 5cb6ed2..41fff01 100644 (file)
@@ -14,6 +14,7 @@
 #define __IDMAX_H__
 
 #include "machine.h" /* C2F */
+#include "dynlib_elementary_functions.h"
 
 /**
 * finds the index of the first element having maximum value 
@@ -25,7 +26,7 @@
  * @param incr indice
  * @return 0
 */
-int C2F(idmax)(int *n, double *x, int *incx);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(idmax)(int *n, double *x, int *incx);
 
 #endif /* __IDMAX_H__ */
 /*--------------------------------------------------------------------------*/ 
index d5e091f..f983782 100644 (file)
@@ -14,6 +14,7 @@
 #define __IDMIN_H__
 
 #include "machine.h" /* C2F */
+#include "dynlib_elementary_functions.h"
 
 /**
  * finds the index of the first element having minimum value 
@@ -24,7 +25,7 @@
  * @param incr indice
  * @return 0
 */
-int C2F(idmin)(int *n, double *x, int *incx);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(idmin)(int *n, double *x, int *incx);
 
 #endif /* __IDMIN_H__ */
 /*--------------------------------------------------------------------------*/ 
index a5ac690..33ece6b 100644 (file)
@@ -14,6 +14,7 @@
 #define __INT2DB_H__
 
 #include "machine.h" /* C2F */
+#include "dynlib_elementary_functions.h"
 
 /**
 * translate a int vector to double precision vector
@@ -23,7 +24,7 @@
 * @param dy double precision vector
 * @param incy increment order
 */
-int C2F(int2db)(int *n, int *dx, int *incx, double *dy, int *incy);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(int2db)(int *n, int *dx, int *incx, double *dy, int *incy);
 
 #endif /* __INT2DB_H__ */
 /*--------------------------------------------------------------------------*/
index fbec470..ff9a220 100644 (file)
  */
 /*--------------------------------------------------------------------------*/
 
-#ifndef __READ2DB__
-#define __READ2DB__
+#ifndef __READ2DB_H__
+#define __READ2DB_H__
 
 #include "machine.h"
-
+#include "dynlib_elementary_functions.h"
 /*--------------------------------------------------------------------------*/
 /* cette subroutine traduit un vecteur dx, de taille n, sur un
    vecteur double precision dy.
@@ -25,6 +25,6 @@
    fonction prend les composantes en ordre inverse.
 */
 /*--------------------------------------------------------------------------*/
-int C2F(rea2db)(int *n, float *dx, int *incx, double *dy, int *incy);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(rea2db)(int *n, float *dx, int *incx, double *dy, int *incy);
 
-#endif /* !__READ2DB__ */
+#endif /* __READ2DB_H__ */
index f579a3b..6893880 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 1997 - INRIA
+ * 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
  *
  */
 
-#ifndef __SCI_TOOLS
-#define __SCI_TOOLS
+#ifndef __SCI_TOOLS_H__
+#define __SCI_TOOLS_H__
+
 #include "machine.h"
+#include "dynlib_elementary_functions.h"
+
 #define DATA_TYPE_SCALAR     1
 
 #define TYPE_DOUBLE  0
 #define TYPE_COMPLEX 1
 
-/* Valide for Real or Complex matrix */
+/* valid for Real or Complex matrix */
 #define TYPE(ptr)   (((int*) (ptr))[-1])
 #define NB_COL(ptr) (((int*) (ptr))[-2])
 #define NB_ROW(ptr) (((int*) (ptr))[-3])
 #define SET_NB_COL(ptr,m) (((int*) (ptr))[-2] = (m))
 #define SET_NB_ROW(ptr,n) (((int*) (ptr))[-3] = (n))
 
-typedef struct {double re, im;} complex16;
-
-extern int  F2C(mycmatptr)(char *name,int *m, int *n, int *type, int *lp);
-extern void C2F(ccomplexf)(int *n, double **ip, double *op);
-extern void (SciToF77)(double *ptr, int size, int lda);
-extern void (F77ToSci)(double *ptr, int size, int lda);
+ELEMENTARY_FUNCTIONS_IMPEXP void (SciToF77)(double *ptr, int size, int lda);
+ELEMENTARY_FUNCTIONS_IMPEXP void (F77ToSci)(double *ptr, int size, int lda);
 
-void double2z(double *ptr, double *ptr77z, int size, int lda);
-void z2double(double *ptrz, double *ptrsci, int size, int lda);
+ELEMENTARY_FUNCTIONS_IMPEXP void double2z(double *ptr, double *ptr77z, int size, int lda);
+ELEMENTARY_FUNCTIONS_IMPEXP void z2double(double *ptrz, double *ptrsci, int size, int lda);
 
-#endif /* __SCI_TOOLS */
+#endif /* __SCI_TOOLS_H__ */
index dd0f91a..f4c6d51 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2007 - 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
  */
 
 /*--------------------------------------------------------------------------*/
-/* @author Sylvestre LEDRU */
 /* rewrite unsfdcopy.f */
 /*--------------------------------------------------------------------------*/
+#ifndef __SCIDCOPY_H__
+#define __SCIDCOPY_H__
 
+#include "machine.h"
+#include "dynlib_elementary_functions.h"
 /**
  * <long-description>
  *
@@ -25,4 +29,6 @@
  * @param incy  
  * @return <ReturnValue>
  */
-int C2F(scidcopy)(int *n, long long *dx, int *incx, long long *dy, int *incy);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(scidcopy)(int *n, long long *dx, int *incx, long long *dy, int *incy);
+
+#endif /* __SCIDCOPY_H__ */
index 81bc4e2..f6058a2 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2007 - 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
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
+
 /*--------------------------------------------------------------------------*/
-/* @author Sylvestre LEDRU */
 /* rewrite unsfdcopy.f */
 /*--------------------------------------------------------------------------*/
 
+#ifndef __UNSFDCOPY_H__
+#define __UNSFDCOPY_H__
+
+#include "machine.h"
+#include "dynlib_elementary_functions.h"
+
 /**
  * <long-description>
  *
@@ -24,5 +31,6 @@
  * @param incy  
  * @return <ReturnValue>
  */
-int C2F(unsfdcopy)(int *n, long long *dx, int *incx, long long *dy, int *incy);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(unsfdcopy)(int *n, long long *dx, int *incx, long long *dy, int *incy);
 
+#endif /* __UNSFDCOPY_H__ */
index 6a5b643..3f40687 100644 (file)
 #ifndef __VFINITE__
 #define __VFINITE__
 
-#include "doublecomplex.h" 
+#include "machine.h"
+#include "doublecomplex.h"
+#include "dynlib_elementary_functions.h"
 
-int C2F(vfinite)(int *n, double *v);
-int C2F(vfiniteComplex)(int *n, doublecomplex *v);
+
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(vfinite)(int *n, double *v);
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(vfiniteComplex)(int *n, doublecomplex *v);
 
 #endif /* !__VFINITE__ */
index 190066a..1c9fc03 100644 (file)
 #define __XERHLT_H__
 
 #include "machine.h" /* C2F */
+#include "dynlib_elementary_functions.h"
 
 /**
 * do a long jump (slatec)
 * @param messg a message 
 * @param l lenght of messg
 */
-void C2F(xerhlt) (char *messg, unsigned long l);
+ELEMENTARY_FUNCTIONS_IMPEXP void C2F(xerhlt) (char *messg, unsigned long l);
 
 /**
 * setjmp slatec
 * @returns the value 0 if returning directly and  non-zero
 * when returning from longjmp() using the saved context
 */
-int setjmp_slatec_jmp_env(void);
+ELEMENTARY_FUNCTIONS_IMPEXP int setjmp_slatec_jmp_env(void);
 
 #endif /* __XERHLT_H__ */
 /*--------------------------------------------------------------------------*/ 
index d8bde90..448f225 100644 (file)
@@ -9,7 +9,7 @@
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-
+#include "cmp.h"
 #include "isanan.h"
 
 
@@ -35,8 +35,6 @@ static void   idcmp_great(double x[],double y[],int *n,int res[]) ;
 static void   idcmp_lessequal(double x[],double y[],int *n,int res[]) ;
 static void   idcmp_greatequal(double x[],double y[],int *n,int res[]) ;
 
-int  C2F(idcmp)(double x[],double y[],int *n,int res[],int *op);
-
 int  C2F(idcmp)(double x[],double y[],int *n,int res[],int *op) 
 {
   int i;
diff --git a/scilab/modules/elementary_functions/src/c/cmp.h b/scilab/modules/elementary_functions/src/c/cmp.h
new file mode 100644 (file)
index 0000000..4eb9b70
--- /dev/null
@@ -0,0 +1,21 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * 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 __CMP_H__
+#define __CMP_H__
+
+#include "machine.h"
+#include "dynlib_elementary_functions.h"
+
+ELEMENTARY_FUNCTIONS_IMPEXP int C2F(idcmp)(double x[], double y[], int *n, int res[], int *op);
+
+#endif /* CMP_H__ */
diff --git a/scilab/modules/elementary_functions/src/c/elementary_functions.def b/scilab/modules/elementary_functions/src/c/elementary_functions.def
deleted file mode 100644 (file)
index eb0af43..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-LIBRARY    elementary_functions.dll
-
-
-EXPORTS
-; --------------------------------------- 
-; elementary_functions
-; --------------------------------------- 
-
-       idcmp_
-       finiteComplex
-       gsortd_
-       gsortint_
-       gsortuint_
-       gsortshort_
-       gsortushort_
-       gsortchar_
-       gsortuchar_
-       gsorts_
-       gw_elementary_functions
-       idmax_
-       idmin_
-       int2db_
-       intisequalvar_
-       FreeRec
-       AllocRecIfRequired
-       SetDoubleCompMode
-       GetDoubleCompMode
-       ColSortchar
-       RowSortchar
-       GlobalSortchar
-       ColSortuchar
-       RowSortuchar
-       GlobalSortuchar
-       LexiRowchar
-       LexiRowuchar
-       LexiColchar
-       LexiColuchar
-       ColSortdouble
-       RowSortdouble
-       GlobalSortdouble
-       LexiRowdouble
-       LexiColdouble
-       ColSortint
-       ColSortuint
-       RowSortint
-       RowSortuint
-       GlobalSortint
-       GlobalSortuint
-       LexiRowint
-       LexiRowuint
-       LexiColint
-       LexiColuint
-       ColSortshort
-       RowSortshort
-       GlobalSortshort
-       ColSortushort
-       RowSortushort
-       GlobalSortushort
-       LexiRowshort
-       LexiRowushort
-       LexiColshort
-       LexiColushort
-       ColSortstring
-       RowSortstring
-       GlobalSortstring
-       LexiRowstring
-       LexiColstring
-       sciqsort
-       swapcodeint
-       rea2db_
-       scidcopy_
-       sci_abs_
-       sci_acos_
-       sci_asin_
-       sci_atan_
-       sci_ceil_
-       sci_chinesehat_
-       sci_clean_
-       sci_conj_
-       sci_cos_
-       sci_cumprod_
-       sci_cumsum_
-       sci_diag_
-       sci_dsearch_
-       sci_exp_
-       sci_expm_
-       sci_eye_
-       sci_floor_
-       sci_frexp_
-       sci_gsort_
-       sci_imag_
-       sci_imult_
-       sci_int_
-       sci_isequal_
-       sci_isequalbitwise_
-       sci_isreal_
-       sci_kron_
-       sci_log_
-       sci_log1p_
-       sci_scimatrix_
-       sci_maxi_
-       sci_nearfloat_
-       sci_number_properties_
-       sci_ones_
-       sci_prod_
-       sci_rand_
-       sci_real_
-       sci_round_
-       sci_sign_
-       sci_sin_
-       sci_size_
-       sci_spones_
-       sci_sqrt_
-       sci_sum_
-       sci_tan_
-       sci_testmatrix_
-       ccomplexf_
-       SciToF77
-       F77ToSci
-       double2z
-       z2double
-       sci_tril_
-       sci_triu_
-       sci_zeros_
-       unsfdcopy_
-       vceil_
-       vfinite_
-       vfiniteComplex_
-       vfloor_
-       vfrexp_
-       xerhlt_
-       setjmp_slatec_jmp_env
-\1a
\ No newline at end of file
index 9677cb3..4f22e7f 100644 (file)
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_header.def+elementary_functions.vcdef elementary_functions.def &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="LibScilab.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
-                               ModuleDefinitionFile="elementary_functions.def"
+                               ModuleDefinitionFile=""
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_header.def+elementary_functions.vcdef elementary_functions.def &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="LibScilab.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
-                               ModuleDefinitionFile="elementary_functions.def"
+                               ModuleDefinitionFile=""
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                RandomizedBaseAddress="1"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_header.def+elementary_functions.vcdef elementary_functions.def &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="LibScilab.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
-                               ModuleDefinitionFile="elementary_functions.def"
+                               ModuleDefinitionFile=""
                                GenerateDebugInformation="false"
                                SubSystem="2"
                                OptimizeReferences="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n elementary_functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def elementary_functions.def &gt;nul&#x0D;&#x0A;copy elementary_functions.def ..\elementary_functions.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy elementary_functions_header.def+elementary_functions.vcdef elementary_functions.def &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="LibScilab.lib elementary_functions_f.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
-                               ModuleDefinitionFile="elementary_functions.def"
+                               ModuleDefinitionFile=""
                                GenerateDebugInformation="false"
                                SubSystem="2"
                                OptimizeReferences="2"
                        Filter="h;hpp;hxx;hm;inl"
                        >
                        <File
-                               RelativePath="..\..\includes\elementary_functions.h"
+                               RelativePath="..\..\includes\dynlib_elementary_functions.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\finite.h"
+                               RelativePath="..\..\includes\elementary_functions.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\gsort.h"
+                               RelativePath="..\..\includes\finite.h"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath=".\qsort-char.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\qsort-double.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\qsort-int.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\qsort-short.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\qsort-string.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\qsort.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\includes\rea2b.h"
                                >
                        </File>
diff --git a/scilab/modules/elementary_functions/src/c/elementary_functions_header.def b/scilab/modules/elementary_functions/src/c/elementary_functions_header.def
deleted file mode 100644 (file)
index 13a7d9f..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-LIBRARY    elementary_functions.dll
-
-
-EXPORTS
-; --------------------------------------- 
-; elementary_functions
-; --------------------------------------- 
-
index 05f68aa..a42746f 100644 (file)
  
 #include <math.h>
 #include "machine.h"
+#include "vceil.h"
 
-void C2F(vceil)(int *n, double *x, int *ix, double *y,  int *iy);
 
 void C2F(vceil)(int *n, double *x, int *ix, double *y,  int *iy)
 {
-  int ix1,iy1,i;
-  ix1=0;
-  iy1=0;
+    int ix1,iy1,i;
+    ix1 = 0;
+    iy1 = 0;
 
-  if (*ix<0) ix1=-(*n-1)*(*ix);
-  if (*iy<0) iy1=-(*n-1)*(*iy);
+    if (*ix<0) ix1 =-(*n-1)*(*ix);
+    if (*iy<0) iy1 =-(*n-1)*(*iy);
 
-  for (i=0;i<*n;i++) {
-    y[iy1]=ceil(x[ix1]);
-    iy1 += *iy;
-    ix1 += *ix;
-  }
+    for (i=0;i<*n;i++) 
+    {
+        y[iy1] = ceil(x[ix1]);
+        iy1 += *iy;
+        ix1 += *ix;
+    }
 }
 
diff --git a/scilab/modules/elementary_functions/src/c/vceil.h b/scilab/modules/elementary_functions/src/c/vceil.h
new file mode 100644 (file)
index 0000000..64f05f3
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* 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 __VCEIL_H__
+#define __VCEIL_H__
+
+#include "machine.h"
+#include "dynlib_elementary_functions.h"
+
+ELEMENTARY_FUNCTIONS_IMPEXP void C2F(vceil)(int *n, double *x, int *ix, double *y,  int *iy);
+
+#endif /* __VCEIL_H__ */
+
index f5a5e72..8518686 100644 (file)
 
 #include <math.h>
 #include "machine.h"
-void C2F(vfloor)(int *n, double *x, int *ix, double *y, int *iy);
+#include "vfloor.h"
 
 void C2F(vfloor)(int *n, double *x, int *ix, double *y, int *iy)
 {
-  int ix1,iy1,i;
-  ix1=0;
-  iy1=0;
+    int ix1,iy1,i;
+    ix1 = 0;
+    iy1 = 0;
 
-  if (*ix<0) ix1=-(*n-1)*(*ix);
-  if (*iy<0) iy1=-(*n-1)*(*iy);
+    if (*ix<0) ix1=-(*n-1)*(*ix);
+    if (*iy<0) iy1=-(*n-1)*(*iy);
 
-  for (i=0;i<*n;i++) {
-    y[iy1]=floor(x[ix1]);
-    iy1 += *iy;
-    ix1 += *ix;
-  }
+    for (i=0;i<*n;i++) 
+    {
+        y[iy1] = floor(x[ix1]);
+        iy1 += *iy;
+        ix1 += *ix;
+    }
 }
diff --git a/scilab/modules/elementary_functions/src/c/vfloor.h b/scilab/modules/elementary_functions/src/c/vfloor.h
new file mode 100644 (file)
index 0000000..c8978e5
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* 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 __VFLOOR_H__
+#define __VFLOOR_H__
+
+#include "machine.h"
+#include "dynlib_elementary_functions.h"
+
+ELEMENTARY_FUNCTIONS_IMPEXP void C2F(vfloor)(int *n, double *x, int *ix, double *y, int *iy);
+
+#endif /* __VFLOOR_H__ */
+
index 1dc76ac..1d8c992 100644 (file)
 
 #include <math.h>
 #include "machine.h"
-void C2F(vfrexp)(int *n, double *x, int *ix,double *y,int *iy,double *z, int *iz);
+#include "vfrexp.h"
+
 
 void C2F(vfrexp)(int *n, double *x, int *ix,double *y,int *iy,double *z, int *iz)
 {
-  int ix1,iy1,iz1,i,j;
-  ix1=0;
-  iy1=0;
-  iz1=0;
+    int ix1,iy1,iz1,i,j;
+    ix1 = 0;
+    iy1 = 0;
+    iz1 = 0;
 
-  if (*ix<0) ix1=-(*n-1)*(*ix);
-  if (*iy<0) iy1=-(*n-1)*(*iy);
-  if (*iz<0) iz1=-(*n-1)*(*iz);
+    if (*ix<0) ix1=-(*n-1)*(*ix);
+    if (*iy<0) iy1=-(*n-1)*(*iy);
+    if (*iz<0) iz1=-(*n-1)*(*iz);
 
-  for (i=0;i<*n;i++) {
-    y[iy1]=frexp(x[ix1],&j);
-    z[iz1]=j;
-    iy1 += *iy;
-    ix1 += *ix;
-    iz1 += *iz;
-  }
+    for (i = 0; i < *n; i++) 
+    {
+        y[iy1] = frexp(x[ix1],&j);
+        z[iz1] = j;
+        iy1 += *iy;
+        ix1 += *ix;
+        iz1 += *iz;
+    }
 }
diff --git a/scilab/modules/elementary_functions/src/c/vfrexp.h b/scilab/modules/elementary_functions/src/c/vfrexp.h
new file mode 100644 (file)
index 0000000..e53e64a
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* 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 __VFREXP_H__
+#define __VFREXP_H__
+
+#include "machine.h"
+#include "dynlib_elementary_functions.h"
+
+ELEMENTARY_FUNCTIONS_IMPEXP void C2F(vfrexp)(int *n, double *x, int *ix,double *y,int *iy,double *z, int *iz);
+
+#endif /* __VFREXP_H__ */
+
index 2428df5..27c7972 100644 (file)
@@ -34,6 +34,7 @@ libscigraphics_la_CFLAGS = -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
        -I$(top_srcdir)/modules/gui/includes/ \
        -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/elementary_functions/includes/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/string/includes/
 
index a7dd105..37e3644 100644 (file)
@@ -792,6 +792,7 @@ libscigraphics_la_CFLAGS =  \
        -I$(top_srcdir)/modules/gui/includes/ \
        -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/elementary_functions/includes/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/string/includes/ $(JAVA_JNI_INCLUDE) \
        -Isrc/cpp $(TCL_INC_PATH) $(TK_INC_PATH) \
index a0d628a..50b190a 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes"
+                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes"
+                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                AdditionalOptions=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes"
+                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes"
+                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../elementary_functions/includes;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 30442ee..bd97dbf 100644 (file)
@@ -21,7 +21,7 @@
 #include "BuildObjects.h"
 #include "MALLOC.h"
 #include "GetProperty.h"
-#include "../../elementary_functions/includes/elementary_functions.h"
+#include "elementary_functions.h"
 #include "CurrentObjectsManagement.h"
 #include "localization.h"
 #include "Scierror.h"
index 1f64b1e..ce5feeb 100644 (file)
@@ -19,7 +19,7 @@ extern "C"
 #include "MALLOC.h"
 #include "sciprint.h"
 #include "Scierror.h"
-#include "../../../fileio/includes/FileExist.h"
+#include "FileExist.h"
 #include "IsAScalar.h"
 #include "freeArrayOfString.h"
 #include "localization.h"
index 324c41e..817ef8b 100644 (file)
@@ -14,7 +14,7 @@
 #include <jni.h>
 #include "addToLibrarypath.h"
 #include "getScilabJNIEnv.h"
-#include "../../fileio/includes/isdir.h"
+#include "isdir.h"
 #include "fromjava.h"
 #
 /*--------------------------------------------------------------------------*/ 
index 257d59a..f7b272d 100644 (file)
@@ -18,7 +18,7 @@
 #include <string.h>
 #include "loadClasspath.h"
 #include "GetXmlFileEncoding.h"
-#include "../../fileio/includes/FileExist.h"
+#include "FileExist.h"
 #include "addToClasspath.h"
 #include "setgetSCIpath.h"
 #include "MALLOC.h"
index 44263bc..715b9a1 100644 (file)
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include "loadLibrarypath.h"
 #include "GetXmlFileEncoding.h"
-#include "../../fileio/includes/FileExist.h"
+#include "FileExist.h"
 #include "addToLibrarypath.h"
 #include "setgetSCIpath.h"
 #include "MALLOC.h"
index 23c9b6a..4c2ae4e 100644 (file)
@@ -24,7 +24,7 @@
 #include "addToClasspath.h"
 #include "loadOnUseClassPath.h"
 #include "loadClasspath.h"
-#include "../../fileio/includes/FileExist.h"
+#include "FileExist.h"
 #include "GetXmlFileEncoding.h"
 #ifdef _MSC_VER
 #include "strdup_windows.h"
index 9dbda95..2c9f633 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 #include "stack-c.h" 
-#include "elementary_functions.h" 
+#include "vfinite.h"
 #include "do_error_number.h"
 #include "MALLOC.h"
 #include "assembleEigenvectors.h"
index a5274f6..143bc81 100644 (file)
@@ -10,7 +10,8 @@
  *
  */
 #include "stack-c.h" 
-#include "elementary_functions.h" 
+#include "elementary_functions.h"
+#include "vfinite.h"
 #include "do_error_number.h"
 #include "MALLOC.h"
 #include "msgs.h"
index 181ed17..d9ff67f 100644 (file)
@@ -10,7 +10,8 @@
  *
  */
 #include "stack-c.h" 
-#include "elementary_functions.h" 
+#include "elementary_functions.h"
+#include "vfinite.h"
 #include "do_error_number.h"
 #include "MALLOC.h"
 #include "assembleEigenvectors.h"
index a66805b..f61f0b7 100644 (file)
@@ -6,7 +6,10 @@
 MEXLIB_C_SOURCES = src/c/mexlib.c \
 src/c/sci_gateway.c
 
-MEXLIB_FLAGS = -I$(srcdir)/includes/ -I$(top_srcdir)/modules/output_stream/includes/ -I$(top_srcdir)/modules/call_scilab/includes/
+MEXLIB_FLAGS = -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes/ \
+-I$(top_srcdir)/modules/elementary_functions/includes/ \
+-I$(top_srcdir)/modules/call_scilab/includes/
 
 MEXLIB_FLAGS += -I$(top_srcdir)/modules/string/includes
 
index 6b4f12e..3301c4c 100644 (file)
@@ -403,6 +403,7 @@ src/c/sci_gateway.c
 
 MEXLIB_FLAGS = -I$(srcdir)/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes/ \
+       -I$(top_srcdir)/modules/elementary_functions/includes/ \
        -I$(top_srcdir)/modules/call_scilab/includes/ \
        -I$(top_srcdir)/modules/string/includes
 MEXLIB_DEP = $(top_builddir)/modules/core/libscicore.la \
index 1f2452c..4106d66 100644 (file)
@@ -54,7 +54,7 @@
 
 
 #include "stack-c.h"
-#include "../../elementary_functions/includes/elementary_functions.h"
+#include "elementary_functions.h"
 
 #include "mex.h"
 
index 7385bfa..45e7017 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="0"
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
-
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                                ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="0"
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
-
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                                ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
index 32add12..4fca8db 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="0"
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
-
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                                ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="0"
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
-
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                                ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
index 96e2135..6bcdab0 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="0"
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
-
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                                ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../elementary_functions/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="0"
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
-
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                                ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
index 3d68e03..66f7ff9 100644 (file)
@@ -64,6 +64,7 @@ libscioutput_stream_la_CFLAGS=  -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/core/includes \
 -I$(srcdir)/src/c/ \
+-I$(top_srcdir)/modules/shell/includes \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/string/includes
 
index 877df79..fcb4126 100644 (file)
@@ -492,6 +492,7 @@ libscioutput_stream_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/core/includes \
 -I$(srcdir)/src/c/ \
+-I$(top_srcdir)/modules/shell/includes \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/string/includes
 
index b9945b4..b98aad9 100644 (file)
@@ -20,8 +20,8 @@
 #include "diary.h"
 #include "sciprint.h"
 #include "charEncoding.h"
-#include "../../../shell/includes/more.h"
-#include "../../../shell/includes/scilines.h"
+#include "more.h"
+#include "scilines.h"
 /*--------------------------------------------------------------------------*/ 
 extern int C2F(basouttofile)(); /* fortran subroutine */
 /*--------------------------------------------------------------------------*/ 
index b02f60c..fc803fd 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../shell/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../shell/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../shell/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../shell/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 1df90d5..5a6d935 100644 (file)
@@ -25,7 +25,7 @@
 #include "sciprint.h"
 #include "MALLOC.h"
 #include "localization.h"
-#include "../../shell/includes/scilines.h"
+#include "scilines.h"
 /*--------------------------------------------------------------------------*/
 #ifdef _MSC_VER
 #define vsnprintf _vsnprintf
index 881ad2f..9c2b766 100644 (file)
@@ -30,8 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "sci_pvm.h"
-#include "stack-c.h"
 #include "sci_tools.h"
+#include "stack-c.h"
 
 
 void C2F(scipvmsend)(int *taskId, int *p, 
index 975f5f9..12f43ae 100644 (file)
@@ -159,6 +159,7 @@ sci_gateway/fortran/sci_ta2lpd.f
 
 libscisparse_la_CFLAGS=        -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
+                               -I$(top_srcdir)/modules/elementary_functions/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 #-Isrc/c/
 pkglib_LTLIBRARIES = libscisparse.la
index a3f7525..81cb3dc 100644 (file)
@@ -591,6 +591,7 @@ sci_gateway/fortran/sci_ta2lpd.f
 
 libscisparse_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
+                               -I$(top_srcdir)/modules/elementary_functions/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
 #-Isrc/c/
index f36a5b2..110f185 100644 (file)
@@ -12,8 +12,8 @@
 
 #include "stack-c.h"
 #include "Scierror.h"
-#include "../../elementary_functions/includes/elementary_functions.h"
-#include "../../elementary_functions/includes/int2db.h"
+#include "elementary_functions.h"
+#include "int2db.h"
 #include "basout.h"
 
 #define CHAR(x)         (cstk(x))
index dfde1bd..d810c11 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -36,7 +36,9 @@
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
                        <Tool
                                Name="VCMIDLTool"
                        />
@@ -44,7 +46,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes;../../../elementary_functions/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -55,7 +57,6 @@
                                ProgramDataBaseFileName="$(ConfigurationName)/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               
                                DebugInformationFormat="3"
                                CompileAs="0"
                        />
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
                        <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes;../../../elementary_functions/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                ProgramDataBaseFileName="$(ConfigurationName)/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               
                                DebugInformationFormat="3"
                                CompileAs="0"
                        />
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
                        <Tool
                                Name="VCMIDLTool"
                        />
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes;../../../elementary_functions/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                ProgramDataBaseFileName="$(ConfigurationName)/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               
                                CompileAs="0"
                        />
                        <Tool
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
                        <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes;../../../elementary_functions/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                ProgramDataBaseFileName="$(ConfigurationName)/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               
                                CompileAs="0"
                        />
                        <Tool
                        >
                </Filter>
                <File
-                       RelativePath="..\..\sparse.iss"
+                       RelativePath="..\..\Makefile.am"
                        >
                </File>
                <File
-                       RelativePath="..\..\sci_gateway\sparse_gateway.xml"
+                       RelativePath="..\..\sparse.iss"
                        >
                </File>
                <File
-                       RelativePath="..\..\Makefile.am"
+                       RelativePath="..\..\sci_gateway\sparse_gateway.xml"
                        >
                </File>
                <File
index 920902e..3c232cd 100644 (file)
@@ -23,7 +23,7 @@
 #include "ripole.h"
 #include "expandPathVariable.h"
 #include "MALLOC.h"
-#include "../../../fileio/includes/mopen.h"
+#include "mopen.h"
 #include "Scierror.h"
 #include "localization.h"
 #include "tmpdir.h"
index 6dac4a4..d1dab9e 100644 (file)
@@ -20,9 +20,9 @@
 #include "sciprint.h"
 #include "returnanan.h"
 #include "xls.h"
-#include "../../../fileio/includes/mseek.h"
-#include "../../../fileio/includes/mtell.h"
-#include "../../../fileio/includes/mget.h"
+#include "mseek.h"
+#include "mtell.h"
+#include "mget.h"
 /*------------------------------------------------------------------*/
 #define  typ_short "s"
 #define  typ_ushort "us"
index 88fe3db..dcd48bd 100644 (file)
@@ -14,7 +14,6 @@
 #include "gw_tclsci.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "../../localization/includes/localization.h"
 #if _MSC_VER
   #include "strdup_windows.h"
 #endif
index d69c436..684f1c4 100644 (file)
@@ -18,7 +18,6 @@
 #include "sciprint_full.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "../../localization/includes/localization.h"
 #include "syncexec.h"
 #include "storeCommand.h"
 #ifdef _MSC_VER
index dfaf75f..09fbd4b 100644 (file)
@@ -526,7 +526,7 @@ libscixcos_la_sci_gateway_DATA = sci_gateway/xcos_gateway.xml
 #### xcos : images files ####
 #
 # Generated with:
-#   $ find images/ -type f -printf "%p \\ \n" -name *.svg -or -name *.gif -or -name *.jpg -or -name *.png -not -name *_pal.jpg -not -name gui |sort |awk '{sub(/[ \t]+$/, "")};1' |awk '$0 !~ /gui/{print;}' |awk '$0 !~ /_pal.jpg/ {print;}'
+#   $ find images/ -type f -printf "%p \\ \n" -name *.svg -or -name *.gif -or -name *.jpg -or -name *.png -not -name *_pal.jpg -not -name gui |sort |awk '{sub(/[ \t]+$/, "")};1' |awk '$0 !~ /gui/{print;}' |awk '$0 !~ /_pal.jpg/{print;}'
 libscixcos_la_imagesdir = $(mydatadir)/
 nobase_libscixcos_la_images_DATA = images/blocks/3DSCOPE.svg \
 images/blocks/ANDBLK.svg \