prepare to C++ api

diff --git a/scilab/modules/action_binding/Makefile.am b/scilab/modules/action_binding/Makefile.am
index 363833f..bf57667 100644 (file)
--- a/scilab/modules/action_binding/Makefile.am
+++ b/scilab/modules/action_binding/Makefile.am
@@ -38,6 +38,7 @@ libsciaction_binding_la_CFLAGS=       $(JAVA_JNI_INCLUDE) \
 -I$(srcdir)/src/c/ \
 -I$(srcdir)/src/jni/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding

diff --git a/scilab/modules/api_scilab/api_scilab.vcproj b/scilab/modules/api_scilab/api_scilab.vcproj
index cf2b884..a5f186f 100644 (file)
--- a/scilab/modules/api_scilab/api_scilab.vcproj
+++ b/scilab/modules/api_scilab/api_scilab.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -146,7 +146,7 @@
                        <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)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -322,7 +322,7 @@
                        <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)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
@@ -373,43 +373,43 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File
-                               RelativePath=".\src\c\api_boolean.c"
+                               RelativePath=".\src\c\api_boolean.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_boolean_sparse.c"
+                               RelativePath=".\src\c\api_boolean_sparse.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_common.c"
+                               RelativePath=".\src\c\api_common.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_double.c"
+                               RelativePath=".\src\c\api_double.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_int.c"
+                               RelativePath=".\src\c\api_int.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_list.c"
+                               RelativePath=".\src\c\api_list.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_pointer.c"
+                               RelativePath=".\src\c\api_pointer.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_poly.c"
+                               RelativePath=".\src\c\api_poly.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_sparse.c"
+                               RelativePath=".\src\c\api_sparse.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_string.c"
+                               RelativePath=".\src\c\api_string.cpp"
                                >
                        </File>
                        <File

diff --git a/scilab/modules/api_scilab/includes/api_boolean.h b/scilab/modules/api_scilab/includes/api_boolean.h
index 60cc9db..1764f12 100644 (file)
--- a/scilab/modules/api_scilab/includes/api_boolean.h
+++ b/scilab/modules/api_scilab/includes/api_boolean.h
@@ -12,6 +12,10 @@
 #ifndef __BOOLEAN_API__
 #define __BOOLEAN_API__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "dynlib_api_scilab.h"
 /**
  * Get boolean variable
@@ -65,4 +69,7 @@ API_SCILAB_IMPEXP int createNamedMatrixOfBoolean(char* _pstName, int _iRows, int
  */
 API_SCILAB_IMPEXP int readNamedMatrixOfBoolean(char* _pstName, int* _piRows, int* _piCols, int* _piBool);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __BOOLEAN_API__ */

diff --git a/scilab/modules/api_scilab/includes/api_boolean_sparse.h b/scilab/modules/api_scilab/includes/api_boolean_sparse.h
index bf8df95..3a16e9c 100644 (file)
--- a/scilab/modules/api_scilab/includes/api_boolean_sparse.h
+++ b/scilab/modules/api_scilab/includes/api_boolean_sparse.h
@@ -12,6 +12,10 @@
 #ifndef __BOOLEAN_SPARSE_API__
 #define __BOOLEAN_SPARSE_API__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "dynlib_api_scilab.h"
 
 /*******************************/
@@ -79,4 +83,7 @@ API_SCILAB_IMPEXP int createNamedBooleanSparseMatrix(char* _pstName, int _iRows,
  */
 API_SCILAB_IMPEXP int readNamedBooleanSparseMatrix(char* _pstName, int* _piRows, int* _piCols, int* _piNbItem, int* _piNbItemRow, int* _piColPos);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __BOOLEAN_SPARSE_API__ */

diff --git a/scilab/modules/api_scilab/includes/api_common.h b/scilab/modules/api_scilab/includes/api_common.h
index d7f82a4..19d1df6 100644 (file)
--- a/scilab/modules/api_scilab/includes/api_common.h
+++ b/scilab/modules/api_scilab/includes/api_common.h
@@ -13,6 +13,10 @@
 #ifndef __COMMON_API__
 #define __COMMON_API__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "dynlib_api_scilab.h"
 
 /* generics functions */
@@ -125,4 +129,7 @@ API_SCILAB_IMPEXP int getDimFromVar(int* _piAddress, int* _piVal);
 */
 API_SCILAB_IMPEXP int getDimFromNamedVar(char* _pstName, int* _piVal);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __COMMON_API__ */

diff --git a/scilab/modules/api_scilab/includes/api_double.h b/scilab/modules/api_scilab/includes/api_double.h
index f70c3cf..8edeba3 100644 (file)
--- a/scilab/modules/api_scilab/includes/api_double.h
+++ b/scilab/modules/api_scilab/includes/api_double.h
@@ -12,6 +12,10 @@
 #ifndef __DOUBLE_API__
 #define __DOUBLE_API__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doublecomplex.h"
 #include "dynlib_api_scilab.h"
 
@@ -156,4 +160,7 @@ API_SCILAB_IMPEXP int readNamedMatrixOfDouble(char* _pstName, int* _piRows, int*
 API_SCILAB_IMPEXP int readNamedComplexMatrixOfDouble(char* _pstName, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg);
 
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __DOUBLE_API__ */

diff --git a/scilab/modules/api_scilab/includes/api_int.h b/scilab/modules/api_scilab/includes/api_int.h
index 5d6d6c0..311cea8 100644 (file)
--- a/scilab/modules/api_scilab/includes/api_int.h
+++ b/scilab/modules/api_scilab/includes/api_int.h
@@ -12,6 +12,10 @@
 #ifndef __INT_API__
 #define __INT_API__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "dynlib_api_scilab.h"
 
 #define SCI_INT8               1
@@ -273,4 +277,7 @@ API_SCILAB_IMPEXP int readNamedMatrixOfUnsignedInteger32(char* _pstName, int* _p
 API_SCILAB_IMPEXP int readNamedMatrixOfInteger64(char* _pstName, int* _piRows, int* _piCols, long long* _pllData64);
 API_SCILAB_IMPEXP int readNamedMatrixOfUnsignedInteger64(char* _pstName, int* _piRows, int* _piCols, unsigned long long* _pullData64);
 #endif
+#ifdef __cplusplus
+}
+#endif
 #endif /* __INT_API__ */

diff --git a/scilab/modules/api_scilab/includes/api_list.h b/scilab/modules/api_scilab/includes/api_list.h
index d3c1142..f769adb 100644 (file)
--- a/scilab/modules/api_scilab/includes/api_list.h
+++ b/scilab/modules/api_scilab/includes/api_list.h
@@ -12,6 +12,10 @@
 #ifndef __LIST_API__
 #define __LIST_API__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "dynlib_api_scilab.h"
 #include "doublecomplex.h"
 
@@ -1129,6 +1133,8 @@ API_SCILAB_IMPEXP int readPointerInNamedList(char* _pstName, int* _piParent, int
  */
 API_SCILAB_IMPEXP int createPointerInNamedList(char* _pstName, int* _piParent, int _iItemPos, void* _pvPtr);
 
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* __LIST_API__ */
 

diff --git a/scilab/modules/api_scilab/includes/api_pointer.h b/scilab/modules/api_scilab/includes/api_pointer.h
index 6900229..ad37689 100644 (file)
--- a/scilab/modules/api_scilab/includes/api_pointer.h
+++ b/scilab/modules/api_scilab/includes/api_pointer.h
@@ -12,6 +12,10 @@
 #ifndef __POINTER_API__
 #define __POINTER_API__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "dynlib_api_scilab.h"
 
 /**
@@ -47,5 +51,7 @@ API_SCILAB_IMPEXP int fillPointer(int *_piAddress, void** _pvPtr);
  */
 API_SCILAB_IMPEXP int createPointer(int _iVar, void* _pvPtr);
 
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* __POINTER_API__ */

diff --git a/scilab/modules/api_scilab/includes/api_poly.h b/scilab/modules/api_scilab/includes/api_poly.h
index fc3346b..de12511 100644 (file)
--- a/scilab/modules/api_scilab/includes/api_poly.h
+++ b/scilab/modules/api_scilab/includes/api_poly.h
@@ -12,6 +12,10 @@
 #ifndef __POLY_API__
 #define __POLY_API__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "dynlib_api_scilab.h"
 
 /*****************************/
@@ -121,4 +125,7 @@ API_SCILAB_IMPEXP int readNamedMatrixOfPoly(char* _pstName, int* _piRows, int* _
  */
 API_SCILAB_IMPEXP int readNamedComplexMatrixOfPoly(char* _pstName, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __POLY_API__ */

diff --git a/scilab/modules/api_scilab/includes/api_sparse.h b/scilab/modules/api_scilab/includes/api_sparse.h
index 3a88cb4..49aa160 100644 (file)
--- a/scilab/modules/api_scilab/includes/api_sparse.h
+++ b/scilab/modules/api_scilab/includes/api_sparse.h
@@ -12,6 +12,10 @@
 #ifndef __SAPRSE_API__
 #define __SAPRSE_API__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "dynlib_api_scilab.h"
 
 /*****************************/
@@ -153,4 +157,7 @@ API_SCILAB_IMPEXP int readNamedSparseMatrix(char* _pstName, int* _piRows, int* _
  */
 API_SCILAB_IMPEXP int readNamedComplexSparseMatrix(char* _pstName, int* _piRows, int* _piCols, int* _piNbItem, int* _piNbItemRow, int* _piColPos, double* _pdblReal, double* _pdblImg);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __SAPRSE_API__ */

diff --git a/scilab/modules/api_scilab/includes/api_string.h b/scilab/modules/api_scilab/includes/api_string.h
index ada358a..8484104 100644 (file)
--- a/scilab/modules/api_scilab/includes/api_string.h
+++ b/scilab/modules/api_scilab/includes/api_string.h
@@ -14,6 +14,11 @@
 #define __STRING_API__
 
 #include <wchar.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "dynlib_api_scilab.h"
 /*****************************/
 /*   string matrix functions   */
@@ -107,4 +112,8 @@ API_SCILAB_IMPEXP int readNamedMatrixOfString(char* _pstName, int* _piRows, int*
 */
 API_SCILAB_IMPEXP int readNamedMatrixOfWideString(char* _pstName, int* _piRows, int* _piCols, int* _piwLength, wchar_t** _pwstStrings);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __STRING_API__ */

diff --git a/scilab/modules/api_scilab/src/c/api_boolean.c b/scilab/modules/api_scilab/src/c/api_boolean.cpp
similarity index 100%
rename from scilab/modules/api_scilab/src/c/api_boolean.c
rename to scilab/modules/api_scilab/src/c/api_boolean.cpp

diff --git a/scilab/modules/api_scilab/src/c/api_boolean_sparse.c b/scilab/modules/api_scilab/src/c/api_boolean_sparse.cpp
similarity index 100%
rename from scilab/modules/api_scilab/src/c/api_boolean_sparse.c
rename to scilab/modules/api_scilab/src/c/api_boolean_sparse.cpp

diff --git a/scilab/modules/api_scilab/src/c/api_common.c b/scilab/modules/api_scilab/src/c/api_common.cpp
similarity index 100%
rename from scilab/modules/api_scilab/src/c/api_common.c
rename to scilab/modules/api_scilab/src/c/api_common.cpp

diff --git a/scilab/modules/api_scilab/src/c/api_double.c b/scilab/modules/api_scilab/src/c/api_double.cpp
similarity index 100%
rename from scilab/modules/api_scilab/src/c/api_double.c
rename to scilab/modules/api_scilab/src/c/api_double.cpp

diff --git a/scilab/modules/api_scilab/src/c/api_int.c b/scilab/modules/api_scilab/src/c/api_int.cpp
similarity index 100%
rename from scilab/modules/api_scilab/src/c/api_int.c
rename to scilab/modules/api_scilab/src/c/api_int.cpp

diff --git a/scilab/modules/api_scilab/src/c/api_list.c b/scilab/modules/api_scilab/src/c/api_list.cpp
similarity index 100%
rename from scilab/modules/api_scilab/src/c/api_list.c
rename to scilab/modules/api_scilab/src/c/api_list.cpp

diff --git a/scilab/modules/api_scilab/src/c/api_pointer.c b/scilab/modules/api_scilab/src/c/api_pointer.cpp
similarity index 100%
rename from scilab/modules/api_scilab/src/c/api_pointer.c
rename to scilab/modules/api_scilab/src/c/api_pointer.cpp

diff --git a/scilab/modules/api_scilab/src/c/api_poly.c b/scilab/modules/api_scilab/src/c/api_poly.cpp
similarity index 100%
rename from scilab/modules/api_scilab/src/c/api_poly.c
rename to scilab/modules/api_scilab/src/c/api_poly.cpp

diff --git a/scilab/modules/api_scilab/src/c/api_sparse.c b/scilab/modules/api_scilab/src/c/api_sparse.cpp
similarity index 100%
rename from scilab/modules/api_scilab/src/c/api_sparse.c
rename to scilab/modules/api_scilab/src/c/api_sparse.cpp

diff --git a/scilab/modules/api_scilab/src/c/api_string.c b/scilab/modules/api_scilab/src/c/api_string.cpp
similarity index 100%
rename from scilab/modules/api_scilab/src/c/api_string.c
rename to scilab/modules/api_scilab/src/c/api_string.cpp

diff --git a/scilab/modules/arnoldi/Makefile.am b/scilab/modules/arnoldi/Makefile.am
index 828b353..8249a4b 100644 (file)
--- a/scilab/modules/arnoldi/Makefile.am
+++ b/scilab/modules/arnoldi/Makefile.am
@@ -66,6 +66,7 @@ sci_gateway/c/sci_znaupd.c
 
 libsciarnoldi_la_CFLAGS=       -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes/
 
 libsciarnoldi_la_FFLAGS= -I$(srcdir)/src/arpack/

diff --git a/scilab/modules/arnoldi/arnoldi.vcproj b/scilab/modules/arnoldi/arnoldi.vcproj
index 4b45d10..fc21781 100644 (file)
--- a/scilab/modules/arnoldi/arnoldi.vcproj
+++ b/scilab/modules/arnoldi/arnoldi.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{D575A6BA-094A-45EC-8F8D-2DF7A2C37AA6}"
        RootNamespace="arnoldi"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -211,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -302,7 +303,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/arnoldi/includes/gw_arnoldi.h b/scilab/modules/arnoldi/includes/gw_arnoldi.h
index 3ed8195..42b0e8a 100644 (file)
--- a/scilab/modules/arnoldi/includes/gw_arnoldi.h
+++ b/scilab/modules/arnoldi/includes/gw_arnoldi.h
@@ -15,6 +15,7 @@
 #define __GW_ARNOLDI_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_arnoldi(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/boolean/Makefile.am b/scilab/modules/boolean/Makefile.am
index c3483f5..1cc8e0c 100644 (file)
--- a/scilab/modules/boolean/Makefile.am
+++ b/scilab/modules/boolean/Makefile.am
@@ -21,6 +21,7 @@ sci_gateway/fortran/sci_find.f
 
 libsciboolean_la_CFLAGS=       -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libsciboolean.la

diff --git a/scilab/modules/boolean/includes/gw_boolean.h b/scilab/modules/boolean/includes/gw_boolean.h
index a55999e..b979466 100644 (file)
--- a/scilab/modules/boolean/includes/gw_boolean.h
+++ b/scilab/modules/boolean/includes/gw_boolean.h
@@ -14,6 +14,7 @@
 #define __GW_BOOLEAN__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_boolean(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/boolean/src/c/boolean.vcproj b/scilab/modules/boolean/src/c/boolean.vcproj
index 14161e1..9fb381c 100644 (file)
--- a/scilab/modules/boolean/src/c/boolean.vcproj
+++ b/scilab/modules/boolean/src/c/boolean.vcproj
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
        Name="boolean"
        ProjectGUID="{8AB8ECEC-8C22-475E-80D0-E14696F5A19B}"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -119,7 +120,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -196,7 +197,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -275,7 +276,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/cacsd/Makefile.am b/scilab/modules/cacsd/Makefile.am
index f2f9fe2..23b2685 100644 (file)
--- a/scilab/modules/cacsd/Makefile.am
+++ b/scilab/modules/cacsd/Makefile.am
@@ -211,6 +211,7 @@ sci_gateway/fortran/sci_f_rankqr.f
 
 libscicacsd_la_FFLAGS= -I$(srcdir)/includes/
 libscicacsd_la_CFLAGS=         -I$(srcdir)/includes/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/output_stream/includes/
 
 pkglib_LTLIBRARIES = libscicacsd.la

diff --git a/scilab/modules/cacsd/includes/gw_cacsd0.h b/scilab/modules/cacsd/includes/gw_cacsd0.h
index 9d2af25..64ea5c7 100644 (file)
--- a/scilab/modules/cacsd/includes/gw_cacsd0.h
+++ b/scilab/modules/cacsd/includes/gw_cacsd0.h
@@ -16,6 +16,7 @@
 #define __GW_CACSD0__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_cacsd0(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/cacsd/includes/gw_cacsd1.h b/scilab/modules/cacsd/includes/gw_cacsd1.h
index 736680c..91d0a1f 100644 (file)
--- a/scilab/modules/cacsd/includes/gw_cacsd1.h
+++ b/scilab/modules/cacsd/includes/gw_cacsd1.h
@@ -16,6 +16,7 @@
 #define __GW_CACSD1__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_cacsd1(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/cacsd/includes/gw_cacsd2.h b/scilab/modules/cacsd/includes/gw_cacsd2.h
index e3afa08..29bb2d1 100644 (file)
--- a/scilab/modules/cacsd/includes/gw_cacsd2.h
+++ b/scilab/modules/cacsd/includes/gw_cacsd2.h
@@ -16,6 +16,7 @@
 #define __GW_CACSD2__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_cacsd2(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/cacsd/includes/gw_cacsd3.h b/scilab/modules/cacsd/includes/gw_cacsd3.h
index e776400..00b7d53 100644 (file)
--- a/scilab/modules/cacsd/includes/gw_cacsd3.h
+++ b/scilab/modules/cacsd/includes/gw_cacsd3.h
@@ -16,6 +16,7 @@
 #define __GW_CACSD3__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_cacsd3(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/cacsd/includes/gw_slicot.h b/scilab/modules/cacsd/includes/gw_slicot.h
index 1e9f940..804b892 100644 (file)
--- a/scilab/modules/cacsd/includes/gw_slicot.h
+++ b/scilab/modules/cacsd/includes/gw_slicot.h
@@ -16,6 +16,7 @@
 #define __GW_SLICOT_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 #ifndef __DEF_MXARRAY__
 #define __DEF_MXARRAY__

diff --git a/scilab/modules/cacsd/src/c/cacsd.vcproj b/scilab/modules/cacsd/src/c/cacsd.vcproj
index 44813bc..3272b83 100644 (file)
--- a/scilab/modules/cacsd/src/c/cacsd.vcproj
+++ b/scilab/modules/cacsd/src/c/cacsd.vcproj
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
        Name="cacsd"
        ProjectGUID="{D5DD1407-3926-4F6C-AD7B-3A6B2DE56049}"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -119,7 +120,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -196,7 +197,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -275,7 +276,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/call_scilab/includes/CallScilab.h b/scilab/modules/call_scilab/includes/CallScilab.h
index 183221e..f67e2d6 100644 (file)
--- a/scilab/modules/call_scilab/includes/CallScilab.h
+++ b/scilab/modules/call_scilab/includes/CallScilab.h
@@ -14,6 +14,10 @@
 #define __CALLSCILAB__
 #include "machine.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*--------------------------------------------------------------------------*/
 #include "BOOL.h"
 /*--------------------------------------------------------------------------*/
@@ -339,6 +343,9 @@ int C2F(cwritebmat)(char *namex, int *m, int *n, int *mat, unsigned long name_le
 int C2F(str2name)  (char *name__, int *id, unsigned long name_len);
 int C2F(objptr)  (char *name__, int *lp, int *fin, unsigned long name_len);
 
+#ifdef __cplusplus
+}
+#endif
 /*--------------------------------------------------------------------------*/
 #endif /* __CALLSCILAB__ */
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/call_scilab/includes/gw_call_scilab.h b/scilab/modules/call_scilab/includes/gw_call_scilab.h
index d0e7532..2744d3a 100644 (file)
--- a/scilab/modules/call_scilab/includes/gw_call_scilab.h
+++ b/scilab/modules/call_scilab/includes/gw_call_scilab.h
@@ -13,6 +13,7 @@
 #define __GW_CALL_SCILAB__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_call_scilab(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/completion/Makefile.am b/scilab/modules/completion/Makefile.am
index 5f01d6d..a583457 100644 (file)
--- a/scilab/modules/completion/Makefile.am
+++ b/scilab/modules/completion/Makefile.am
@@ -38,6 +38,7 @@ libscicompletion_la_CFLAGS=   $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/graphics/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding

diff --git a/scilab/modules/completion/includes/gw_completion.h b/scilab/modules/completion/includes/gw_completion.h
index 3e63993..3534cdd 100644 (file)
--- a/scilab/modules/completion/includes/gw_completion.h
+++ b/scilab/modules/completion/includes/gw_completion.h
@@ -13,6 +13,7 @@
 #define __GW_COMPLETION_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_completion(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/completion/src/c/completion.vcproj b/scilab/modules/completion/src/c/completion.vcproj
index 565a431..c22bf01 100644 (file)
--- a/scilab/modules/completion/src/c/completion.vcproj
+++ b/scilab/modules/completion/src/c/completion.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}"
        RootNamespace="completion"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../windows_tools/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../windows_tools/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;STATIC_LINKED"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../windows_tools/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../windows_tools/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;STATIC_LINKED"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -211,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../windows_tools/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../windows_tools/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;STATIC_LINKED"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -300,7 +301,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../windows_tools/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../windows_tools/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;STATIC_LINKED"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/completion/src/nocompletion/nocompletion.vcproj b/scilab/modules/completion/src/nocompletion/nocompletion.vcproj
index 8841d5c..9dfc33f 100644 (file)
--- a/scilab/modules/completion/src/nocompletion/nocompletion.vcproj
+++ b/scilab/modules/completion/src/nocompletion/nocompletion.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{D1586C83-3F16-467B-85C6-6A12A08CCB8D}"
        RootNamespace="nocompletion"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOCOMPLETION_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOCOMPLETION_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOCOMPLETION_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -298,7 +299,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOCOMPLETION_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/console/Makefile.am b/scilab/modules/console/Makefile.am
index 74bd541..95876e5 100644 (file)
--- a/scilab/modules/console/Makefile.am
+++ b/scilab/modules/console/Makefile.am
@@ -67,7 +67,7 @@ libsciconsole_disable_la_CFLAGS = -Iincludes/
 
 
 # Includes need for the compilation
-libsciconsole_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ -I$(srcdir)/src/jni/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/jvm/includes/ -I$(top_srcdir)/modules/action_binding/includes
+libsciconsole_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -I$(top_srcdir)/modules/api_scilab/includes -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ -I$(srcdir)/src/jni/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/jvm/includes/ -I$(top_srcdir)/modules/action_binding/includes
 
 # Includes need for the compilation
 libsciconsole_la_CFLAGS=       $(JAVA_JNI_INCLUDE) \

diff --git a/scilab/modules/core/includes/gw_core.h b/scilab/modules/core/includes/gw_core.h
index 5200bb3..d183480 100644 (file)
--- a/scilab/modules/core/includes/gw_core.h
+++ b/scilab/modules/core/includes/gw_core.h
@@ -13,6 +13,7 @@
 #define __GW_CORE__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_core(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/core/includes/gw_user.h b/scilab/modules/core/includes/gw_user.h
index d313245..afee987 100644 (file)
--- a/scilab/modules/core/includes/gw_user.h
+++ b/scilab/modules/core/includes/gw_user.h
@@ -13,6 +13,7 @@
 #define __GW_USER_H__
 
 #include "machine.h"
+#include "api_common.h"
 
 int gw_user(void);
 

diff --git a/scilab/modules/core/includes/gw_user2.h b/scilab/modules/core/includes/gw_user2.h
index 363b8dd..2eb72a1 100644 (file)
--- a/scilab/modules/core/includes/gw_user2.h
+++ b/scilab/modules/core/includes/gw_user2.h
@@ -13,6 +13,7 @@
 #define __GW_USER2_H__
 
 #include "machine.h"
+#include "api_common.h"
 
 int gw_user2(void);
 

diff --git a/scilab/modules/core/includes/stack-c.h b/scilab/modules/core/includes/stack-c.h
index ee70c2d..08031e7 100644 (file)
--- a/scilab/modules/core/includes/stack-c.h
+++ b/scilab/modules/core/includes/stack-c.h
@@ -17,6 +17,10 @@
 
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if  ( !(defined __MATH__)  || (defined __APPLE__) || (defined aix) )
 #include "core_math.h"
 #else
@@ -32,7 +36,6 @@
 #include "stack2.h"
 #include "stack3.h"
 
-
 /*-------------------------------------------------
  * types
  * -------------------------------------------------*/
@@ -384,6 +387,9 @@ extern int C2F(checklhs)(char *fname, int *imin, int *imax, unsigned long fname_
 
 extern void C2F(freeptr)(double *ip[]);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /*  STACK_SCI  */
 
 

diff --git a/scilab/modules/data_structures/Makefile.am b/scilab/modules/data_structures/Makefile.am
index 1d44213..3789109 100644 (file)
--- a/scilab/modules/data_structures/Makefile.am
+++ b/scilab/modules/data_structures/Makefile.am
@@ -43,6 +43,7 @@ sci_gateway/fortran/sci_list.f
 libscidata_structures_la_CFLAGS=       -I$(srcdir)/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/string/includes
 
 # Disable optimisation of the file intl_e.f

diff --git a/scilab/modules/data_structures/includes/gw_data_structures1.h b/scilab/modules/data_structures/includes/gw_data_structures1.h
index 40a1501..fc9056a 100644 (file)
--- a/scilab/modules/data_structures/includes/gw_data_structures1.h
+++ b/scilab/modules/data_structures/includes/gw_data_structures1.h
@@ -15,6 +15,7 @@
 #define __GW_DATA_STRUCTURES1__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 /* it can be called by fortran mklist.f & mkindx.f */
 int C2F(gwdatastructures1)(void); 

diff --git a/scilab/modules/data_structures/includes/gw_data_structures2.h b/scilab/modules/data_structures/includes/gw_data_structures2.h
index 5501efb..ec3cfd0 100644 (file)
--- a/scilab/modules/data_structures/includes/gw_data_structures2.h
+++ b/scilab/modules/data_structures/includes/gw_data_structures2.h
@@ -20,6 +20,7 @@
 #endif
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_data_structures2(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/data_structures/src/c/data_structures.vcproj b/scilab/modules/data_structures/src/c/data_structures.vcproj
index 68ceb90..cc44b16 100644 (file)
--- a/scilab/modules/data_structures/src/c/data_structures.vcproj
+++ b/scilab/modules/data_structures/src/c/data_structures.vcproj
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
        Name="data_structures"
        ProjectGUID="{B7A168A0-DFC0-4C6D-B0CC-6079912A4A76}"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -119,7 +120,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -196,7 +197,7 @@
                                Optimization="1"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -275,7 +276,7 @@
                                Optimization="1"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/differential_equations/Makefile.am b/scilab/modules/differential_equations/Makefile.am
index a791e78..9399530 100644 (file)
--- a/scilab/modules/differential_equations/Makefile.am
+++ b/scilab/modules/differential_equations/Makefile.am
@@ -128,6 +128,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/dynamic_link/includes
 

diff --git a/scilab/modules/differential_equations/includes/gw_differential_equations1.h b/scilab/modules/differential_equations/includes/gw_differential_equations1.h
index d95bcb7..c750463 100644 (file)
--- a/scilab/modules/differential_equations/includes/gw_differential_equations1.h
+++ b/scilab/modules/differential_equations/includes/gw_differential_equations1.h
@@ -15,6 +15,7 @@
 #define __GW_DIFFERENTIAL_EQUATIONS1__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_differential_equations1(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/differential_equations/includes/gw_differential_equations2.h b/scilab/modules/differential_equations/includes/gw_differential_equations2.h
index 18b24cc..4a3a9a5 100644 (file)
--- a/scilab/modules/differential_equations/includes/gw_differential_equations2.h
+++ b/scilab/modules/differential_equations/includes/gw_differential_equations2.h
@@ -15,6 +15,7 @@
 #define __GW_DIFFERENTIAL_EQUATIONS2__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_differential_equations2(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/differential_equations/includes/gw_differential_equations3.h b/scilab/modules/differential_equations/includes/gw_differential_equations3.h
index 365f719..05eba07 100644 (file)
--- a/scilab/modules/differential_equations/includes/gw_differential_equations3.h
+++ b/scilab/modules/differential_equations/includes/gw_differential_equations3.h
@@ -15,6 +15,7 @@
 #define __GW_DIFFERENTIAL_EQUATIONS3__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_differential_equations3(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/differential_equations/includes/gw_differential_equations4.h b/scilab/modules/differential_equations/includes/gw_differential_equations4.h
index 5446a27..ca70cb4 100644 (file)
--- a/scilab/modules/differential_equations/includes/gw_differential_equations4.h
+++ b/scilab/modules/differential_equations/includes/gw_differential_equations4.h
@@ -15,6 +15,7 @@
 #define __GW_DIFFERENTIAL_EQUATIONS4__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_differential_equations4(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/differential_equations/includes/gw_differential_equations6.h b/scilab/modules/differential_equations/includes/gw_differential_equations6.h
index 9b36a5b..f6f7fab 100644 (file)
--- a/scilab/modules/differential_equations/includes/gw_differential_equations6.h
+++ b/scilab/modules/differential_equations/includes/gw_differential_equations6.h
@@ -15,6 +15,7 @@
 #define __GW_DIFFERENTIAL_EQUATIONS6__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_differential_equations6(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/differential_equations/src/c/differential_equations.vcproj b/scilab/modules/differential_equations/src/c/differential_equations.vcproj
index 28aae63..3e84049 100644 (file)
--- a/scilab/modules/differential_equations/src/c/differential_equations.vcproj
+++ b/scilab/modules/differential_equations/src/c/differential_equations.vcproj
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
        Name="differential_equations"
        ProjectGUID="{F0190B5D-FB21-47A2-99AC-06627CDD0F8A}"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/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"
@@ -119,7 +120,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/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"
@@ -196,7 +197,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/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"
@@ -275,7 +276,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/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"

diff --git a/scilab/modules/double/Makefile.am b/scilab/modules/double/Makefile.am
index bc4c054..d8076b5 100644 (file)
--- a/scilab/modules/double/Makefile.am
+++ b/scilab/modules/double/Makefile.am
@@ -31,7 +31,8 @@ pkglib_LTLIBRARIES = libscidouble.la
 
 libscidouble_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 
-libscidouble_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes
+libscidouble_la_CFLAGS = -I$(top_srcdir)/modules/api_scilab/includes \
+-I$(top_srcdir)/modules/output_stream/includes
 
 libscidouble_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
 

diff --git a/scilab/modules/dynamic_link/Makefile.am b/scilab/modules/dynamic_link/Makefile.am
index a331d14..b51b81b 100644 (file)
--- a/scilab/modules/dynamic_link/Makefile.am
+++ b/scilab/modules/dynamic_link/Makefile.am
@@ -26,6 +26,7 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/modules/io/includes \
 -I$(top_srcdir)/libs/dynamiclibrary/includes \
 -I$(srcdir)/src/c/ \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(srcdir)/includes/
 
 pkglib_LTLIBRARIES = libscidynamic_link.la

diff --git a/scilab/modules/dynamic_link/includes/gw_dynamic_link.h b/scilab/modules/dynamic_link/includes/gw_dynamic_link.h
index 12cc7a9..84587f3 100644 (file)
--- a/scilab/modules/dynamic_link/includes/gw_dynamic_link.h
+++ b/scilab/modules/dynamic_link/includes/gw_dynamic_link.h
@@ -14,6 +14,8 @@
 /*--------------------------------------------------------------------------*/ 
 #ifndef __GW_DYNAMIC_LINK__
 #define __GW_DYNAMIC_LINK__
+
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_dynamic_link(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/dynamic_link/src/c/dynamic_link.vcproj b/scilab/modules/dynamic_link/src/c/dynamic_link.vcproj
index 5b42eb9..64e0971 100644 (file)
--- a/scilab/modules/dynamic_link/src/c/dynamic_link.vcproj
+++ b/scilab/modules/dynamic_link/src/c/dynamic_link.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,7 +6,7 @@
        ProjectGUID="{EAB6C580-22B3-4359-BA1D-DD7499A96163}"
        RootNamespace="dynamic_link"
        Keyword="Win32Proj"
-
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -44,7 +44,7 @@
                        <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"
+                               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"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -127,7 +127,7 @@
                        <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"
+                               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"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -212,7 +212,7 @@
                                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"
+                               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"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -301,7 +301,7 @@
                                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"
+                               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"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/elementary_functions/Makefile.am b/scilab/modules/elementary_functions/Makefile.am
index d0e8e83..fd44054 100644 (file)
--- a/scilab/modules/elementary_functions/Makefile.am
+++ b/scilab/modules/elementary_functions/Makefile.am
@@ -378,12 +378,14 @@ libscielementary_functions_la_CPPFLAGS =  -I$(srcdir)/includes/ \
        -I$(srcdir)/src/cpp/ \
        -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes \
        -I$(top_srcdir)/modules/output_stream/includes
 
 # Includes need for the compilation
 libscielementary_functions_la_CFLAGS=  -I$(srcdir)/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(srcdir)/src/c/ \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscielementary_functions.la

diff --git a/scilab/modules/elementary_functions/includes/gw_elementary_functions.h b/scilab/modules/elementary_functions/includes/gw_elementary_functions.h
index 7052728..9e796e3 100644 (file)
--- a/scilab/modules/elementary_functions/includes/gw_elementary_functions.h
+++ b/scilab/modules/elementary_functions/includes/gw_elementary_functions.h
@@ -14,6 +14,7 @@
 #define __GW_ELEMENTARIES_FUNCTIONS__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_elementary_functions(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/elementary_functions/src/c/elementary_functions.vcproj b/scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
index 77201fd..2f9fe89 100644 (file)
--- a/scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
+++ b/scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
        Name="elementary_functions"
        ProjectGUID="{5B110267-7C18-437C-B87D-DBA2B50729E9}"
        RootNamespace="elementary_functions"
-
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -45,7 +45,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -121,7 +121,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;"
+                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -198,7 +198,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;"
+                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -277,7 +277,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;"
+                               AdditionalIncludeDirectories=".;../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../localization/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/fftw/Makefile.am b/scilab/modules/fftw/Makefile.am
index 9f50231..aedfeb0 100644 (file)
--- a/scilab/modules/fftw/Makefile.am
+++ b/scilab/modules/fftw/Makefile.am
@@ -58,6 +58,7 @@ libscifftw_la_CFLAGS=         -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        $(FFTW3_CFLAGS)
 
 #### fftw : include files ####
@@ -79,7 +80,8 @@ FFTW_C_SOURCES = src/nofftw/nofftw.c
 
 libscifftw_la_SOURCES = $(FFTW_C_SOURCES)
 
-libscifftw_la_CFLAGS= -I$(top_srcdir)/modules/output_stream/includes
+libscifftw_la_CFLAGS= -I$(top_srcdir)/modules/api_scilab/includes \
+-I$(top_srcdir)/modules/output_stream/includes
 endif
 
 include $(top_srcdir)/Makefile.incl.am
\ No newline at end of file

diff --git a/scilab/modules/fftw/fftw.vcproj b/scilab/modules/fftw/fftw.vcproj
index 57e290f..5f4cbe3 100644 (file)
--- a/scilab/modules/fftw/fftw.vcproj
+++ b/scilab/modules/fftw/fftw.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{13B86307-5A11-48D6-94BE-71F77BCB82D1}"
        RootNamespace="fftw"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;FFTW_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;FFTW_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;FFTW_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -299,7 +300,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;FFTW_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/fftw/includes/gw_fftw.h b/scilab/modules/fftw/includes/gw_fftw.h
index 76f1913..2d56b39 100644 (file)
--- a/scilab/modules/fftw/includes/gw_fftw.h
+++ b/scilab/modules/fftw/includes/gw_fftw.h
@@ -14,6 +14,7 @@
 #define __GW_FFTW__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 #include "sci_get_fftw_wisdom.h"
 #include "sci_fftw_flags.h"
 #include "sci_loadfftwlibrary.h"

diff --git a/scilab/modules/fftw/src/nofftw/nofftw.vcproj b/scilab/modules/fftw/src/nofftw/nofftw.vcproj
index 5a70fc6..03e28e6 100644 (file)
--- a/scilab/modules/fftw/src/nofftw/nofftw.vcproj
+++ b/scilab/modules/fftw/src/nofftw/nofftw.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{7D4C4BE5-62F7-4886-9E59-645017329A22}"
        RootNamespace="nofftw"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOFFTW_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOFFTW_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOFFTW_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -298,7 +299,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOFFTW_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/fileio/includes/gw_fileio.h b/scilab/modules/fileio/includes/gw_fileio.h
index 9f7d5a2..1f23ad3 100644 (file)
--- a/scilab/modules/fileio/includes/gw_fileio.h
+++ b/scilab/modules/fileio/includes/gw_fileio.h
@@ -12,6 +12,8 @@
 /*--------------------------------------------------------------------------*/ 
 #ifndef __GW_FILEIO_H__
 #define __GW_FILEIO_H__
+
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_fileio(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/functions/includes/gw_functions.h b/scilab/modules/functions/includes/gw_functions.h
index 9bd6826..de1103b 100644 (file)
--- a/scilab/modules/functions/includes/gw_functions.h
+++ b/scilab/modules/functions/includes/gw_functions.h
@@ -16,6 +16,7 @@
 #define __GW_FUNCTIONS_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_functions(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/graphic_export/Makefile.am b/scilab/modules/graphic_export/Makefile.am
index 68c6c3d..65fbd6f 100644 (file)
--- a/scilab/modules/graphic_export/Makefile.am
+++ b/scilab/modules/graphic_export/Makefile.am
@@ -62,6 +62,7 @@ libscigraphic_export_la_CPPFLAGS =    $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/renderer/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/libs/doublylinkedlist/includes
                                
 

diff --git a/scilab/modules/graphic_export/graphic_export.vcproj b/scilab/modules/graphic_export/graphic_export.vcproj
index 87cbea5..56af13c 100644 (file)
--- a/scilab/modules/graphic_export/graphic_export.vcproj
+++ b/scilab/modules/graphic_export/graphic_export.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{5AD5654B-B2EE-4B84-81FC-F6A4C1073D96}"
        RootNamespace="graphic_export"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS;STATIC_LINKED"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS;STATIC_LINKED"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -211,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS;STATIC_LINKED"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -301,7 +302,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS;STATIC_LINKED"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/graphic_export/includes/gw_graphic_export.h b/scilab/modules/graphic_export/includes/gw_graphic_export.h
index fa5067d..1b1a6df 100644 (file)
--- a/scilab/modules/graphic_export/includes/gw_graphic_export.h
+++ b/scilab/modules/graphic_export/includes/gw_graphic_export.h
@@ -14,6 +14,7 @@
 #define __GW_GRAPHIC_EXPORT__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_graphic_export(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/graphic_export/src/nographic_export/nographic_export.vcproj b/scilab/modules/graphic_export/src/nographic_export/nographic_export.vcproj
index 1476d08..1dccb19 100644 (file)
--- a/scilab/modules/graphic_export/src/nographic_export/nographic_export.vcproj
+++ b/scilab/modules/graphic_export/src/nographic_export/nographic_export.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{3411652C-2879-48D0-B5C1-18D546E0A683}"
        RootNamespace="nographic_export"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOGRAPHIC_EXPORT_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOGRAPHIC_EXPORT_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOGRAPHIC_EXPORT_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -298,7 +299,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOGRAPHIC_EXPORT_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/graphics/Makefile.am b/scilab/modules/graphics/Makefile.am
index ec7f4e2..db04897 100644 (file)
--- a/scilab/modules/graphics/Makefile.am
+++ b/scilab/modules/graphics/Makefile.am
@@ -31,6 +31,7 @@ libscigraphics_la_CFLAGS = -I$(top_srcdir)/libs/doublylinkedlist/includes \
        -I$(srcdir)/src/c/ \
        -I$(srcdir)/src/c/getHandleProperty/ \
        -I$(top_srcdir)/modules/gui/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes \
        -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/string/includes/
 
@@ -420,11 +421,13 @@ libscigraphics_la_CFLAGS +=       $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/renderer/includes/ \
                                -I$(top_srcdir)/modules/action_binding/includes \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/graphic_export/includes/
 
 libscigraphics_la_CXXFLAGS =   -Iincludes/ \
                                -Isrc/c/ $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/jvm/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/graphic_export/includes/
 
 libscigraphics_la_SOURCES = $(GRAPHICS_C_SOURCES) $(GATEWAY_C_SOURCES) $(GRAPHICS_CPP_SOURCES)
@@ -585,7 +588,7 @@ tcl/ged/images/text.gif
 
 libscigraphics_disable_la_SOURCES = src/nographics/nographics.c
 
-libscigraphics_disable_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes                              -I$(top_srcdir)/modules/renderer/includes/      -Iincludes/ -I$(top_srcdir)/libs/doublylinkedlist/includes
+libscigraphics_disable_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes                              -I$(top_srcdir)/modules/renderer/includes/      -I$(top_srcdir)/modules/api_scilab/includes \           -Iincludes/ -I$(top_srcdir)/libs/doublylinkedlist/includes
 
 libscigraphics_disable_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 

diff --git a/scilab/modules/graphics/graphics.vcproj b/scilab/modules/graphics/graphics.vcproj
index b0c6396..3b8b2c8 100644 (file)
--- a/scilab/modules/graphics/graphics.vcproj
+++ b/scilab/modules/graphics/graphics.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}"
        RootNamespace="graphics"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <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;../../../jvm/includes"
+                               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"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <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;../../../jvm/includes"
+                               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"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -210,7 +211,7 @@
                                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;../../../jvm/includes"
+                               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"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -300,7 +301,7 @@
                                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;../../../jvm/includes"
+                               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"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/graphics/includes/gw_graphics.h b/scilab/modules/graphics/includes/gw_graphics.h
index a738030..e9623a0 100644 (file)
--- a/scilab/modules/graphics/includes/gw_graphics.h
+++ b/scilab/modules/graphics/includes/gw_graphics.h
@@ -14,6 +14,9 @@
 /*--------------------------------------------------------------------------*/
 #ifndef __INTGRAPHICS__
 #define __INTGRAPHICS__
+
+#include "api_common.h"
+
 /*--------------------------------------------------------------------------*/ 
 int gw_graphics(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/graphics/src/nographics/nographics.vcproj b/scilab/modules/graphics/src/nographics/nographics.vcproj
index b50b680..9eb420b 100644 (file)
--- a/scilab/modules/graphics/src/nographics/nographics.vcproj
+++ b/scilab/modules/graphics/src/nographics/nographics.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{0AC1142C-0EFF-4406-9E5D-6111A7A8F614}"
        RootNamespace="nographics"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOGRAPHICS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOGRAPHICS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOGRAPHICS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -298,7 +299,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOGRAPHICS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/gui/Makefile.am b/scilab/modules/gui/Makefile.am
index fe47fa4..f22ceb7 100644 (file)
--- a/scilab/modules/gui/Makefile.am
+++ b/scilab/modules/gui/Makefile.am
@@ -214,6 +214,7 @@ libscigui_la_CFLAGS=        -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
                        -I$(top_srcdir)/modules/dynamic_link/includes \
                        -I$(srcdir)/src/cpp/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/
 
 libscigui_la_CFLAGS += $(JAVA_JNI_INCLUDE) \
@@ -238,11 +239,13 @@ libscigui_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/graphics/includes/ \
                        -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/ \
                        -I$(top_srcdir)/modules/graphic_export/includes/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/string/includes/
 
 
 # Without the GUI module 
 libscigui_disable_la_CFLAGS = -Iincludes/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/output_stream/includes
 
 GUI_DISABLE_C_SOURCES = src/nogui/nogui.c

diff --git a/scilab/modules/gui/includes/gw_gui.h b/scilab/modules/gui/includes/gw_gui.h
index 81d7fd2..5e53870 100644 (file)
--- a/scilab/modules/gui/includes/gw_gui.h
+++ b/scilab/modules/gui/includes/gw_gui.h
@@ -13,6 +13,8 @@
 
 #ifndef __GW_GUI__
 #define __GW_GUI__
+
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_gui(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/gui/src/c/gui.vcproj b/scilab/modules/gui/src/c/gui.vcproj
index 01f3223..5d6a1bd 100644 (file)
--- a/scilab/modules/gui/src/c/gui.vcproj
+++ b/scilab/modules/gui/src/c/gui.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{45CA5B12-7601-4968-AE16-16069FD1A152}"
        RootNamespace="gui"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../cpp"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../cpp;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../cpp"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../cpp;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -211,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../cpp"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../cpp;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -300,7 +301,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../cpp"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../cpp;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/hdf5/includes/gw_hdf5.h b/scilab/modules/hdf5/includes/gw_hdf5.h
index 2e7021f..1d547ca 100644 (file)
--- a/scilab/modules/hdf5/includes/gw_hdf5.h
+++ b/scilab/modules/hdf5/includes/gw_hdf5.h
@@ -14,6 +14,7 @@
 #define __GW_HDF5_H__
 /*--------------------------------------------------------------------------*/ 
 #include "dynlib_hdf5_scilab.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 HDF5_SCILAB_IMPEXP int gw_hdf5(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/helptools/Makefile.am b/scilab/modules/helptools/Makefile.am
index c6a0089..e321839 100644 (file)
--- a/scilab/modules/helptools/Makefile.am
+++ b/scilab/modules/helptools/Makefile.am
@@ -30,6 +30,7 @@ pkglib_LTLIBRARIES = libscihelptools.la
 
 libscihelptools_la_CFLAGS=     -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/jvm/includes
 
 
@@ -37,6 +38,7 @@ libscihelptools_la_CPPFLAGS= $(JAVA_JNI_INCLUDE) \
                                -I$(srcdir)/src/jni/ \
                                -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/jvm/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes/
 
 libscihelptools_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)

diff --git a/scilab/modules/helptools/src/c/helptools.vcproj b/scilab/modules/helptools/src/c/helptools.vcproj
index fd6ac0a..a124b99 100644 (file)
--- a/scilab/modules/helptools/src/c/helptools.vcproj
+++ b/scilab/modules/helptools/src/c/helptools.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,7 +6,7 @@
        ProjectGUID="{BED4A0F2-5129-487F-9F94-EC09480F04D7}"
        RootNamespace="helptools"
        Keyword="Win32Proj"
-
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -127,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -212,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -301,7 +301,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/history_manager/Makefile.am b/scilab/modules/history_manager/Makefile.am
index e18e2b8..e83b81b 100644 (file)
--- a/scilab/modules/history_manager/Makefile.am
+++ b/scilab/modules/history_manager/Makefile.am
@@ -41,7 +41,7 @@ endif
 
 
 # Includes need for the compilation
-libscihistory_manager_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/output_stream/includes/ -I$(top_srcdir)/modules/fileio/includes/
+libscihistory_manager_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ -I$(top_srcdir)/modules/api_scilab/includes -I$(top_srcdir)/libs/MALLOC/includes/ -I$(top_srcdir)/modules/output_stream/includes/ -I$(top_srcdir)/modules/fileio/includes/
 
 # Includes need for the compilation
 libscihistory_manager_la_CFLAGS=       $(JAVA_JNI_INCLUDE) \
@@ -51,6 +51,7 @@ libscihistory_manager_la_CFLAGS=      $(JAVA_JNI_INCLUDE) \
 -I$(top_srcdir)/modules/console/includes/ \
 -I$(top_srcdir)/modules/history_manager/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/fileio/includes/
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding

diff --git a/scilab/modules/history_manager/includes/gw_history_manager.h b/scilab/modules/history_manager/includes/gw_history_manager.h
index 42f2c96..c4602b2 100644 (file)
--- a/scilab/modules/history_manager/includes/gw_history_manager.h
+++ b/scilab/modules/history_manager/includes/gw_history_manager.h
@@ -15,6 +15,7 @@
 #define __GW_HISTORY_MANAGER_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_history_manager(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/history_manager/src/c/history_manager.vcproj b/scilab/modules/history_manager/src/c/history_manager.vcproj
index 4da0288..a3f6125 100644 (file)
--- a/scilab/modules/history_manager/src/c/history_manager.vcproj
+++ b/scilab/modules/history_manager/src/c/history_manager.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E}"
        RootNamespace="history_manager"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_EXPORTS;STATIC_LINKED"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_EXPORTS;STATIC_LINKED"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -211,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_EXPORTS;STATIC_LINKED"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -300,7 +301,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_EXPORTS;STATIC_LINKED"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.vcproj b/scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.vcproj
index 111740d..d224c57 100644 (file)
--- a/scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.vcproj
+++ b/scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{68F65DC6-AF8B-442F-A21A-108E1E501BE6}"
        RootNamespace="nohistory_manager"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOHISTORY_MANAGER_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOHISTORY_MANAGER_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOHISTORY_MANAGER_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -298,7 +299,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOHISTORY_MANAGER_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/integer/Makefile.am b/scilab/modules/integer/Makefile.am
index 6ee4925..129190f 100644 (file)
--- a/scilab/modules/integer/Makefile.am
+++ b/scilab/modules/integer/Makefile.am
@@ -115,6 +115,7 @@ sci_gateway/fortran/sci_i_min.f \
 sci_gateway/fortran/sci_inttype.f
 
 libsciinteger_la_CFLAGS=       -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes/
 
 pkglib_LTLIBRARIES = libsciinteger.la

diff --git a/scilab/modules/integer/src/c/integer.vcproj b/scilab/modules/integer/src/c/integer.vcproj
index 259ad2e..e39c8a2 100644 (file)
--- a/scilab/modules/integer/src/c/integer.vcproj
+++ b/scilab/modules/integer/src/c/integer.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,7 +6,7 @@
        ProjectGUID="{C7865CAA-EC7C-41EB-8324-2B81C384CA20}"
        RootNamespace="integer"
        Keyword="Win32Proj"
-
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTEGER_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -128,7 +128,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTEGER_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -214,7 +214,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;INTEGER_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -304,7 +304,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;INTEGER_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/interpolation/Makefile.am b/scilab/modules/interpolation/Makefile.am
index a152d2b..566abba 100644 (file)
--- a/scilab/modules/interpolation/Makefile.am
+++ b/scilab/modules/interpolation/Makefile.am
@@ -35,6 +35,7 @@ libsciinterpolation_la_CFLAGS=        -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                 -I$(top_srcdir)/modules/string/includes
 
 pkglib_LTLIBRARIES = libsciinterpolation.la

diff --git a/scilab/modules/interpolation/includes/gw_interpolation.h b/scilab/modules/interpolation/includes/gw_interpolation.h
index d11d477..0f06f34 100644 (file)
--- a/scilab/modules/interpolation/includes/gw_interpolation.h
+++ b/scilab/modules/interpolation/includes/gw_interpolation.h
@@ -16,6 +16,7 @@
 #define __GW_INTERPOLATION_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_interpolation(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/interpolation/src/c/interpolation.vcproj b/scilab/modules/interpolation/src/c/interpolation.vcproj
index 5c8a5a3..f5fd7b7 100644 (file)
--- a/scilab/modules/interpolation/src/c/interpolation.vcproj
+++ b/scilab/modules/interpolation/src/c/interpolation.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{22F14F8F-67C6-49B1-A730-CE70FFE9EB61}"
        RootNamespace="interpolation"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERPOLATION_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -127,7 +128,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERPOLATION_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -213,7 +214,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;INTERPOLATION_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -303,7 +304,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;INTERPOLATION_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/io/Makefile.am b/scilab/modules/io/Makefile.am
index b8e8eaf..3f8bc87 100644 (file)
--- a/scilab/modules/io/Makefile.am
+++ b/scilab/modules/io/Makefile.am
@@ -57,7 +57,8 @@ libsciio_la_CFLAGS=   -I$(srcdir)/includes/ \
 
 libsciio_la_CPPFLAGS=  -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/core/includes/ \
-                        -I$(top_srcdir)/modules/output_stream/includes/
+                       -I$(top_srcdir)/modules/api_scilab/includes \
+                       -I$(top_srcdir)/modules/output_stream/includes/
 
 
 pkglib_LTLIBRARIES = libsciio.la

diff --git a/scilab/modules/io/includes/gw_io.h b/scilab/modules/io/includes/gw_io.h
index 597e54b..9df786f 100644 (file)
--- a/scilab/modules/io/includes/gw_io.h
+++ b/scilab/modules/io/includes/gw_io.h
@@ -14,6 +14,7 @@
 #define __GW_IO_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_io(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/jvm/Makefile.am b/scilab/modules/jvm/Makefile.am
index f9468f9..db54241 100644 (file)
--- a/scilab/modules/jvm/Makefile.am
+++ b/scilab/modules/jvm/Makefile.am
@@ -34,6 +34,7 @@ libscijvm_la_CFLAGS=          $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/call_scilab/includes \
                        -I$(top_srcdir)/modules/fileio/includes/
 
@@ -102,6 +103,7 @@ libscijvm_disable_la_SOURCES = src/nojvm/nojvm.c
 libscijvm_disable_la_CFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/call_scilab/includes \
                        -I$(srcdir)/src/c \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/output_stream/includes/
 
 libscijvm_la_SOURCES = $(JVM_C_SOURCES) $(GATEWAY_C_SOURCES)

diff --git a/scilab/modules/jvm/includes/gw_jvm.h b/scilab/modules/jvm/includes/gw_jvm.h
index 595f742..f95dda3 100644 (file)
--- a/scilab/modules/jvm/includes/gw_jvm.h
+++ b/scilab/modules/jvm/includes/gw_jvm.h
@@ -16,6 +16,7 @@
 #define __GW_JVM_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_jvm(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/jvm/libjvm.vcproj b/scilab/modules/jvm/libjvm.vcproj
index 374cea2..f27a97e 100644 (file)
--- a/scilab/modules/jvm/libjvm.vcproj
+++ b/scilab/modules/jvm/libjvm.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}"
        RootNamespace="libjvm"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../windows_tools/includes;../string/includes;../core/includes;../fileio/includes;../../java/jdk/include;../../java/jdk/include/win32;../../libs/GetWindowsVersion;includes;src/c;../output_stream/includes;../localization/includes;../call_scilab/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="../windows_tools/includes;../string/includes;../core/includes;../fileio/includes;../../java/jdk/include;../../java/jdk/include/win32;../../libs/GetWindowsVersion;includes;src/c;../output_stream/includes;../localization/includes;../call_scilab/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -127,7 +128,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../windows_tools/includes;../string/includes;../core/includes;../fileio/includes;../../java/jdk/include;../../java/jdk/include/win32;../../libs/GetWindowsVersion;includes;src/c;../output_stream/includes;../localization/includes;../call_scilab/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="../windows_tools/includes;../string/includes;../core/includes;../fileio/includes;../../java/jdk/include;../../java/jdk/include/win32;../../libs/GetWindowsVersion;includes;src/c;../output_stream/includes;../localization/includes;../call_scilab/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -213,7 +214,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../windows_tools/includes;../string/includes;../core/includes;../fileio/includes;../../java/jdk/include;../../java/jdk/include/win32;../../libs/GetWindowsVersion;includes;src/c;../output_stream/includes;../localization/includes;../call_scilab/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="../windows_tools/includes;../string/includes;../core/includes;../fileio/includes;../../java/jdk/include;../../java/jdk/include/win32;../../libs/GetWindowsVersion;includes;src/c;../output_stream/includes;../localization/includes;../call_scilab/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -304,7 +305,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../windows_tools/includes;../string/includes;../core/includes;../fileio/includes;../../java/jdk/include;../../java/jdk/include/win32;../../libs/GetWindowsVersion;includes;src/c;../output_stream/includes;../localization/includes;../call_scilab/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="../windows_tools/includes;../string/includes;../core/includes;../fileio/includes;../../java/jdk/include;../../java/jdk/include/win32;../../libs/GetWindowsVersion;includes;src/c;../output_stream/includes;../localization/includes;../call_scilab/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/jvm/src/c/JVM.h b/scilab/modules/jvm/src/c/JVM.h
index 21a16a5..93d1001 100644 (file)
--- a/scilab/modules/jvm/src/c/JVM.h
+++ b/scilab/modules/jvm/src/c/JVM.h
@@ -15,8 +15,13 @@
 #ifndef __JVM_H__
 #define __JVM_H__
 
-#include "BOOL.h" /* BOOL */
 #include <jni.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "BOOL.h" /* BOOL */
 /**
 * start JVM used in InitializeJVM function
 * @param Scilab path
@@ -37,6 +42,9 @@ BOOL finishJVM(void);
  */
 JNIEnv *getScilabJNIEnv(void);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __JVM_H__ */
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/linear_algebra/Makefile.am b/scilab/modules/linear_algebra/Makefile.am
index 817a10e..cebd625 100644 (file)
--- a/scilab/modules/linear_algebra/Makefile.am
+++ b/scilab/modules/linear_algebra/Makefile.am
@@ -94,6 +94,7 @@ GATEWAY_FORTRAN_SOURCES = sci_gateway/fortran/bschur.f
 libscilinear_algebra_la_CFLAGS=        -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/elementary_functions/includes
 
 pkglib_LTLIBRARIES = libscilinear_algebra.la

diff --git a/scilab/modules/linear_algebra/includes/gw_linear_algebra.h b/scilab/modules/linear_algebra/includes/gw_linear_algebra.h
index a09578a..8eb40d0 100644 (file)
--- a/scilab/modules/linear_algebra/includes/gw_linear_algebra.h
+++ b/scilab/modules/linear_algebra/includes/gw_linear_algebra.h
@@ -14,6 +14,7 @@
 #ifndef __GW_LINEAR_ALGEBRA__
 #define __GW_LINEAR_ALGEBRA__
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 #define SCI_DOUBLE 1
 #define STRING  10

diff --git a/scilab/modules/linear_algebra/includes/gw_linear_algebra2.h b/scilab/modules/linear_algebra/includes/gw_linear_algebra2.h
index ebbfb6d..c2e7180 100644 (file)
--- a/scilab/modules/linear_algebra/includes/gw_linear_algebra2.h
+++ b/scilab/modules/linear_algebra/includes/gw_linear_algebra2.h
@@ -15,6 +15,7 @@
 #define __GW_LINEAR_ALGEBRA2__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_linear_algebra2(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/linear_algebra/src/c/linear_algebra.vcproj b/scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
index 5d1112e..7cf5e0d 100644 (file)
--- a/scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
+++ b/scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{BC462A57-C5B3-4F93-8067-80363827DCDA}"
        RootNamespace="linear_algebra"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;LINEAR_ALGEBRA_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;LINEAR_ALGEBRA_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -211,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;LINEAR_ALGEBRA_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -300,7 +301,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;LINEAR_ALGEBRA_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -385,55 +386,43 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_dgeev.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\sci_gateway\c\sci_dggev.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\sci_gateway\c\sci_dsyev.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\sci_gateway\c\sci_zgeev.c"
+                               RelativePath=".\issymmetric.c"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_zggev.c"
+                               RelativePath=".\schurtable.c"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_zheev.c"
+                               RelativePath="..\..\sci_gateway\c\sci_backslash.c"
                                >
                        </File>
                        <File
-                               RelativePath=".\issymmetric.c"
+                               RelativePath="..\..\sci_gateway\c\sci_balanc.c"
                                >
                        </File>
                        <File
-                               RelativePath=".\schurtable.c"
+                               RelativePath="..\..\sci_gateway\c\sci_bdiag.c"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_backslash.c"
+                               RelativePath="..\..\sci_gateway\c\sci_chol.c"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_balanc.c"
+                               RelativePath="..\..\sci_gateway\c\sci_det.c"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_bdiag.c"
+                               RelativePath="..\..\sci_gateway\c\sci_dgeev.c"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_chol.c"
+                               RelativePath="..\..\sci_gateway\c\sci_dggev.c"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_det.c"
+                               RelativePath="..\..\sci_gateway\c\sci_dsyev.c"
                                >
                        </File>
                        <File
@@ -476,6 +465,18 @@
                                RelativePath="..\..\sci_gateway\c\sci_svd.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\c\sci_zgeev.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\c\sci_zggev.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\c\sci_zheev.c"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="Header Files"

diff --git a/scilab/modules/localization/Makefile.am b/scilab/modules/localization/Makefile.am
index 5791bf5..2d4bf6d 100644 (file)
--- a/scilab/modules/localization/Makefile.am
+++ b/scilab/modules/localization/Makefile.am
@@ -32,6 +32,7 @@ libscilocalization_la_CFLAGS=         $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscilocalization.la

diff --git a/scilab/modules/localization/includes/charEncoding.h b/scilab/modules/localization/includes/charEncoding.h
index faab1e7..b4d0fc7 100644 (file)
--- a/scilab/modules/localization/includes/charEncoding.h
+++ b/scilab/modules/localization/includes/charEncoding.h
@@ -17,6 +17,9 @@
 #include <sys/types.h>
 #include "MALLOC.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
 * wcfopen macro for fopen Multibyte char multiplatform
@@ -63,5 +66,8 @@ char *wide_string_to_UTF8(wchar_t *_wide);
 int wcstat(char* filename, struct _stat *st);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __CHARENCODING_H__ */
 

diff --git a/scilab/modules/localization/includes/gw_localization.h b/scilab/modules/localization/includes/gw_localization.h
index b8322f1..588c12f 100644 (file)
--- a/scilab/modules/localization/includes/gw_localization.h
+++ b/scilab/modules/localization/includes/gw_localization.h
@@ -14,6 +14,7 @@
 #ifndef __GW_LOCALIZATION__
 #define __GW_LOCALIZATION__
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_localization(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/localization/includes/localization.h b/scilab/modules/localization/includes/localization.h
index 1755e4e..ce8296d 100644 (file)
--- a/scilab/modules/localization/includes/localization.h
+++ b/scilab/modules/localization/includes/localization.h
@@ -15,10 +15,15 @@
 #ifndef __LOCALIZATION_H__
 #define __LOCALIZATION_H__
 /*--------------------------------------------------------------------------*/ 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef _MSC_VER
 #include "machine.h" /* HAVE_LIBINTL_H */
 #endif
 
+
 #ifdef HAVE_LIBINTL_H
 /* Have been able to find the libintl.h file on the system */
 #include <libintl.h>
@@ -38,5 +43,8 @@
 
 #endif
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __LOCALIZATION_H__ */
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/localization/src/localization.vcproj b/scilab/modules/localization/src/localization.vcproj
index 7d03423..ac15123 100644 (file)
--- a/scilab/modules/localization/src/localization.vcproj
+++ b/scilab/modules/localization/src/localization.vcproj
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
        Name="localization"
        ProjectGUID="{ECFFEB0C-1EDA-45EE-9A10-B18143852E17}"
        RootNamespace="localization"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -45,7 +46,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../src/c;../includes;../../core/includes;../../output_stream/includes;../../windows_tools/includes;../../fileio/includes;../../string/src/c;../../string/includes;../../../libs/intl;../../../libs/hashtable;../../../libs/MALLOC/includes;../../../libs/libxml2;../../../libs/libxml2/libxml;../../../java/jdk/include;../../../java/jdk/include/win32;../../../libs/GetWindowsVersion"
+                               AdditionalIncludeDirectories="../src/c;../includes;../../core/includes;../../output_stream/includes;../../windows_tools/includes;../../fileio/includes;../../string/src/c;../../string/includes;../../../libs/intl;../../../libs/hashtable;../../../libs/MALLOC/includes;../../../libs/libxml2;../../../libs/libxml2/libxml;../../../java/jdk/include;../../../java/jdk/include/win32;../../../libs/GetWindowsVersion;../../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;EXPORT_LOCALIZATION_DLL"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -137,7 +138,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../src/c;../includes;../../core/includes;../../output_stream/includes;../../windows_tools/includes;../../fileio/includes;../../string/src/c;../../string/includes;../../../libs/intl;../../../libs/hashtable;../../../libs/MALLOC/includes;../../../libs/libxml2;../../../libs/libxml2/libxml;../../../java/jdk/include;../../../java/jdk/include/win32;../../../libs/GetWindowsVersion"
+                               AdditionalIncludeDirectories="../src/c;../includes;../../core/includes;../../output_stream/includes;../../windows_tools/includes;../../fileio/includes;../../string/src/c;../../string/includes;../../../libs/intl;../../../libs/hashtable;../../../libs/MALLOC/includes;../../../libs/libxml2;../../../libs/libxml2/libxml;../../../java/jdk/include;../../../java/jdk/include/win32;../../../libs/GetWindowsVersion;../../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DLL;_DEBUG;_CRT_SECURE_NO_DEPRECATE;EXPORT_LOCALIZATION_DLL"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
@@ -230,7 +231,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../src/c;../includes;../../core/includes;../../output_stream/includes;../../windows_tools/includes;../../fileio/includes;../../string/src/c;../../string/includes;../../../libs/intl;../../../libs/hashtable;../../../libs/MALLOC/includes;../../../libs/libxml2;../../../libs/libxml2/libxml;../../../java/jdk/include;../../../java/jdk/include/win32;../../../libs/GetWindowsVersion"
+                               AdditionalIncludeDirectories="../src/c;../includes;../../core/includes;../../output_stream/includes;../../windows_tools/includes;../../fileio/includes;../../string/src/c;../../string/includes;../../../libs/intl;../../../libs/hashtable;../../../libs/MALLOC/includes;../../../libs/libxml2;../../../libs/libxml2/libxml;../../../java/jdk/include;../../../java/jdk/include/win32;../../../libs/GetWindowsVersion;../../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;EXPORT_LOCALIZATION_DLL;NDEBUG;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -323,7 +324,7 @@
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../src/c;../includes;../../core/includes;../../output_stream/includes;../../windows_tools/includes;../../fileio/includes;../../string/src/c;../../string/includes;../../../libs/intl;../../../libs/hashtable;../../../libs/MALLOC/includes;../../../libs/libxml2;../../../libs/libxml2/libxml;../../../java/jdk/include;../../../java/jdk/include/win32;../../../libs/GetWindowsVersion"
+                               AdditionalIncludeDirectories="../src/c;../includes;../../core/includes;../../output_stream/includes;../../windows_tools/includes;../../fileio/includes;../../string/src/c;../../string/includes;../../../libs/intl;../../../libs/hashtable;../../../libs/MALLOC/includes;../../../libs/libxml2;../../../libs/libxml2/libxml;../../../java/jdk/include;../../../java/jdk/include/win32;../../../libs/GetWindowsVersion;../../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;EXPORT_LOCALIZATION_DLL;NDEBUG;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/matio/Makefile.am b/scilab/modules/matio/Makefile.am
index 0a5ac44..f743724 100644 (file)
--- a/scilab/modules/matio/Makefile.am
+++ b/scilab/modules/matio/Makefile.am
@@ -48,6 +48,7 @@ libscimatio_la_CFLAGS = -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/matio/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        $(MATIO_CFLAGS)
 
 pkglib_LTLIBRARIES = libscimatio.la

diff --git a/scilab/modules/matio/matio.vcproj b/scilab/modules/matio/matio.vcproj
index 9183ef0..09e002a 100644 (file)
--- a/scilab/modules/matio/matio.vcproj
+++ b/scilab/modules/matio/matio.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{7757B22F-9512-4380-9E40-EFD50575028D}"
        RootNamespace="matio"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/matio;../../libs/zlib"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/matio;../../libs/zlib;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;MATIO_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/matio;../../libs/zlib"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/matio;../../libs/zlib;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;MATIO_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/matio;../../libs/zlib"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/matio;../../libs/zlib;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;MATIO_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -299,7 +300,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/matio;../../libs/zlib"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../windows_tools/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/matio;../../libs/zlib;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;MATIO_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/metanet/Makefile.am b/scilab/modules/metanet/Makefile.am
index 5267648..643e6dd 100644 (file)
--- a/scilab/modules/metanet/Makefile.am
+++ b/scilab/modules/metanet/Makefile.am
@@ -119,6 +119,7 @@ libscimetanet_la_CFLAGS=    -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/libs/hashtable/
 
 pkglib_LTLIBRARIES = libscimetanet.la

diff --git a/scilab/modules/metanet/includes/gw_metanet.h b/scilab/modules/metanet/includes/gw_metanet.h
index 97313bd..2fcb2d2 100644 (file)
--- a/scilab/modules/metanet/includes/gw_metanet.h
+++ b/scilab/modules/metanet/includes/gw_metanet.h
@@ -19,6 +19,7 @@
 #define __GW_METANET__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_metanet(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/metanet/src/c/metanet.vcproj b/scilab/modules/metanet/src/c/metanet.vcproj
index 9ddd218..9cd9a12 100644 (file)
--- a/scilab/modules/metanet/src/c/metanet.vcproj
+++ b/scilab/modules/metanet/src/c/metanet.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{E9741474-5C3A-4101-8B85-AC5221018C05}"
        RootNamespace="metanet"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;METANET_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;METANET_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -211,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;METANET_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -300,7 +301,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;METANET_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/metanet/src/c/nometanet/nometanet.vcproj b/scilab/modules/metanet/src/c/nometanet/nometanet.vcproj
index 47bfd00..9b12dc2 100644 (file)
--- a/scilab/modules/metanet/src/c/nometanet/nometanet.vcproj
+++ b/scilab/modules/metanet/src/c/nometanet/nometanet.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{5F09A87D-A877-4AB8-9482-029253833FE4}"
        RootNamespace="nometanet"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOMETANET_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOMETANET_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOMETANET_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -298,7 +299,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOMETANET_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/optimization/Makefile.am b/scilab/modules/optimization/Makefile.am
index 6de7eca..1cd7338 100644 (file)
--- a/scilab/modules/optimization/Makefile.am
+++ b/scilab/modules/optimization/Makefile.am
@@ -119,6 +119,7 @@ sci_gateway/fortran/Ex-fsolve.f \
 sci_gateway/fortran/Ex-lsqrsolve.f
 
 libscioptimization_la_CFLAGS=          -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes
 

diff --git a/scilab/modules/optimization/includes/gw_optim.h b/scilab/modules/optimization/includes/gw_optim.h
index ba97d4e..b25be0e 100644 (file)
--- a/scilab/modules/optimization/includes/gw_optim.h
+++ b/scilab/modules/optimization/includes/gw_optim.h
@@ -14,6 +14,7 @@
 #define __GW_OPTIM__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_optimization(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/optimization/src/c/optimization.vcproj b/scilab/modules/optimization/src/c/optimization.vcproj
index cb4a914..cb695f5 100644 (file)
--- a/scilab/modules/optimization/src/c/optimization.vcproj
+++ b/scilab/modules/optimization/src/c/optimization.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{425B887B-9FC5-4CD2-B632-DBFC000E3E25}"
        RootNamespace="optimization"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OPTIMIZATION_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OPTIMIZATION_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -211,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OPTIMIZATION_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -300,7 +301,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OPTIMIZATION_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/output_stream/Makefile.am b/scilab/modules/output_stream/Makefile.am
index e0e56ad..c64bde5 100644 (file)
--- a/scilab/modules/output_stream/Makefile.am
+++ b/scilab/modules/output_stream/Makefile.am
@@ -59,6 +59,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/api_scilab/includes \
 -I$(top_srcdir)/modules/string/includes
 
 pkglib_LTLIBRARIES = libscioutput_stream.la

diff --git a/scilab/modules/output_stream/includes/Scierror.h b/scilab/modules/output_stream/includes/Scierror.h
index b7913cb..28124b1 100644 (file)
--- a/scilab/modules/output_stream/includes/Scierror.h
+++ b/scilab/modules/output_stream/includes/Scierror.h
@@ -15,6 +15,10 @@
 #define __SCIERROR__
 
 #include <stdarg.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include "do_error_number.h"
 
 
@@ -27,5 +31,8 @@
 */
 int  Scierror(int iv,char *fmt,...);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* __SCIERROR__ */
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/output_stream/includes/gw_output_stream.h b/scilab/modules/output_stream/includes/gw_output_stream.h
index f47facd..2ced95f 100644 (file)
--- a/scilab/modules/output_stream/includes/gw_output_stream.h
+++ b/scilab/modules/output_stream/includes/gw_output_stream.h
@@ -12,6 +12,9 @@
 
 #ifndef __GW_OUTPUT_STREAM_H__
 #define __GW_OUTPUT_STREAM_H__
+
+#include "api_common.h"
+
 /*--------------------------------------------------------------------------*/
 int gw_output_stream(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/output_stream/includes/sciprint.h b/scilab/modules/output_stream/includes/sciprint.h
index 3c41f94..7e40c47 100644 (file)
--- a/scilab/modules/output_stream/includes/sciprint.h
+++ b/scilab/modules/output_stream/includes/sciprint.h
@@ -15,6 +15,10 @@
 #define __SCIPRINT_H__
 
 #include <stdarg.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include "BOOL.h"
 
 /**
@@ -33,6 +37,9 @@ void sciprint(char *fmt,...) ;
 * @param[in] va_list
 * @return nb characters
 */int scivprint(char *fmt,va_list args);
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* __SCIPRINT_H__ */
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/output_stream/src/c/output_stream.vcproj b/scilab/modules/output_stream/src/c/output_stream.vcproj
index 60531a5..bf76e86 100644 (file)
--- a/scilab/modules/output_stream/src/c/output_stream.vcproj
+++ b/scilab/modules/output_stream/src/c/output_stream.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{A5911CD7-F8E8-440C-A23E-4843A0636F3A}"
        RootNamespace="output_stream"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/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;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -127,7 +128,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/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;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -213,7 +214,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/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;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -303,7 +304,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/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;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/polynomials/Makefile.am b/scilab/modules/polynomials/Makefile.am
index cd29083..b77bb68 100644 (file)
--- a/scilab/modules/polynomials/Makefile.am
+++ b/scilab/modules/polynomials/Makefile.am
@@ -109,6 +109,7 @@ sci_gateway/fortran/sci_f_simpmd.f
 
 
 libscipolynomials_la_CFLAGS=   -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscipolynomials.la

diff --git a/scilab/modules/polynomials/src/c/polynomials.vcproj b/scilab/modules/polynomials/src/c/polynomials.vcproj
index c1f1de9..32f0301 100644 (file)
--- a/scilab/modules/polynomials/src/c/polynomials.vcproj
+++ b/scilab/modules/polynomials/src/c/polynomials.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{620D8FA7-3704-438E-BB1E-391C84401A2E}"
        RootNamespace="polynomials"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;POLYNOMIALS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;POLYNOMIALS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -211,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;POLYNOMIALS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -300,7 +301,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;POLYNOMIALS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/pvm/Makefile.am b/scilab/modules/pvm/Makefile.am
index f3a1f71..e2affbe 100644 (file)
--- a/scilab/modules/pvm/Makefile.am
+++ b/scilab/modules/pvm/Makefile.am
@@ -55,6 +55,7 @@ libscipvm_la_CFLAGS=  -I$(srcdir)/includes/ \
        -I$(top_srcdir)/modules/output_stream/includes/ \
        -I$(top_srcdir)/modules/io/includes/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes \
        $(PVM_INCLUDE)
 
 pkglib_LTLIBRARIES = libscipvm.la
@@ -104,7 +105,8 @@ libscipvm_la_SOURCES = $(PVM_C_SOURCES)
 libscipvm_la_LIBADD = \
        $(top_builddir)/modules/core/libscicore.la
 
-libscipvm_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes/
+libscipvm_la_CFLAGS = -I$(top_srcdir)/modules/api_scilab/includes \
+-I$(top_srcdir)/modules/output_stream/includes/
 
 modulename=pvm
 

diff --git a/scilab/modules/pvm/includes/gw_pvm.h b/scilab/modules/pvm/includes/gw_pvm.h
index 98e267a..3307b60 100644 (file)
--- a/scilab/modules/pvm/includes/gw_pvm.h
+++ b/scilab/modules/pvm/includes/gw_pvm.h
@@ -14,6 +14,7 @@
 #define __INTMATPVM__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_pvm(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/pvm/pvm.vcproj b/scilab/modules/pvm/pvm.vcproj
index 6490423..3a1fbf0 100644 (file)
--- a/scilab/modules/pvm/pvm.vcproj
+++ b/scilab/modules/pvm/pvm.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{63352867-3983-48E3-94FE-DD8F0D6E921F}"
        RootNamespace="pvm"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes"
+                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;PVM_EXPORTS;WIN32;__STDC__"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -126,7 +127,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes"
+                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;PVM_EXPORTS;WIN32;__STDC__"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -211,7 +212,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes"
+                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;PVM_EXPORTS;WIN32;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="0"
@@ -301,7 +302,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes"
+                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;PVM_EXPORTS;WIN32;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="0"

diff --git a/scilab/modules/pvm/src/nopvm/nopvm.vcproj b/scilab/modules/pvm/src/nopvm/nopvm.vcproj
index 999ec50..1239044 100644 (file)
--- a/scilab/modules/pvm/src/nopvm/nopvm.vcproj
+++ b/scilab/modules/pvm/src/nopvm/nopvm.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{DF1A523C-1607-486D-8A5F-533B74EBC1A8}"
        RootNamespace="nopvm"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOPVM_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -124,7 +125,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOPVM_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -207,7 +208,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOPVM_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -295,7 +296,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOPVM_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/randlib/Makefile.am b/scilab/modules/randlib/Makefile.am
index a771cb2..30f31f8 100644 (file)
--- a/scilab/modules/randlib/Makefile.am
+++ b/scilab/modules/randlib/Makefile.am
@@ -45,6 +45,7 @@ GATEWAY_C_SOURCES = sci_gateway/c/gw_randlib.c \
 sci_gateway/c/sci_grand.c
 
 libscirandlib_la_CFLAGS=       -I$(srcdir)/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/output_stream/includes
 
 pkglib_LTLIBRARIES = libscirandlib.la

diff --git a/scilab/modules/randlib/includes/gw_randlib.h b/scilab/modules/randlib/includes/gw_randlib.h
index cad49df..d331669 100644 (file)
--- a/scilab/modules/randlib/includes/gw_randlib.h
+++ b/scilab/modules/randlib/includes/gw_randlib.h
@@ -15,6 +15,7 @@
 #define __GW_RANDLIB_H__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_randlib(void);
 /*--------------------------------------------------------------------------*/ 

diff --git a/scilab/modules/randlib/src/c/randlib.vcproj b/scilab/modules/randlib/src/c/randlib.vcproj
index 819d055..c32f839 100644 (file)
--- a/scilab/modules/randlib/src/c/randlib.vcproj
+++ b/scilab/modules/randlib/src/c/randlib.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}"
        RootNamespace="randlib"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;RANDLIB_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -127,7 +128,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;RANDLIB_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -213,7 +214,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;RANDLIB_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -303,7 +304,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;RANDLIB_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/randlib/src/norandlib/norandlib.vcproj b/scilab/modules/randlib/src/norandlib/norandlib.vcproj
index abe3049..e8709c8 100644 (file)
--- a/scilab/modules/randlib/src/norandlib/norandlib.vcproj
+++ b/scilab/modules/randlib/src/norandlib/norandlib.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{E5038304-761D-448C-B358-48CA2883778A}"
        RootNamespace="norandlib"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NORANDLIB_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NORANDLIB_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NORANDLIB_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -298,7 +299,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NORANDLIB_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/renderer/Makefile.am b/scilab/modules/renderer/Makefile.am
index 8f4ad1f..f7a0c64 100644 (file)
--- a/scilab/modules/renderer/Makefile.am
+++ b/scilab/modules/renderer/Makefile.am
@@ -295,6 +295,7 @@ libscirenderer_la_CPPFLAGS =        $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/graphic_export/includes/ \
                                -I$(top_srcdir)/modules/elementary_functions/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/gui/includes/
 
 libscirenderer_la_CFLAGS=      -I$(srcdir)/includes/

diff --git a/scilab/modules/renderer/renderer.vcproj b/scilab/modules/renderer/renderer.vcproj
index 382a939..96ca111 100644 (file)
--- a/scilab/modules/renderer/renderer.vcproj
+++ b/scilab/modules/renderer/renderer.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{B23B01C1-A545-4BA0-9950-7BCADE201C5B}"
        RootNamespace="renderer"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -298,7 +299,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;../graphic_export/includes;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../windows_tools/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../elementary_functions/includes;../gui/includes;../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/scicos/Makefile.am b/scilab/modules/scicos/Makefile.am
index fb30017..383fbf0 100644 (file)
--- a/scilab/modules/scicos/Makefile.am
+++ b/scilab/modules/scicos/Makefile.am
@@ -105,6 +105,7 @@ libsciscicos_la_CFLAGS= -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/intersci/includes \
                        -I$(top_srcdir)/modules/scicos_blocks/includes \
                        -I$(top_srcdir)/modules/action_binding/includes \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/time/includes
 
 libsciscicos_la_SOURCES = $(SCICOS_C_SOURCES) $(SCICOS_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
@@ -275,6 +276,7 @@ NO_SCICOS_C_SOURCES = src/c/noscicos/noscicos.c
 libsciscicos_la_SOURCES = $(NO_SCICOS_C_SOURCES)
 
 libsciscicos_la_CFLAGS= -I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/scicos/includes
 
 libsciscicos_la_includedir=$(pkgincludedir)/scicos

diff --git a/scilab/modules/scicos/includes/gw_scicos.h b/scilab/modules/scicos/includes/gw_scicos.h
index d011d38..6a32608 100644 (file)
--- a/scilab/modules/scicos/includes/gw_scicos.h
+++ b/scilab/modules/scicos/includes/gw_scicos.h
@@ -26,6 +26,7 @@
 #define __GW_SCICOS__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_scicos(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/scicos/src/c/noscicos/noscicos.vcproj b/scilab/modules/scicos/src/c/noscicos/noscicos.vcproj
index 3b2c571..58da7fa 100644 (file)
--- a/scilab/modules/scicos/src/c/noscicos/noscicos.vcproj
+++ b/scilab/modules/scicos/src/c/noscicos/noscicos.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{0A0B68FA-98F5-4FC2-A9E9-4AC9CEE6A6B4}"
        RootNamespace="noscicos"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../includes;../../../../../libs/intl;../../../../intersci/includes"
+                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../includes;../../../../../libs/intl;../../../../intersci/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -125,7 +126,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../includes;../../../../../libs/intl;../../../../intersci/includes"
+                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../includes;../../../../../libs/intl;../../../../intersci/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -209,7 +210,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../includes;../../../../../libs/intl;../../../../intersci/includes"
+                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../includes;../../../../../libs/intl;../../../../intersci/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -297,7 +298,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../includes;../../../../../libs/intl;../../../../intersci/includes"
+                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../includes;../../../../../libs/intl;../../../../intersci/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/scicos/src/c/scicos.vcproj b/scilab/modules/scicos/src/c/scicos.vcproj
index 0854636..589d1ff 100644 (file)
--- a/scilab/modules/scicos/src/c/scicos.vcproj
+++ b/scilab/modules/scicos/src/c/scicos.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{B7A0273E-8E71-4663-8497-0895945ED54D}"
        RootNamespace="scicos"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -44,7 +45,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../graphics/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials;../../../action_binding/includes;../../../intersci/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../graphics/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials;../../../action_binding/includes;../../../intersci/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -130,7 +131,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../graphics/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials;../../../action_binding/includes;../../../intersci/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../graphics/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials;../../../action_binding/includes;../../../intersci/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -218,7 +219,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../graphics/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials;../../../action_binding/includes;../../../intersci/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../graphics/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials;../../../action_binding/includes;../../../intersci/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -310,7 +311,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../graphics/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials;../../../action_binding/includes;../../../intersci/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/doublylinkedlist/includes;../../../core/includes;../../../time/includes;../../../output_stream/includes;../../../scicos_blocks/includes;../../../graphics/includes;../../../string/includes;../../../intersci/src/lib;../../../dynamic_link/includes;../scicos_sundials;../../../action_binding/includes;../../../intersci/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/shell/Makefile.am b/scilab/modules/shell/Makefile.am
index 791719b..838a100 100644 (file)
--- a/scilab/modules/shell/Makefile.am
+++ b/scilab/modules/shell/Makefile.am
@@ -33,8 +33,12 @@ sci_gateway/c/sci_prompt.c \
 sci_gateway/c/sci_iswaitingforinput.c
 
 # Includes need for the compilation
-libscishell_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) -I$(srcdir)/includes/ -I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ \
--I$(srcdir)/src/c/others/ -I$(top_srcdir)/libs/MALLOC/includes/
+libscishell_la_CPPFLAGS =  $(JAVA_JNI_INCLUDE) \
+-I$(top_srcdir)/modules/api_scilab/includes \
+-I$(srcdir)/includes/ \
+-I$(srcdir)/src/cpp/ -I$(srcdir)/src/c/ \
+-I$(srcdir)/src/c/others/ \
+-I$(top_srcdir)/libs/MALLOC/includes/
 
 # Includes need for the compilation
 libscishell_la_CFLAGS=         $(JAVA_JNI_INCLUDE) \
@@ -49,6 +53,7 @@ libscishell_la_CFLAGS=        $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/localization/includes \
                        -I$(top_srcdir)/modules/action_binding/includes/ \
                        -I$(top_srcdir)/modules/fileio/src/c/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/fileio/includes/
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding

diff --git a/scilab/modules/shell/includes/gw_shell.h b/scilab/modules/shell/includes/gw_shell.h
index d4819a2..622e973 100644 (file)
--- a/scilab/modules/shell/includes/gw_shell.h
+++ b/scilab/modules/shell/includes/gw_shell.h
@@ -14,6 +14,7 @@
 #define __GW_SHELL_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_shell(void);
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/shell/src/c/shell.vcproj b/scilab/modules/shell/src/c/shell.vcproj
index 27e717f..84d1121 100644 (file)
--- a/scilab/modules/shell/src/c/shell.vcproj
+++ b/scilab/modules/shell/src/c/shell.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{805AA73F-EF7B-4177-BF46-200B72D8F83A}"
        RootNamespace="shell"
        Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -43,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes"
+                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -127,7 +128,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes"
+                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
@@ -213,7 +214,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes"
+                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@ -303,7 +304,7 @@
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes"
+                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"

diff --git a/scilab/modules/signal_processing/Makefile.am b/scilab/modules/signal_processing/Makefile.am
index 5d57466..1c7575c 100644 (file)
--- a/scilab/modules/signal_processing/Makefile.am
+++ b/scilab/modules/signal_processing/Makefile.am
@@ -93,6 +93,7 @@ sci_gateway/fortran/bgety.f \
 sci_gateway/fortran/Ex-corr.f
 
 libscisignal_processing_la_CFLAGS=     -I$(srcdir)/includes/ \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes
 

diff --git a/scilab/modules/signal_processing/src/c/signal_processing.vcproj b/scilab/modules/signal_processing/src/c/signal_processing.vcproj
index 4ce404d..4704743 100644 (file)
--- a/scilab/modules/signal_processing/src/c/signal_processing.vcproj
+++ b/scilab/modules/signal_processing/src/c/signal_processing.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -6,6 +6,7 @@
        ProjectGUID="{A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606}"
        RootNamespace="signal_processing"
        Keyword="Win32Proj"
+       T