merge sas
Antoine ELIAS [Thu, 20 Aug 2009 08:13:10 +0000 (10:13 +0200)]
209 files changed:
scilab/modules/api_scilab/Makefile.am
scilab/modules/api_scilab/api_scilab.vcproj
scilab/modules/api_scilab/includes/api_boolean.h
scilab/modules/api_scilab/includes/api_boolean_sparse.h
scilab/modules/api_scilab/includes/api_common.h
scilab/modules/api_scilab/includes/api_double.h
scilab/modules/api_scilab/includes/api_int.h
scilab/modules/api_scilab/includes/api_list.h
scilab/modules/api_scilab/includes/api_pointer.h
scilab/modules/api_scilab/includes/api_poly.h
scilab/modules/api_scilab/includes/api_sparse.h
scilab/modules/api_scilab/includes/api_string.h
scilab/modules/api_scilab/src/cpp/api_boolean.cpp [moved from scilab/modules/api_scilab/src/c/api_boolean.c with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp [moved from scilab/modules/api_scilab/src/c/api_boolean_sparse.c with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_common.cpp [moved from scilab/modules/api_scilab/src/c/api_common.c with 97% similarity]
scilab/modules/api_scilab/src/cpp/api_double.cpp [moved from scilab/modules/api_scilab/src/c/api_double.c with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_int.cpp [moved from scilab/modules/api_scilab/src/c/api_int.c with 98% similarity]
scilab/modules/api_scilab/src/cpp/api_internal_boolean.h [moved from scilab/modules/api_scilab/src/c/api_internal_boolean.h with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_internal_boolean_sparse.h [moved from scilab/modules/api_scilab/src/c/api_internal_boolean_sparse.h with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_internal_common.h [moved from scilab/modules/api_scilab/src/c/api_internal_common.h with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_internal_double.h [moved from scilab/modules/api_scilab/src/c/api_internal_double.h with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_internal_int.h [moved from scilab/modules/api_scilab/src/c/api_internal_int.h with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_internal_pointer.h [moved from scilab/modules/api_scilab/src/c/api_internal_pointer.h with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_internal_poly.h [moved from scilab/modules/api_scilab/src/c/api_internal_poly.h with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_internal_sparse.h [moved from scilab/modules/api_scilab/src/c/api_internal_sparse.h with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_internal_string.h [moved from scilab/modules/api_scilab/src/c/api_internal_string.h with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_list.cpp [moved from scilab/modules/api_scilab/src/c/api_list.c with 99% similarity]
scilab/modules/api_scilab/src/cpp/api_pointer.cpp [moved from scilab/modules/api_scilab/src/c/api_pointer.c with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_poly.cpp [moved from scilab/modules/api_scilab/src/c/api_poly.c with 99% similarity]
scilab/modules/api_scilab/src/cpp/api_sparse.cpp [moved from scilab/modules/api_scilab/src/c/api_sparse.c with 100% similarity]
scilab/modules/api_scilab/src/cpp/api_string.cpp [moved from scilab/modules/api_scilab/src/c/api_string.c with 99% similarity]
scilab/modules/arnoldi/Makefile.am
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.vcproj
scilab/modules/arnoldi/includes/gw_arnoldi.h
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/includes/gw_boolean.h
scilab/modules/boolean/src/c/boolean.vcproj
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/includes/gw_cacsd0.h
scilab/modules/cacsd/includes/gw_cacsd1.h
scilab/modules/cacsd/includes/gw_cacsd2.h
scilab/modules/cacsd/includes/gw_cacsd3.h
scilab/modules/cacsd/includes/gw_slicot.h
scilab/modules/cacsd/src/c/cacsd.vcproj
scilab/modules/call_scilab/includes/CallScilab.h
scilab/modules/call_scilab/includes/gw_call_scilab.h
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/includes/gw_completion.h
scilab/modules/completion/src/c/completion.vcproj
scilab/modules/completion/src/nocompletion/nocompletion.vcproj
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/core/includes/gw_core.h
scilab/modules/core/includes/gw_user.h
scilab/modules/core/includes/gw_user2.h
scilab/modules/core/includes/stack-c.h
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/includes/gw_data_structures1.h
scilab/modules/data_structures/includes/gw_data_structures2.h
scilab/modules/data_structures/src/c/data_structures.vcproj
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/includes/gw_differential_equations1.h
scilab/modules/differential_equations/includes/gw_differential_equations2.h
scilab/modules/differential_equations/includes/gw_differential_equations3.h
scilab/modules/differential_equations/includes/gw_differential_equations4.h
scilab/modules/differential_equations/includes/gw_differential_equations6.h
scilab/modules/differential_equations/src/c/differential_equations.vcproj
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/includes/gw_dynamic_link.h
scilab/modules/dynamic_link/src/c/dynamic_link.vcproj
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/sci_triu.c
scilab/modules/fftw/fftw.vcproj
scilab/modules/fftw/includes/gw_fftw.h
scilab/modules/fftw/src/nofftw/nofftw.vcproj
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/functions/includes/gw_functions.h
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.vcproj
scilab/modules/graphic_export/includes/gw_graphic_export.h
scilab/modules/graphic_export/src/nographic_export/nographic_export.vcproj
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcproj
scilab/modules/graphics/help/en_US/plot3d.xml
scilab/modules/graphics/help/images/plot3d_patch.png [new file with mode: 0644]
scilab/modules/graphics/includes/gw_graphics.h
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/includes/gw_gui.h
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/hdf5/includes/gw_hdf5.h
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/includes/gw_history_manager.h
scilab/modules/history_manager/src/c/history_manager.vcproj
scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.vcproj
scilab/modules/integer/src/c/integer.vcproj
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/includes/gw_interpolation.h
scilab/modules/interpolation/src/c/interpolation.vcproj
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/includes/gw_io.h
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/includes/gw_jvm.h
scilab/modules/jvm/libjvm.vcproj
scilab/modules/jvm/src/c/JVM.h
scilab/modules/linear_algebra/includes/gw_linear_algebra.h
scilab/modules/linear_algebra/includes/gw_linear_algebra2.h
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/includes/charEncoding.h
scilab/modules/localization/includes/gw_localization.h
scilab/modules/localization/includes/localization.h
scilab/modules/localization/src/localization.vcproj
scilab/modules/matio/matio.vcproj
scilab/modules/metanet/Makefile.am
scilab/modules/metanet/Makefile.in
scilab/modules/metanet/includes/gw_metanet.h
scilab/modules/metanet/src/c/metanet.vcproj
scilab/modules/metanet/src/c/nometanet/nometanet.vcproj
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/includes/gw_optim.h
scilab/modules/optimization/src/c/optimization.vcproj
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/includes/Scierror.h
scilab/modules/output_stream/includes/gw_output_stream.h
scilab/modules/output_stream/includes/sciprint.h
scilab/modules/output_stream/src/c/output_stream.vcproj
scilab/modules/polynomials/src/c/polynomials.vcproj
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/pvm/includes/gw_pvm.h
scilab/modules/pvm/pvm.vcproj
scilab/modules/pvm/src/nopvm/nopvm.vcproj
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/includes/gw_randlib.h
scilab/modules/randlib/src/c/randlib.vcproj
scilab/modules/randlib/src/norandlib/norandlib.vcproj
scilab/modules/renderer/renderer.vcproj
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/includes/gw_scicos.h
scilab/modules/scicos/src/c/noscicos/noscicos.vcproj
scilab/modules/scicos/src/c/scicos.vcproj
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/shell/includes/gw_shell.h
scilab/modules/shell/src/c/shell.vcproj
scilab/modules/signal_processing/src/c/signal_processing.vcproj
scilab/modules/sound/Makefile.am
scilab/modules/sound/Makefile.in
scilab/modules/sound/includes/gw_sound.h
scilab/modules/sound/sound.vcproj
scilab/modules/sound/src/nosound/nosound.vcproj
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/includes/gw_sparse.h
scilab/modules/sparse/src/c/sparse.vcproj
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/includes/gw_special_functions1.h
scilab/modules/special_functions/includes/gw_special_functions2.h
scilab/modules/special_functions/src/c/special_functions.vcproj
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/includes/gw_spreadsheet.h
scilab/modules/spreadsheet/spreadsheet.vcproj
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcproj
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/includes/gw_statistics.h
scilab/modules/statistics/src/c/statistics.vcproj
scilab/modules/string/includes/gw_string.h
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/includes/gw_symbolic.h
scilab/modules/symbolic/src/c/symbolic.vcproj
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/includes/gw_tclsci.h
scilab/modules/tclsci/src/notclsci/notclsci.vcproj
scilab/modules/tclsci/tclsci.vcproj
scilab/modules/time/includes/gw_time.h
scilab/modules/time/includes/realtime.h
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/umfpack/includes/gw_umfpack.h
scilab/modules/umfpack/src/c/umfpack.vcproj
scilab/modules/umfpack/src/noumfpack/noumfpack.vcproj
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/includes/gw_windows_tools.h
scilab/modules/windows_tools/src/c/windows_tools.vcproj
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.vcproj

index ec56a6f..109ebf8 100644 (file)
@@ -4,16 +4,18 @@
 ##########
 
 ### SOURCES ###
-API_SCILAB_C_SOURCES = src/c/api_boolean.c \
-src/c/api_boolean_sparse.c \
-src/c/api_common.c \
-src/c/api_double.c \
-src/c/api_int.c \
-src/c/api_list.c \
-src/c/api_poly.c \
-src/c/api_sparse.c \
-src/c/api_string.c \
-src/c/api_pointer.c
+
+
+API_SCILAB_CPP_SOURCES = src/cpp/api_boolean.cpp \
+src/cpp/api_boolean_sparse.cpp \
+src/cpp/api_common.cpp \
+src/cpp/api_double.cpp \
+src/cpp/api_int.cpp \
+src/cpp/api_list.cpp \
+src/cpp/api_poly.cpp \
+src/cpp/api_sparse.cpp \
+src/cpp/api_string.cpp \
+src/cpp/api_pointer.cpp
 
 
 libsciapi_scilab_la_CFLAGS=-I$(srcdir)/includes/ \
@@ -26,16 +28,26 @@ libsciapi_scilab_la_CFLAGS=-I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/string/includes \
 -I$(top_srcdir)/modules/operations/includes
 
+libsciapi_scilab_la_CPPFLAGS=-I$(srcdir)/includes/ \
+-I$(srcdir)/src/cpp/ \
+-I$(top_srcdir)/modules/core/includes \
+-I$(top_srcdir)/modules/call_scilab/includes \
+-I$(top_srcdir)/libs/MALLOC/includes/ \
+-I$(top_srcdir)/modules/localization/includes \
+-I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/operations/includes \
+-I$(top_srcdir)/modules/string/includes
+
 
 pkglib_LTLIBRARIES = libsciapi_scilab.la
 
 libsciapi_scilab_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 
-libsciapi_scilab_la_SOURCES = $(API_SCILAB_C_SOURCES) $(GATEWAY_C_SOURCES)
+libsciapi_scilab_la_SOURCES = $(API_SCILAB_C_SOURCES) $(API_SCILAB_CPP_SOURCES) $(GATEWAY_C_SOURCES)
 
 # For the code check (splint)
 CHECK_SRC= $(libsciapi_scilab_la_SOURCES)
-INCLUDE_FLAGS = $(libsciapi_scilab_la_CFLAGS)
+INCLUDE_FLAGS = $(libsciapi_scilab_la_CFLAGS) 
 
 libsciapi_scilab_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la
 
index 5497d45..bb9bb49 100644 (file)
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File
-                               RelativePath=".\src\c\api_boolean.c"
+                               RelativePath=".\src\cpp\api_boolean.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_boolean_sparse.c"
+                               RelativePath=".\src\cpp\api_boolean_sparse.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_common.c"
+                               RelativePath=".\src\cpp\api_common.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_double.c"
+                               RelativePath=".\src\cpp\api_double.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_int.c"
+                               RelativePath=".\src\cpp\api_int.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_list.c"
+                               RelativePath=".\src\cpp\api_list.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_pointer.c"
+                               RelativePath=".\src\cpp\api_pointer.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_poly.c"
+                               RelativePath=".\src\cpp\api_poly.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_sparse.c"
+                               RelativePath=".\src\cpp\api_sparse.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_string.c"
+                               RelativePath=".\src\cpp\api_string.cpp"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_internal_boolean.h"
+                               RelativePath=".\src\cpp\api_internal_boolean.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_internal_boolean_sparse.h"
+                               RelativePath=".\src\cpp\api_internal_boolean_sparse.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_internal_common.h"
+                               RelativePath=".\src\cpp\api_internal_common.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_internal_double.h"
+                               RelativePath=".\src\cpp\api_internal_double.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_internal_int.h"
+                               RelativePath=".\src\cpp\api_internal_int.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_internal_pointer.h"
+                               RelativePath=".\src\cpp\api_internal_pointer.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_internal_poly.h"
+                               RelativePath=".\src\cpp\api_internal_poly.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_internal_sparse.h"
+                               RelativePath=".\src\cpp\api_internal_sparse.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\api_internal_string.h"
+                               RelativePath=".\src\cpp\api_internal_string.h"
                                >
                        </File>
                        <File
index 60cc9db..1764f12 100644 (file)
 #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__ */
index bf8df95..3a16e9c 100644 (file)
 #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__ */
index d7f82a4..19d1df6 100644 (file)
 #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__ */
index f70c3cf..8edeba3 100644 (file)
 #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__ */
index 5d6d6c0..311cea8 100644 (file)
 #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__ */
index d3c1142..f769adb 100644 (file)
 #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__ */
 
index 6900229..ad37689 100644 (file)
 #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__ */
index fc3346b..de12511 100644 (file)
 #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__ */
index 3a88cb4..49aa160 100644 (file)
 #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__ */
index ada358a..8484104 100644 (file)
 #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__ */
 #include "Scierror.h"
 /*--------------------------------------------------------------------------*/
 /* Defined in SCI/modules/core/src/fortran/cvname.f */
+extern "C" {
 extern int C2F(cvnamel)(int *id,char *str,int *jobptr,int *str_len); 
 /* *jobptr==0: Get Scilab codes from C-string */
 /* *jobptr==1: Get C-string from Scilab codes */
 
 extern int C2F(stackp)(int *,int *);
+};
 /*--------------------------------------------------------------------------*/
 #define idstk(x,y) (C2F(vstk).idstk+(x-1)+(y-1)*nsiz)
 #define CvNameL(id,str,jobptr,str_len) C2F(cvnamel)(id,str,jobptr,str_len);
@@ -413,7 +415,7 @@ int getDimFromVar(int* _piAddress, int* _piVal)
                case SCI_UINT8 :
                        {
                                unsigned char* pucData          = NULL;
-                               iRet = getMatrixOfInteger8(_piAddress, &iRows, &iCols, &pucData);
+                               iRet = getMatrixOfUnsignedInteger8(_piAddress, &iRows, &iCols, &pucData);
                                if(iRet)
                                {
                                        return 1;
@@ -435,7 +437,7 @@ int getDimFromVar(int* _piAddress, int* _piVal)
                case SCI_UINT16 :
                        {
                                unsigned short* pusData         = NULL;
-                               iRet = getMatrixOfInteger16(_piAddress, &iRows, &iCols, &pusData);
+                               iRet = getMatrixOfUnsignedInteger16(_piAddress, &iRows, &iCols, &pusData);
                                if(iRet)
                                {
                                        return 1;
@@ -457,7 +459,7 @@ int getDimFromVar(int* _piAddress, int* _piVal)
                case SCI_UINT32 :
                        {
                                unsigned int* puiData           = NULL;
-                               iRet = getMatrixOfInteger32(_piAddress, &iRows, &iCols, &puiData);
+                               iRet = getMatrixOfUnsignedInteger32(_piAddress, &iRows, &iCols, &puiData);
                                if(iRet)
                                {
                                        return 1;
similarity index 98%
rename from scilab/modules/api_scilab/src/c/api_int.c
rename to scilab/modules/api_scilab/src/cpp/api_int.cpp
index 5269c41..52ab730 100644 (file)
@@ -209,7 +209,7 @@ int allocMatrixOfInteger8(int _iVar, int _iRows, int _iCols, char** _pcData8)
                return 1;
        }
 
-       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_INT8, _iRows, _iCols, (void*)&pcData8);
+       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_INT8, _iRows, _iCols, (void**)&pcData8);
        if(iRet)
        {
                return 1;
@@ -231,7 +231,7 @@ int allocMatrixOfInteger16(int _iVar, int _iRows, int _iCols, short** _psData16)
                return 1;
        }
 
-       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_INT16, _iRows, _iCols, (void*)&psData16);
+       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_INT16, _iRows, _iCols, (void**)&psData16);
        if(iRet)
        {
                return 1;
@@ -253,7 +253,7 @@ int allocMatrixOfInteger32(int _iVar, int _iRows, int _iCols, int** _piData32)
                return 1;
        }
 
-       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_INT32, _iRows, _iCols, (void*)&piData32);
+       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_INT32, _iRows, _iCols, (void**)&piData32);
        if(iRet)
        {
                return 1;
@@ -282,7 +282,7 @@ int allocMatrixOfUnsignedInteger8(int _iVar, int _iRows, int _iCols, unsigned ch
                return 1;
        }
 
-       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_UINT8, _iRows, _iCols, (void*)&pucData8);
+       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_UINT8, _iRows, _iCols, (void**)&pucData8);
        if(iRet)
        {
                return 1;
@@ -304,7 +304,7 @@ int allocMatrixOfUnsignedInteger16(int _iVar, int _iRows, int _iCols, unsigned s
                return 1;
        }
 
-       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_UINT16, _iRows, _iCols, (void*)&pusData16);
+       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_UINT16, _iRows, _iCols, (void**)&pusData16);
        if(iRet)
        {
                return 1;
@@ -326,7 +326,7 @@ int allocMatrixOfUnsignedInteger32(int _iVar, int _iRows, int _iCols, unsigned i
                return 1;
        }
 
-       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_INT32, _iRows, _iCols, (void*)&puiData32);
+       iRet = allocCommonMatrixOfInteger(_iVar, piAddr, SCI_INT32, _iRows, _iCols, (void**)&puiData32);
        if(iRet)
        {
                return 1;
similarity index 99%
rename from scilab/modules/api_scilab/src/c/api_list.c
rename to scilab/modules/api_scilab/src/cpp/api_list.cpp
index 62a2a02..81ae85d 100644 (file)
@@ -1415,32 +1415,32 @@ static int allocCommonMatrixOfIntegerInList(int _iVar, int* _piParent, int _iIte
 
 int allocMatrixOfUnsignedInteger8InList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, unsigned char** _pucData)
 {
-       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT8, _iRows, _iCols, _pucData);
+       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT8, _iRows, _iCols, (void **)_pucData);
 }
 
 int allocMatrixOfUnsignedInteger16InList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, unsigned short** _pusData)
 {
-       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT16, _iRows, _iCols, _pusData);
+       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT16, _iRows, _iCols, (void**)_pusData);
 }
 
 int allocMatrixOfUnsignedInteger32InList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, unsigned int** _puiData)
 {
-       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT32, _iRows, _iCols, _puiData);
+       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT32, _iRows, _iCols, (void**)_puiData);
 }
 
 int allocMatrixOfInteger8InList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, char** _pcData)
 {
-       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT8, _iRows, _iCols, _pcData);
+       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT8, _iRows, _iCols, (void**)_pcData);
 }
 
 int allocMatrixOfInteger16InList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, short** _psData)
 {
-       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT16, _iRows, _iCols, _psData);
+       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT16, _iRows, _iCols, (void**)_psData);
 }
 
 int allocMatrixOfInteger32InList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, int** _piData)
 {
-       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT32, _iRows, _iCols, _piData);
+       return allocCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT32, _iRows, _iCols, (void**)_piData);
 }
 
 static int createCommomMatrixOfIntegerInList(int _iVar, int* _piParent, int _iItemPos, int _iPrecision, int _iRows, int _iCols, void* _pvData)
@@ -1513,32 +1513,32 @@ static int getCommonMatrixOfIntegerInList(int _iVar, int* _piParent, int _iItemP
 
 int getMatrixOfUnsignedInteger8InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned char** _pucData)
 {
-       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT8, _piRows, _piCols, _pucData);
+       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT8, _piRows, _piCols, (void**)_pucData);
 }
 
 int getMatrixOfUnsignedInteger16InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned short** _pusData)
 {
-       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT16, _piRows, _piCols, _pusData);
+       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT16, _piRows, _piCols, (void**)_pusData);
 }
 
 int getMatrixOfUnsignedInteger32InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned int** _puiData)
 {
-       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT32, _piRows, _piCols, _puiData);
+       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT32, _piRows, _piCols, (void**)_puiData);
 }
 
 int getMatrixOfInteger8InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char** _pcData)
 {
-       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT8, _piRows, _piCols, _pcData);
+       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT8, _piRows, _piCols, (void**)_pcData);
 }
 
 int getMatrixOfInteger16InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, short** _psData)
 {
-       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT16, _piRows, _piCols, _psData);
+       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT16, _piRows, _piCols, (void**)_psData);
 }
 
 int getMatrixOfInteger32InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piData)
 {
-       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT32, _piRows, _piCols, _piData);
+       return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT32, _piRows, _piCols, (void**)_piData);
 }
 
 static int createCommonMatrixOfIntegerInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iPrecision, int _iRows, int _iCols, void* _pvData)
similarity index 99%
rename from scilab/modules/api_scilab/src/c/api_poly.c
rename to scilab/modules/api_scilab/src/cpp/api_poly.cpp
index 92f1d6d..0e388c9 100644 (file)
@@ -21,8 +21,9 @@
 #include "MALLOC.h"
 #include "CallScilab.h"
 #include "stack-c.h"
+extern "C" {
 #include "code2str.h"
-
+};
 
 int getPolyVariableName(int* _piAddress, char* _pstVarName, int* _piVarNameLen)
 {
 #include "api_common.h"
 #include "api_internal_common.h"
 #include "api_string.h"
-
+#include "api_internal_string.h"
 #include "CallScilab.h"
 #include "stack-c.h"
+extern "C"
+{
 #include "code2str.h"
-#include "api_internal_string.h"
 #include "freeArrayOfString.h"
+};
 /*--------------------------------------------------------------------------*/
 
 /*******************************/
index 2b8c4d0..d8d7241 100644 (file)
@@ -67,6 +67,7 @@ sci_gateway/c/sci_znaupd.c
 libsciarnoldi_la_CFLAGS=       -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes/
 
 libsciarnoldi_la_FFLAGS= -I$(srcdir)/src/arpack/
index 24041ce..c38eeaa 100644 (file)
@@ -459,6 +459,7 @@ sci_gateway/c/sci_znaupd.c
 libsciarnoldi_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes/
 
 libsciarnoldi_la_FFLAGS = -I$(srcdir)/src/arpack/
index ddc192a..4c81bcc 100644 (file)
@@ -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"
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 3ed8195..42b0e8a 100644 (file)
@@ -15,6 +15,7 @@
 #define __GW_ARNOLDI_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_arnoldi(void);
 /*--------------------------------------------------------------------------*/
index 2f329c0..77d873a 100644 (file)
@@ -22,6 +22,7 @@ sci_gateway/fortran/sci_find.f
 libsciboolean_la_CFLAGS=       -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes
 
 pkglib_LTLIBRARIES = libsciboolean.la
index 68b9d4d..12c1228 100644 (file)
@@ -394,6 +394,7 @@ sci_gateway/fortran/sci_find.f
 libsciboolean_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes
 
 pkglib_LTLIBRARIES = libsciboolean.la
index a55999e..b979466 100644 (file)
@@ -14,6 +14,7 @@
 #define __GW_BOOLEAN__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_boolean(void);
 /*--------------------------------------------------------------------------*/
index 294f325..9fb381c 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 28affe3..b7ce68e 100644 (file)
@@ -212,6 +212,7 @@ sci_gateway/fortran/sci_f_rankqr.f
 libscicacsd_la_FFLAGS= -I$(srcdir)/includes/
 libscicacsd_la_CFLAGS=         -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/operations/includes/
 
 pkglib_LTLIBRARIES = libscicacsd.la
index 6617ddd..1981be3 100644 (file)
@@ -680,6 +680,7 @@ sci_gateway/fortran/sci_f_rankqr.f
 libscicacsd_la_FFLAGS = -I$(srcdir)/includes/
 libscicacsd_la_CFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/operations/includes/
 
 pkglib_LTLIBRARIES = libscicacsd.la
index 9d2af25..64ea5c7 100644 (file)
@@ -16,6 +16,7 @@
 #define __GW_CACSD0__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_cacsd0(void);
 /*--------------------------------------------------------------------------*/
index 736680c..91d0a1f 100644 (file)
@@ -16,6 +16,7 @@
 #define __GW_CACSD1__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_cacsd1(void);
 /*--------------------------------------------------------------------------*/
index e3afa08..29bb2d1 100644 (file)
@@ -16,6 +16,7 @@
 #define __GW_CACSD2__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_cacsd2(void);
 /*--------------------------------------------------------------------------*/ 
index e776400..00b7d53 100644 (file)
@@ -16,6 +16,7 @@
 #define __GW_CACSD3__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_cacsd3(void);
 /*--------------------------------------------------------------------------*/
index 1e9f940..804b892 100644 (file)
@@ -16,6 +16,7 @@
 #define __GW_SLICOT_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 #ifndef __DEF_MXARRAY__
 #define __DEF_MXARRAY__
index 1bef4cd..3272b83 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 183221e..f67e2d6 100644 (file)
 #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__ */
 /*--------------------------------------------------------------------------*/
index d0e7532..2744d3a 100644 (file)
@@ -13,6 +13,7 @@
 #define __GW_CALL_SCILAB__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_call_scilab(void);
 /*--------------------------------------------------------------------------*/ 
index 62cfd25..98748df 100644 (file)
@@ -39,6 +39,7 @@ libscicompletion_la_CFLAGS=   $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/graphics/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes
 
 
index e8286bd..4681110 100644 (file)
@@ -426,6 +426,7 @@ libscicompletion_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/graphics/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes
 
 
index 3e63993..3534cdd 100644 (file)
@@ -13,6 +13,7 @@
 #define __GW_COMPLETION_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_completion(void);
 /*--------------------------------------------------------------------------*/
index fda89dc..c22bf01 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 8841d5c..9dfc33f 100644 (file)
@@ -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"
                        <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"
                                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"
                                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"
index 74bd541..95876e5 100644 (file)
@@ -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) \
index 5f88005..8ca6015 100644 (file)
@@ -451,7 +451,7 @@ libsciconsole_disable_la_SOURCES = src/noconsole/noconsole.c
 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) \
index 5200bb3..d183480 100644 (file)
@@ -13,6 +13,7 @@
 #define __GW_CORE__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_core(void);
 /*--------------------------------------------------------------------------*/ 
index d313245..afee987 100644 (file)
@@ -13,6 +13,7 @@
 #define __GW_USER_H__
 
 #include "machine.h"
+#include "api_common.h"
 
 int gw_user(void);
 
index 363b8dd..2eb72a1 100644 (file)
@@ -13,6 +13,7 @@
 #define __GW_USER2_H__
 
 #include "machine.h"
+#include "api_common.h"
 
 int gw_user2(void);
 
index 5af200c..7d1f541 100644 (file)
 
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if  ( !(defined __MATH__)  || (defined __APPLE__) || (defined aix) )
 #include "core_math.h"
 #else
@@ -31,7 +35,6 @@
 #include "stack2.h"
 #include "stack3.h"
 
-
 /*-------------------------------------------------
  * types
  * -------------------------------------------------*/
@@ -383,6 +386,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  */
 
 
index f5f0725..8e45f69 100644 (file)
@@ -44,6 +44,7 @@ libscidata_structures_la_CFLAGS=      -I$(srcdir)/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/string/includes \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/operations/includes
 
 # Disable optimisation of the file intl_e.f
index 708159f..baabbed 100644 (file)
@@ -446,6 +446,7 @@ libscidata_structures_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/string/includes \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/operations/includes
 
 
index 40a1501..fc9056a 100644 (file)
@@ -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); 
index 5501efb..ec3cfd0 100644 (file)
@@ -20,6 +20,7 @@
 #endif
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_data_structures2(void);
 /*--------------------------------------------------------------------------*/
index 299bfc5..cc44b16 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 162d010..0087afc 100644 (file)
@@ -130,6 +130,7 @@ sci_gateway/fortran/bbvode.f
 libscidifferential_equations_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/operations/includes
 
 pkglib_LTLIBRARIES = libscidifferential_equations.la
index 5901481..333f67e 100644 (file)
@@ -543,6 +543,7 @@ sci_gateway/fortran/bbvode.f
 libscidifferential_equations_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/operations/includes
 
 pkglib_LTLIBRARIES = libscidifferential_equations.la
index d95bcb7..c750463 100644 (file)
@@ -15,6 +15,7 @@
 #define __GW_DIFFERENTIAL_EQUATIONS1__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_differential_equations1(void);
 /*--------------------------------------------------------------------------*/
index 18b24cc..4a3a9a5 100644 (file)
@@ -15,6 +15,7 @@
 #define __GW_DIFFERENTIAL_EQUATIONS2__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_differential_equations2(void);
 /*--------------------------------------------------------------------------*/ 
index 365f719..05eba07 100644 (file)
@@ -15,6 +15,7 @@
 #define __GW_DIFFERENTIAL_EQUATIONS3__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_differential_equations3(void);
 /*--------------------------------------------------------------------------*/
index 5446a27..ca70cb4 100644 (file)
@@ -15,6 +15,7 @@
 #define __GW_DIFFERENTIAL_EQUATIONS4__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_differential_equations4(void);
 /*--------------------------------------------------------------------------*/
index 9b36a5b..f6f7fab 100644 (file)
@@ -15,6 +15,7 @@
 #define __GW_DIFFERENTIAL_EQUATIONS6__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_differential_equations6(void);
 /*--------------------------------------------------------------------------*/ 
index 434cbef..3e84049 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 5bddb97..39bc6ee 100644 (file)
@@ -27,6 +27,7 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/modules/operations/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
index b6ef08e..fefbfd4 100644 (file)
@@ -417,6 +417,7 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/modules/operations/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
index 12cc7a9..84587f3 100644 (file)
@@ -14,6 +14,8 @@
 /*--------------------------------------------------------------------------*/ 
 #ifndef __GW_DYNAMIC_LINK__
 #define __GW_DYNAMIC_LINK__
+
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_dynamic_link(void);
 /*--------------------------------------------------------------------------*/
index ee78422..64e0971 100644 (file)
@@ -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"
@@ -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"
                        <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"
                                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"
                                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"
index 7052728..9e796e3 100644 (file)
@@ -14,6 +14,7 @@
 #define __GW_ELEMENTARIES_FUNCTIONS__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_elementary_functions(void);
 /*--------------------------------------------------------------------------*/
index 7935241..9d6f0b0 100644 (file)
@@ -12,6 +12,7 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_elementary_functions.h"
 #include "stack-c.h"
+#include "Scierror.h"
 #include "basic_functions.h"
 
 #define _NEW_TONIO_
index cf4b41e..5f4cbe3 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 76f1913..2d56b39 100644 (file)
@@ -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"
index 5a70fc6..03e28e6 100644 (file)
@@ -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"
                        <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"
                                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"
                                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"
index 9f7d5a2..1f23ad3 100644 (file)
@@ -12,6 +12,8 @@
 /*--------------------------------------------------------------------------*/ 
 #ifndef __GW_FILEIO_H__
 #define __GW_FILEIO_H__
+
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_fileio(void);
 /*--------------------------------------------------------------------------*/ 
index 9bd6826..de1103b 100644 (file)
@@ -16,6 +16,7 @@
 #define __GW_FUNCTIONS_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_functions(void);
 /*--------------------------------------------------------------------------*/
index f6c196c..3fd7e4e 100644 (file)
@@ -63,6 +63,7 @@ libscigraphic_export_la_CPPFLAGS =    $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
                                -I$(top_srcdir)/modules/operations/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/libs/doublylinkedlist/includes
 
 # All the sources needed by libscigraphic_export.la
index 18d151a..ae7f4d4 100644 (file)
@@ -464,6 +464,7 @@ libscigraphic_export_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
                                -I$(top_srcdir)/modules/operations/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/libs/doublylinkedlist/includes
 
 
index c21ecdf..56af13c 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index fa5067d..1b1a6df 100644 (file)
@@ -14,6 +14,7 @@
 #define __GW_GRAPHIC_EXPORT__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_graphic_export(void);
 /*--------------------------------------------------------------------------*/
index 1476d08..1dccb19 100644 (file)
@@ -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"
                        <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"
                                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"
                                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"
index 9dae9d2..33c7924 100644 (file)
@@ -26,11 +26,12 @@ libscigraphics_la_etc_DATA = etc/graphics.quit etc/graphics.start
 
 # the module Doublylinkedlist  is included here... of course, it is not
 # used in the mode without gui but It causes some silly problems with includes
-libscigraphics_la_CFLAGS = -I$(top_srcdir)/libs/doublylinkedlist/includes \
+libscigraphics_la_CFLAGS = -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
        -I$(srcdir)/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/ \
        -I$(top_srcdir)/modules/operations/includes/
@@ -417,15 +418,17 @@ libscigraphics_la_CFLAGS +=       $(JAVA_JNI_INCLUDE) \
                                $(TK_INC_PATH) \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/libs/hashtable/ \
-                               -I$(top_srcdir)/modules/jvm/includes \
+                               -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/renderer/includes/ \
-                               -I$(top_srcdir)/modules/action_binding/includes \
-                               -I$(top_srcdir)/modules/output_stream/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/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)
@@ -586,11 +589,15 @@ 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)
 
-libscigraphics_la_CFLAGS += -I$(top_srcdir)/modules/output_stream/includes
+libscigraphics_la_CFLAGS += -I$(top_srcdir)/modules/output_stream/includes/
 
 # endif
 
index 95b3f7c..0d3cc52 100644 (file)
@@ -761,22 +761,24 @@ libscigraphics_la_etc_DATA = etc/graphics.quit etc/graphics.start
 # the module Doublylinkedlist  is included here... of course, it is not
 # used in the mode without gui but It causes some silly problems with includes
 libscigraphics_la_CFLAGS =  \
-       -I$(top_srcdir)/libs/doublylinkedlist/includes \
+       -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
        -I$(srcdir)/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/ \
        -I$(top_srcdir)/modules/operations/includes/ \
        $(JAVA_JNI_INCLUDE) -Isrc/cpp $(TCL_INC_PATH) $(TK_INC_PATH) \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
        -I$(top_srcdir)/libs/hashtable/ \
-       -I$(top_srcdir)/modules/jvm/includes \
+       -I$(top_srcdir)/modules/jvm/includes/ \
        -I$(top_srcdir)/modules/renderer/includes/ \
-       -I$(top_srcdir)/modules/action_binding/includes \
-       -I$(top_srcdir)/modules/output_stream/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/ \
-       -I$(top_srcdir)/modules/output_stream/includes
+       -I$(top_srcdir)/modules/output_stream/includes/
 GRAPHICS_C_SOURCES = src/c/GetCommandArg.c \
 src/c/WindowList.c \
 src/c/getHandleProperty/get_figure_position_property.c \
@@ -1154,7 +1156,8 @@ sci_gateway/c/sci_Legend.c
 
 libscigraphics_la_CXXFLAGS = -Iincludes/ \
                                -Isrc/c/ $(JAVA_JNI_INCLUDE) \
-                               -I$(top_srcdir)/modules/jvm/includes \
+                               -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)
@@ -1312,7 +1315,12 @@ tcl/ged/images/segs.gif \
 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)
 
 # endif
index d0c3cab..3b8b2c8 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index bc52967..b35521b 100644 (file)
@@ -381,6 +381,128 @@ h.data = TL;
 h.color_flag=3; // interpolated shading mode
 
 ]]></programlisting>
+
+    <para>We can also use the plot3d function to plot a set of patches (triangular, quadrangular, etc). </para>
+
+    <programlisting role="example"><![CDATA[
+// The plot3d function to draw patches:
+// patch(x,y,[z])
+// patch(x,y,[list(z,c)])
+// The size of x : number of points in the patches x number of patches
+// y and z have the same sizes as x
+// c:
+// - a vector of size number of patches: the color of the patches
+// - a matrix of size number of points in the patches x number of 
+//   patches: the color of each points of each patches
+
+// Example 1: a set of triangular patches
+
+x = [0 0;
+     0 1;
+     1 1];
+
+y = [1 1;
+     2 2;
+     2 1];
+
+z = [1 1;
+     1 1;
+     1 1];
+
+tcolor = [2 3]';
+
+subplot(2,2,1);
+plot3d(x,y,list(z,tcolor));
+xtitle('A triangle set of patches');
+
+// Example 2: a mixture of triangular and quadrangular patches
+
+xquad = [5, 0;
+         10,0;
+         15,5;
+         10,5];
+         
+yquad = [15,0;
+         20,10;
+         15,15;
+         10,5];
+         
+zquad = ones(4,2);
+
+xtri = [ 0,10,10, 5, 0;
+        10,20,20, 5, 0;
+        20,20,15,10,10];
+        
+ytri = [ 0,10,20, 5,10;
+        10,20,20,15,20;
+         0, 0,15,10,20];
+         
+ztri = zeros(3,5);
+
+subplot(2,2,3);
+plot3d(xquad,yquad,zquad);
+plot3d(xtri,ytri,ztri);
+xtitle('Mixing triangle and quadrangle set of patches');
+
+// Example 3: some rabbits
+
+rabxtri = [ 5,  5, 2.5,  7.5, 10;
+            5, 15, 5,   10,   10;
+           15, 15, 5,   10,   15];
+           
+rabytri = [10, 10, 9.5,  2.5, 0;
+           20, 10, 12,   5,   5;
+           10   0   7    0    0];
+rabztri = [0,0,0,0,0;
+           0,0,0,0,0;
+           0,0,0,0,0];
+
+rabtricolor_byface = [2 2 2 2 2];
+
+rabtricolor = [2,2,2,2,2;
+               3,3,3,3,3;
+               4,4,4,4,4];
+               
+rabxquad = [0, 1;
+            0, 6;
+            5,11;
+            5, 6];
+            
+rabyquad = [18,23;
+            23,28;
+            23,28;
+            18,23];
+            
+rabzquad = [1,1;
+            1,1;
+            1,1;
+            1,1];
+
+rabquadcolor_byface = [2 2];
+
+rabquadcolor = [2,2;
+                3,3;
+                4,4;
+                5,5];
+
+subplot(2,2,2);
+plot3d(rabxtri, rabytri, list(rabztri,rabtricolor));
+plot3d(rabxquad,rabyquad,list(rabzquad,rabquadcolor));
+h = gcf();
+h.children(1).background = 1;
+xtitle('A psychedelic rabbit set of patches');
+
+subplot(2,2,4);
+plot3d(rabxtri, rabytri, list(rabztri,rabtricolor_byface));
+plot3d(rabxquad,rabyquad,list(rabzquad,rabquadcolor_byface));
+h = gcf();
+h.children(1).background = 1;
+xtitle('A standard rabbit set of patches');
+]]></programlisting>
+    <para> The result of the preceding example: </para>
+    <para> <imagedata fileref="../images/plot3d_patch.png" /> </para>
   </refsection>
   <refsection>
     <title>See Also</title>
diff --git a/scilab/modules/graphics/help/images/plot3d_patch.png b/scilab/modules/graphics/help/images/plot3d_patch.png
new file mode 100644 (file)
index 0000000..660b90a
Binary files /dev/null and b/scilab/modules/graphics/help/images/plot3d_patch.png differ
index a738030..e9623a0 100644 (file)
@@ -14,6 +14,9 @@
 /*--------------------------------------------------------------------------*/
 #ifndef __INTGRAPHICS__
 #define __INTGRAPHICS__
+
+#include "api_common.h"
+
 /*--------------------------------------------------------------------------*/ 
 int gw_graphics(void);
 /*--------------------------------------------------------------------------*/ 
index 7e55513..064e830 100644 (file)
@@ -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) \
@@ -240,6 +241,7 @@ libscigui_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/ \
                        -I$(top_srcdir)/modules/graphic_export/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/operations/includes/
 
 # Without the GUI module
index 40484c1..a74b4ed 100644 (file)
@@ -750,6 +750,7 @@ libscigui_la_CFLAGS = -I$(srcdir)/src/c/ -I$(srcdir)/src/c/xsci/ \
        -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/ \
        $(JAVA_JNI_INCLUDE) -I$(top_srcdir)/modules/jvm/includes/ \
        -I$(top_srcdir)/modules/renderer/includes/ \
@@ -773,6 +774,7 @@ libscigui_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/ \
                        -I$(top_srcdir)/modules/graphic_export/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/operations/includes/
 
 
index 81d7fd2..5e53870 100644 (file)
@@ -13,6 +13,8 @@
 
 #ifndef __GW_GUI__
 #define __GW_GUI__
+
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_gui(void);
 /*--------------------------------------------------------------------------*/
index 1bb6974..5d6a1bd 100644 (file)
@@ -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"
@@ -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;../../../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"
                        <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"
                                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"
                                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"
index 2e7021f..1d547ca 100644 (file)
@@ -14,6 +14,7 @@
 #define __GW_HDF5_H__
 /*--------------------------------------------------------------------------*/ 
 #include "dynlib_hdf5_scilab.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 HDF5_SCILAB_IMPEXP int gw_hdf5(void);
 /*--------------------------------------------------------------------------*/ 
index e2e8a95..4fef5b6 100644 (file)
@@ -52,6 +52,7 @@ libscihistory_manager_la_CFLAGS=      $(JAVA_JNI_INCLUDE) \
 -I$(top_srcdir)/modules/history_manager/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/fileio/includes/ \
+-I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/operations/includes/
 
 
index 5bbd7de..b57f8fd 100644 (file)
@@ -460,6 +460,7 @@ libscihistory_manager_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
 -I$(top_srcdir)/modules/history_manager/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
 -I$(top_srcdir)/modules/fileio/includes/ \
+-I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/operations/includes/
 
 
index 42f2c96..c4602b2 100644 (file)
@@ -15,6 +15,7 @@
 #define __GW_HISTORY_MANAGER_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_history_manager(void);
 /*--------------------------------------------------------------------------*/
index 38bb99d..a3f6125 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 111740d..d224c57 100644 (file)
@@ -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"
                        <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"
                                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"
                                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"
index 7028dbb..e39c8a2 100644 (file)
@@ -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"
@@ -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"
                        <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"
                                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"
                                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"
index 2576024..bb714df 100644 (file)
@@ -36,7 +36,8 @@ libsciinterpolation_la_CFLAGS=        -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/string/includes \
-                -I$(top_srcdir)/modules/operations/includes
+                               -I$(top_srcdir)/modules/api_scilab/includes \
+                               -I$(top_srcdir)/modules/operations/includes
 
 pkglib_LTLIBRARIES = libsciinterpolation.la
 
index c3b62e4..bfdcf07 100644 (file)
@@ -423,7 +423,8 @@ libsciinterpolation_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/string/includes \
-                -I$(top_srcdir)/modules/operations/includes
+                               -I$(top_srcdir)/modules/api_scilab/includes \
+                               -I$(top_srcdir)/modules/operations/includes
 
 pkglib_LTLIBRARIES = libsciinterpolation.la
 libsciinterpolation_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index d11d477..0f06f34 100644 (file)
@@ -16,6 +16,7 @@
 #define __GW_INTERPOLATION_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_interpolation(void);
 /*--------------------------------------------------------------------------*/
index 00c40f0..f5fd7b7 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index d7d205a..0e58242 100644 (file)
@@ -58,7 +58,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
index 26591a3..fa26edc 100644 (file)
@@ -451,7 +451,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
 libsciio_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index 597e54b..9df786f 100644 (file)
@@ -14,6 +14,7 @@
 #define __GW_IO_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_io(void);
 /*--------------------------------------------------------------------------*/
index 9626f2e..7fb6513 100644 (file)
@@ -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/ \
                        -I$(top_srcdir)/modules/operations/includes/
@@ -103,6 +104,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)
index 48b60e2..38360ba 100644 (file)
@@ -418,6 +418,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/ \
                        -I$(top_srcdir)/modules/operations/includes/
@@ -476,6 +477,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)
index 595f742..f95dda3 100644 (file)
@@ -16,6 +16,7 @@
 #define __GW_JVM_H__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_jvm(void);
 /*--------------------------------------------------------------------------*/
index b3d037d..f27a97e 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 21a16a5..93d1001 100644 (file)
 #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__ */
 /*--------------------------------------------------------------------------*/ 
index c4ef1fa..a40a642 100644 (file)
@@ -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
index ebbfb6d..c2e7180 100644 (file)
@@ -15,6 +15,7 @@
 #define __GW_LINEAR_ALGEBRA2__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_linear_algebra2(void);
 /*--------------------------------------------------------------------------*/
index aae864a..17984a0 100644 (file)
@@ -33,6 +33,7 @@ libscilocalization_la_CFLAGS=         $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes
 
 pkglib_LTLIBRARIES = libscilocalization.la
index 7624394..cfd4f15 100644 (file)
@@ -407,6 +407,7 @@ libscilocalization_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes
 
 pkglib_LTLIBRARIES = libscilocalization.la
index faab1e7..b4d0fc7 100644 (file)
@@ -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__ */
 
index b8322f1..588c12f 100644 (file)
@@ -14,6 +14,7 @@
 #ifndef __GW_LOCALIZATION__
 #define __GW_LOCALIZATION__
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_localization(void);
 /*--------------------------------------------------------------------------*/ 
index 1755e4e..ce8296d 100644 (file)
 #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__ */
 /*--------------------------------------------------------------------------*/ 
index c2df8cf..ac15123 100644 (file)
@@ -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"
@@ -46,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"
                        <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"
                                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"
                                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"
index 175e684..09e002a 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index cffc73d..aad133f 100644 (file)
@@ -120,6 +120,7 @@ libscimetanet_la_CFLAGS=    -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/operations/includes/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/libs/hashtable/
 
 pkglib_LTLIBRARIES = libscimetanet.la
index 2217e5e..c1699d8 100644 (file)
@@ -518,6 +518,7 @@ libscimetanet_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/operations/includes/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/libs/hashtable/
 
 pkglib_LTLIBRARIES = libscimetanet.la
index 97313bd..2fcb2d2 100644 (file)
@@ -19,6 +19,7 @@
 #define __GW_METANET__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_metanet(void);
 /*--------------------------------------------------------------------------*/
index d0e7e32..9cd9a12 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 47bfd00..9b12dc2 100644 (file)
@@ -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"
                        <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"
                                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"
                                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"
index 45385ae..c0a1c7e 100644 (file)
@@ -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 \
 -I$(top_srcdir)/modules/operations/includes
index 2d545de..e9fab4e 100644 (file)
@@ -517,6 +517,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 \
 -I$(top_srcdir)/modules/operations/includes
index ba97d4e..b25be0e 100644 (file)
@@ -14,6 +14,7 @@
 #define __GW_OPTIM__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_optimization(void);
 /*--------------------------------------------------------------------------*/
index 1d4c219..cb695f5 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index ad43512..3752aeb 100644 (file)
@@ -60,6 +60,7 @@ libscioutput_stream_la_CFLAGS=  -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/core/includes \
 -I$(srcdir)/src/c/ \
 -I$(top_srcdir)/modules/string/includes \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/operations/includes
 
 pkglib_LTLIBRARIES = libscioutput_stream.la
index dc3d913..8550588 100644 (file)
@@ -435,6 +435,7 @@ libscioutput_stream_la_CFLAGS = -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/core/includes \
 -I$(srcdir)/src/c/ \
 -I$(top_srcdir)/modules/string/includes \
+-I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/operations/includes
 
 pkglib_LTLIBRARIES = libscioutput_stream.la
index b7913cb..28124b1 100644 (file)
 #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__ */
 /*--------------------------------------------------------------------------*/ 
index f47facd..2ced95f 100644 (file)
@@ -12,6 +12,9 @@
 
 #ifndef __GW_OUTPUT_STREAM_H__
 #define __GW_OUTPUT_STREAM_H__
+
+#include "api_common.h"
+
 /*--------------------------------------------------------------------------*/
 int gw_output_stream(void);
 /*--------------------------------------------------------------------------*/
index 3c41f94..7e40c47 100644 (file)
 #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__ */
 /*--------------------------------------------------------------------------*/ 
index a94781b..bf76e86 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 31388f4..32f0301 100644 (file)
@@ -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"
@@ -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;POLYNOMIALS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <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"
                                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"
                                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"
index 279fbaa..fd2608d 100644 (file)
@@ -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 \
        -I$(top_srcdir)/modules/operations/includes/
        $(PVM_INCLUDE)
 
@@ -105,7 +106,10 @@ 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
 
index d4378f5..521ecc8 100644 (file)
@@ -495,12 +495,16 @@ yacc_present = @yacc_present@
 @PVM_TRUE@sci_gateway/c/sci_pvm_recv_var.c \
 @PVM_TRUE@sci_gateway/c/sci_pvm_exit.c
 
-@PVM_FALSE@libscipvm_la_CFLAGS = -I$(top_srcdir)/modules/output_stream/includes/
+@PVM_FALSE@libscipvm_la_CFLAGS = \
+@PVM_FALSE@                                            -I$(top_srcdir)/modules/api_scilab/includes \
+@PVM_FALSE@                                            -I$(top_srcdir)/modules/output_stream/includes/
+
 @PVM_TRUE@libscipvm_la_CFLAGS = -I$(srcdir)/includes/ \
 @PVM_TRUE@     -I$(top_srcdir)/libs/MALLOC/includes/ -I$(srcdir)/src/c/  \
 @PVM_TRUE@     -I$(top_srcdir)/modules/output_stream/includes/ \
 @PVM_TRUE@     -I$(top_srcdir)/modules/io/includes/ \
 @PVM_TRUE@     -I$(top_srcdir)/modules/fileio/includes/ \
+@PVM_TRUE@     -I$(top_srcdir)/modules/api_scilab/includes \
 @PVM_TRUE@     -I$(top_srcdir)/modules/operations/includes/
 
 @PVM_FALSE@pkglib_LTLIBRARIES = libscipvm.la
index 98e267a..3307b60 100644 (file)
@@ -14,6 +14,7 @@
 #define __INTMATPVM__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_pvm(void);
 /*--------------------------------------------------------------------------*/ 
index fb39e94..3a1fbf0 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index 999ec50..1239044 100644 (file)
@@ -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"
                        <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"
                                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"
                                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"
index 1488555..b9007ae 100644 (file)
@@ -46,6 +46,7 @@ sci_gateway/c/sci_grand.c
 
 libscirandlib_la_CFLAGS=       -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes
 
 pkglib_LTLIBRARIES = libscirandlib.la
index ad0f5cb..534d276 100644 (file)
@@ -424,6 +424,7 @@ sci_gateway/c/sci_grand.c
 
 libscirandlib_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes
 
 pkglib_LTLIBRARIES = libscirandlib.la
index cad49df..d331669 100644 (file)
@@ -15,6 +15,7 @@
 #define __GW_RANDLIB_H__
 /*--------------------------------------------------------------------------*/ 
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/ 
 int gw_randlib(void);
 /*--------------------------------------------------------------------------*/ 
index 4f7e63c..c32f839 100644 (file)
@@ -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"
@@ -44,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"
                        <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"
                                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"
                                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"
index abe3049..e8709c8 100644 (file)
@@ -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"
                        <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"
                                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"
                                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"
index 382a939..96ca111 100644 (file)
@@ -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"
                        <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"
                                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"
                                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"
index 533c85e..e40f029 100644 (file)
@@ -106,6 +106,7 @@ libsciscicos_la_CFLAGS= -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/scicos_blocks/includes \
                        -I$(top_srcdir)/modules/action_binding/includes \
                        -I$(top_srcdir)/modules/time/includes \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
                        -I$(top_srcdir)/modules/operations/includes
 
 libsciscicos_la_SOURCES = $(SCICOS_C_SOURCES) $(SCICOS_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
index 7deb80e..d2e9a31 100644 (file)
@@ -695,6 +695,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @SCICOS_TRUE@                  -I$(top_srcdir)/modules/scicos_blocks/includes \
 @SCICOS_TRUE@                  -I$(top_srcdir)/modules/action_binding/includes \
 @SCICOS_TRUE@                  -I$(top_srcdir)/modules/time/includes \
+@SCICOS_TRUE@                  -I$(top_srcdir)/modules/api_scilab/includes \
 @SCICOS_TRUE@                  -I$(top_srcdir)/modules/operations/includes
 
 @SCICOS_FALSE@libsciscicos_la_SOURCES = $(NO_SCICOS_C_SOURCES)
index d011d38..6a32608 100644 (file)
@@ -26,6 +26,7 @@
 #define __GW_SCICOS__
 /*--------------------------------------------------------------------------*/
 #include "machine.h"
+#include "api_common.h"
 /*--------------------------------------------------------------------------*/
 int gw_scicos(void);
 /*--------------------------------------------------------------------------*/
index 3b2c571..58da7fa 100644 (file)
@@ -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"
                        <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"
                                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"
                                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"
index 0854636..589d1ff 100644 (file)
@@ -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"
                        <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"
                                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"
                                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"