summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in17
-rw-r--r--scilab/modules/intersci/etc/intersci.quit16
-rw-r--r--scilab/modules/intersci/etc/intersci.start15
-rw-r--r--scilab/modules/intersci/examples/Makefile.mak36
-rw-r--r--scilab/modules/intersci/help/en_US/addchapter.sce6
-rw-r--r--scilab/modules/intersci/help/fr_FR/addchapter.sce10
-rw-r--r--scilab/modules/intersci/help/pt_BR/addchapter.sce5
-rw-r--r--scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj13
-rw-r--r--scilab/modules/intersci/src/exe/interscin/interscin.vcproj13
-rw-r--r--scilab/modules/intersci/src/lib/intersci.rc8
-rw-r--r--scilab/modules/intersci/src/lib/intersci.vcproj21
-rw-r--r--scilab/modules/intersci/version.xml2
12 files changed, 76 insertions, 86 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 5c019eb..b8153c1 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -63,9 +63,9 @@ subdir = modules/intersci
63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \ 65 $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/intel_compiler.m4 \ 66 $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
67 $(top_srcdir)/m4/java.m4 $(top_srcdir)/m4/lib-ld.m4 \ 67 $(top_srcdir)/m4/intel_compiler.m4 $(top_srcdir)/m4/java.m4 \
68 $(top_srcdir)/m4/libs_by_debian.m4 \ 68 $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libs_by_debian.m4 \
69 $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \ 69 $(top_srcdir)/m4/libsmath.m4 $(top_srcdir)/m4/libtool.m4 \
70 $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ocaml.m4 \ 70 $(top_srcdir)/m4/libxml2.m4 $(top_srcdir)/m4/ocaml.m4 \
71 $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \ 71 $(top_srcdir)/m4/pcre.m4 $(top_srcdir)/m4/pkg.m4 \
@@ -154,6 +154,7 @@ CXXDEPMODE = @CXXDEPMODE@
154CXXFLAGS = @CXXFLAGS@ 154CXXFLAGS = @CXXFLAGS@
155CYGPATH_W = @CYGPATH_W@ 155CYGPATH_W = @CYGPATH_W@
156DEFS = @DEFS@ 156DEFS = @DEFS@
157DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
157DEPDIR = @DEPDIR@ 158DEPDIR = @DEPDIR@
158DOCBOOK_ROOT = @DOCBOOK_ROOT@ 159DOCBOOK_ROOT = @DOCBOOK_ROOT@
159DSYMUTIL = @DSYMUTIL@ 160DSYMUTIL = @DSYMUTIL@
@@ -175,7 +176,13 @@ GIWS_BIN = @GIWS_BIN@
175GLUEGEN_RT = @GLUEGEN_RT@ 176GLUEGEN_RT = @GLUEGEN_RT@
176GMSGFMT = @GMSGFMT@ 177GMSGFMT = @GMSGFMT@
177GMSGFMT_015 = @GMSGFMT_015@ 178GMSGFMT_015 = @GMSGFMT_015@
179GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
178GREP = @GREP@ 180GREP = @GREP@
181GUI_ENABLE = @GUI_ENABLE@
182HDF5_CFLAGS = @HDF5_CFLAGS@
183HDF5_ENABLE = @HDF5_ENABLE@
184HDF5_LIBS = @HDF5_LIBS@
185HELP_ENABLE = @HELP_ENABLE@
179INSTALL = @INSTALL@ 186INSTALL = @INSTALL@
180INSTALL_DATA = @INSTALL_DATA@ 187INSTALL_DATA = @INSTALL_DATA@
181INSTALL_PROGRAM = @INSTALL_PROGRAM@ 188INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -187,7 +194,9 @@ JAR = @JAR@
187JAVA = @JAVA@ 194JAVA = @JAVA@
188JAVAC = @JAVAC@ 195JAVAC = @JAVAC@
189JAVAH = @JAVAH@ 196JAVAH = @JAVAH@
197JAVASCI_ENABLE = @JAVASCI_ENABLE@
190JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 198JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
199JAVA_ENABLE = @JAVA_ENABLE@
191JAVA_G = @JAVA_G@ 200JAVA_G = @JAVA_G@
192JAVA_HOME = @JAVA_HOME@ 201JAVA_HOME = @JAVA_HOME@
193JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@ 202JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
@@ -195,6 +204,7 @@ JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
195JDB = @JDB@ 204JDB = @JDB@
196JEUCLID_CORE = @JEUCLID_CORE@ 205JEUCLID_CORE = @JEUCLID_CORE@
197JHALL = @JHALL@ 206JHALL = @JHALL@
207JHDF5 = @JHDF5@
198JOGL = @JOGL@ 208JOGL = @JOGL@
199JROSETTA_API = @JROSETTA_API@ 209JROSETTA_API = @JROSETTA_API@
200JROSETTA_ENGINE = @JROSETTA_ENGINE@ 210JROSETTA_ENGINE = @JROSETTA_ENGINE@
@@ -255,6 +265,7 @@ RT_LIB = @RT_LIB@
255SAXON = @SAXON@ 265SAXON = @SAXON@
256SCICOS_ENABLE = @SCICOS_ENABLE@ 266SCICOS_ENABLE = @SCICOS_ENABLE@
257SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@ 267SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
268SCIPAD_ENABLE = @SCIPAD_ENABLE@
258SED = @SED@ 269SED = @SED@
259SET_MAKE = @SET_MAKE@ 270SET_MAKE = @SET_MAKE@
260SET_RELOCATABLE = @SET_RELOCATABLE@ 271SET_RELOCATABLE = @SET_RELOCATABLE@
diff --git a/scilab/modules/intersci/etc/intersci.quit b/scilab/modules/intersci/etc/intersci.quit
index 28d8c8d..acbd94a 100644
--- a/scilab/modules/intersci/etc/intersci.quit
+++ b/scilab/modules/intersci/etc/intersci.quit
@@ -1,5 +1,6 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2006-2008 - INRIA 2// Copyright (C) 2007-2008 - INRIA
3// Copyright (C) 2009 - DIGITEO
3// 4//
4// This file must be used under the terms of the CeCILL. 5// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which 6// This source file is licensed as described in the file COPYING, which
@@ -7,11 +8,8 @@
7// are also available at 8// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9 10
10 11// Delete help chapter
11// ==================================================================== 12// =============================================================================
12// This file contains command to be executed at the end 13if WITH_HELPTOOLS then
13// of a scilab session for intersci module 14 del_help_chapter("intersci",%t);
14// ==================================================================== 15end
15// delete help chapter
16del_help_chapter('intersci',%T);
17// ====================================================================
diff --git a/scilab/modules/intersci/etc/intersci.start b/scilab/modules/intersci/etc/intersci.start
index c22c5d5..7dffdb8 100644
--- a/scilab/modules/intersci/etc/intersci.start
+++ b/scilab/modules/intersci/etc/intersci.start
@@ -7,13 +7,8 @@
7// are also available at 7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9 9
10 10// Add help chapter
11// ==================================================================== 11// =============================================================================
12// intersci module initialisation file 12if WITH_HELPTOOLS then
13// ==================================================================== 13 add_module_help_chapter("intersci");
14//Load functions libraries 14end
15//load('SCI/modules/intersci/macros/lib');
16// ====================================================================
17//add help chapter
18add_module_help_chapter('intersci');
19// ====================================================================
diff --git a/scilab/modules/intersci/examples/Makefile.mak b/scilab/modules/intersci/examples/Makefile.mak
index b6aee3a..b26165e 100644
--- a/scilab/modules/intersci/examples/Makefile.mak
+++ b/scilab/modules/intersci/examples/Makefile.mak
@@ -8,7 +8,7 @@ SCIIMPLIB=$(SCIDIR)/bin/LibScilab.lib
8INTERSCI="$(SCIDIR1)\modules\intersci\bin\intersci" 8INTERSCI="$(SCIDIR1)\modules\intersci\bin\intersci"
9F2C="$(SCIDIR1)\bin\f2c.exe" 9F2C="$(SCIDIR1)\bin\f2c.exe"
10 10
11include ../../../Makefile.incl.mak 11include ../../dynamic_link/src/scripts/Makefile.incl.mak
12 12
13FFLAGS = $(FC_OPTIONS) -DFORDLL INCLUDES=-I"$(SCIDIR)\libs\MALLOC\includes" -I"$(SCIDIR)\modules\core\includes" -I"$(SCIDIR)/libs/f2c" -I"$(SCIDIR)/modules/mexlib/includes" 13FFLAGS = $(FC_OPTIONS) -DFORDLL INCLUDES=-I"$(SCIDIR)\libs\MALLOC\includes" -I"$(SCIDIR)\modules\core\includes" -I"$(SCIDIR)/libs/f2c" -I"$(SCIDIR)/modules/mexlib/includes"
14CFLAGS = $(CC_OPTIONS) -DFORDLL INCLUDES=-I"$(SCIDIR)\libs\MALLOC\includes" -I"$(SCIDIR)\modules\core\includes" -I"$(SCIDIR)/libs/f2c" -I"$(SCIDIR)/modules/mexlib/includes" 14CFLAGS = $(CC_OPTIONS) -DFORDLL INCLUDES=-I"$(SCIDIR)\libs\MALLOC\includes" -I"$(SCIDIR)\modules\core\includes" -I"$(SCIDIR)/libs/f2c" -I"$(SCIDIR)/modules/mexlib/includes"
@@ -28,7 +28,7 @@ dlls : $(DLLS)
28ex1.dll : ex1fi.obj ex1c.obj 28ex1.dll : ex1fi.obj ex1c.obj
29 @echo Creation of dll $(DLL) and import lib 29 @echo Creation of dll $(DLL) and import lib
30 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 30 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
31 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 31 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
32 32
33ex1fi.obj : ex1fi.desc 33ex1fi.obj : ex1fi.desc
34 @$(INTERSCI) $* 34 @$(INTERSCI) $*
@@ -39,7 +39,7 @@ ex1fi.obj : ex1fi.desc
39ex2.dll : ex2fi.obj ex2f.obj 39ex2.dll : ex2fi.obj ex2f.obj
40 @echo Creation of dll $(DLL) and import lib 40 @echo Creation of dll $(DLL) and import lib
41 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 41 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
42 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 42 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
43 43
44ex2fi.obj : ex2fi.desc 44ex2fi.obj : ex2fi.desc
45 @$(INTERSCI) $* 45 @$(INTERSCI) $*
@@ -50,7 +50,7 @@ ex2fi.obj : ex2fi.desc
50ex3.dll : ex3fi.obj 50ex3.dll : ex3fi.obj
51 @echo Creation of dll $(DLL) and import lib 51 @echo Creation of dll $(DLL) and import lib
52 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 52 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
53 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 53 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
54 54
55ex3fi.obj : ex3fi.desc 55ex3fi.obj : ex3fi.desc
56 @$(INTERSCI) $* 56 @$(INTERSCI) $*
@@ -61,7 +61,7 @@ ex3fi.obj : ex3fi.desc
61ex4.dll : ex4fi.obj ex4f.obj 61ex4.dll : ex4fi.obj ex4f.obj
62 @echo Creation of dll $(DLL) and import lib 62 @echo Creation of dll $(DLL) and import lib
63 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 63 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
64 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 64 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
65 65
66ex4fi.obj : ex4fi.desc 66ex4fi.obj : ex4fi.desc
67 @$(INTERSCI) $* 67 @$(INTERSCI) $*
@@ -72,7 +72,7 @@ ex4fi.obj : ex4fi.desc
72ex5.dll : ex5fi.obj ex5f.obj 72ex5.dll : ex5fi.obj ex5f.obj
73 @echo Creation of dll $(DLL) and import lib 73 @echo Creation of dll $(DLL) and import lib
74 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 74 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
75 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 75 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
76 76
77ex5fi.obj : ex5fi.desc 77ex5fi.obj : ex5fi.desc
78 @$(INTERSCI) $* 78 @$(INTERSCI) $*
@@ -84,7 +84,7 @@ ex5fi.obj : ex5fi.desc
84ex6.dll : ex6fi.obj ex6c.obj 84ex6.dll : ex6fi.obj ex6c.obj
85 @echo Creation of dll $(DLL) and import lib 85 @echo Creation of dll $(DLL) and import lib
86 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 86 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
87 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 87 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
88 88
89ex6fi.obj : ex6fi.desc 89ex6fi.obj : ex6fi.desc
90 @$(INTERSCI) $* 90 @$(INTERSCI) $*
@@ -95,7 +95,7 @@ ex6fi.obj : ex6fi.desc
95ex7.dll : ex7fi.obj ex7f.obj 95ex7.dll : ex7fi.obj ex7f.obj
96 @echo Creation of dll $(DLL) and import lib 96 @echo Creation of dll $(DLL) and import lib
97 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 97 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
98 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 98 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
99 99
100ex7fi.obj : ex7fi.desc 100ex7fi.obj : ex7fi.desc
101 @$(INTERSCI) $* 101 @$(INTERSCI) $*
@@ -106,7 +106,7 @@ ex7fi.obj : ex7fi.desc
106ex8.dll : ex8fi.obj ex8c.obj 106ex8.dll : ex8fi.obj ex8c.obj
107 @echo Creation of dll $(DLL) and import lib 107 @echo Creation of dll $(DLL) and import lib
108 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 108 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
109 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 109 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
110 110
111ex8fi.obj : ex8fi.desc 111ex8fi.obj : ex8fi.desc
112 @$(INTERSCI) $* 112 @$(INTERSCI) $*
@@ -117,7 +117,7 @@ ex8fi.obj : ex8fi.desc
117ex9.dll : ex9fi.obj ex9f.obj 117ex9.dll : ex9fi.obj ex9f.obj
118 @echo Creation of dll $(DLL) and import lib 118 @echo Creation of dll $(DLL) and import lib
119 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 119 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
120 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 120 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
121 121
122ex9fi.obj : ex9fi.desc 122ex9fi.obj : ex9fi.desc
123 @$(INTERSCI) $* 123 @$(INTERSCI) $*
@@ -129,7 +129,7 @@ ex9fi.obj : ex9fi.desc
129ex10.dll : ex10fi.obj ex10f.obj 129ex10.dll : ex10fi.obj ex10f.obj
130 @echo Creation of dll $(DLL) and import lib 130 @echo Creation of dll $(DLL) and import lib
131 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 131 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
132 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 132 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
133 133
134ex10fi.obj : ex10fi.desc 134ex10fi.obj : ex10fi.desc
135 @$(INTERSCI) $* 135 @$(INTERSCI) $*
@@ -141,7 +141,7 @@ ex10fi.obj : ex10fi.desc
141ex11.dll : ex11fi.obj ex11c.obj 141ex11.dll : ex11fi.obj ex11c.obj
142 @echo Creation of dll $(DLL) and import lib 142 @echo Creation of dll $(DLL) and import lib
143 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 143 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
144 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 144 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
145 145
146ex11fi.obj : ex11fi.desc 146ex11fi.obj : ex11fi.desc
147 @$(INTERSCI) $* 147 @$(INTERSCI) $*
@@ -152,7 +152,7 @@ ex11fi.obj : ex11fi.desc
152ex12.dll : ex12fi.obj ex12c.obj 152ex12.dll : ex12fi.obj ex12c.obj
153 @echo Creation of dll $(DLL) and import lib 153 @echo Creation of dll $(DLL) and import lib
154 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 154 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
155 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 155 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
156 156
157ex12fi.obj : ex12fi.desc 157ex12fi.obj : ex12fi.desc
158 @$(INTERSCI) $* 158 @$(INTERSCI) $*
@@ -163,7 +163,7 @@ ex12fi.obj : ex12fi.desc
163ex13.dll : ex13fi.obj ex13c.obj 163ex13.dll : ex13fi.obj ex13c.obj
164 @echo Creation of dll $(DLL) and import lib 164 @echo Creation of dll $(DLL) and import lib
165 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 165 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
166 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 166 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
167 167
168ex13fi.obj : ex13fi.desc 168ex13fi.obj : ex13fi.desc
169 @$(INTERSCI) $* 169 @$(INTERSCI) $*
@@ -174,7 +174,7 @@ ex13fi.obj : ex13fi.desc
174ex14.dll : ex14fi.obj ex14c.obj 174ex14.dll : ex14fi.obj ex14c.obj
175 @echo Creation of dll $(DLL) and import lib 175 @echo Creation of dll $(DLL) and import lib
176 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 176 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
177 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 177 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
178 178
179ex14fi.obj : ex14fi.desc 179ex14fi.obj : ex14fi.desc
180 @$(INTERSCI) $* 180 @$(INTERSCI) $*
@@ -185,7 +185,7 @@ ex14fi.obj : ex14fi.desc
185ex15.dll : ex15fi.obj ex15c.obj 185ex15.dll : ex15fi.obj ex15c.obj
186 @echo Creation of dll $(DLL) and import lib 186 @echo Creation of dll $(DLL) and import lib
187 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 187 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
188 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 188 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
189 189
190ex15fi.obj : ex15fi.desc 190ex15fi.obj : ex15fi.desc
191 @$(INTERSCI) $* 191 @$(INTERSCI) $*
@@ -197,7 +197,7 @@ ex15fi.obj : ex15fi.desc
197ex16.dll : ex16fi.obj ex16c.obj 197ex16.dll : ex16fi.obj ex16c.obj
198 @echo Creation of dll $(DLL) and import lib 198 @echo Creation of dll $(DLL) and import lib
199 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 199 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
200 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 200 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
201 201
202ex16fi.obj : ex16fi.desc 202ex16fi.obj : ex16fi.desc
203 @$(INTERSCI) $* 203 @$(INTERSCI) $*
@@ -227,7 +227,7 @@ OBJS=ex1c.obj ex2f.obj ex4f.obj ex5f.obj ex6c.obj ex7f.obj ex8c.obj \
227zallfi.dll : zallfi.obj $(OBJS) 227zallfi.dll : zallfi.obj $(OBJS)
228 @echo Creation of dll $(DLL) and import lib 228 @echo Creation of dll $(DLL) and import lib
229 @$(DUMPEXTS) -o "$*.def" "$*.dll" $** 229 @$(DUMPEXTS) -o "$*.def" "$*.dll" $**
230 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(XLIBSBIN) $(TERMCAPLIB) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def" 230 @$(LINKER) $(LINKER_FLAGS) $** $(SCIIMPLIB) $(SCILAB_LIBS) /nologo /dll /out:"$*.dll" /implib:"$*.lib" /def:"$*.def"
231 231
232zallfi.obj : zallfi.desc 232zallfi.obj : zallfi.desc
233 @$(INTERSCI) $* 233 @$(INTERSCI) $*
diff --git a/scilab/modules/intersci/help/en_US/addchapter.sce b/scilab/modules/intersci/help/en_US/addchapter.sce
index 1371f2f..36b0e06 100644
--- a/scilab/modules/intersci/help/en_US/addchapter.sce
+++ b/scilab/modules/intersci/help/en_US/addchapter.sce
@@ -1,5 +1,4 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2007-2008 - INRIA - Allan CORNET
3// Copyright (C) 2009 - DIGITEO 2// Copyright (C) 2009 - DIGITEO
4// 3//
5// This file must be used under the terms of the CeCILL. 4// This file must be used under the terms of the CeCILL.
@@ -8,6 +7,5 @@
8// are also available at 7// are also available at
9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 9
11path = SCI+"/modules/intersci/help/en_US"; 10add_help_chapter("Intersci",SCI+"/modules/intersci/help/en_US",%T);
12add_help_chapter("Intersci",path,%T); 11
13clear path add_help_chapter;
diff --git a/scilab/modules/intersci/help/fr_FR/addchapter.sce b/scilab/modules/intersci/help/fr_FR/addchapter.sce
index ce0dcd6..34a9b60 100644
--- a/scilab/modules/intersci/help/fr_FR/addchapter.sce
+++ b/scilab/modules/intersci/help/fr_FR/addchapter.sce
@@ -1,13 +1,11 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2007-2008 - INRIA - Allan CORNET
3// Copyright (C) 2009 - DIGITEO 2// Copyright (C) 2009 - DIGITEO
4// 3//
5// This file must be used under the terms of the CeCILL. 4// This file must be used under the terms of the CeCILL.
6// This source file is licensed as described in the file COPYING, which 5// This source file is licensed as described in the file COPYING, which
7// you should have received as part of this distribution. The terms 6// you should have received as part of this distribution. The terms
8// are also available at 7// are also available at
9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 9
11path = SCI+"/modules/intersci/help/fr_FR"; 10add_help_chapter("Intersci",SCI+"/modules/intersci/help/fr_FR",%T);
12add_help_chapter("Intersci",path,%T); 11
13clear path add_help_chapter;
diff --git a/scilab/modules/intersci/help/pt_BR/addchapter.sce b/scilab/modules/intersci/help/pt_BR/addchapter.sce
index 12ea4d0..1c373c9 100644
--- a/scilab/modules/intersci/help/pt_BR/addchapter.sce
+++ b/scilab/modules/intersci/help/pt_BR/addchapter.sce
@@ -7,6 +7,5 @@
7// are also available at 7// are also available at
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9 9
10path = SCI+"/modules/intersci/help/pt_BR"; 10add_help_chapter("Intersci",SCI+"/modules/intersci/help/pt_BR",%T);
11add_help_chapter("Intersci",path,%T); 11
12clear path add_help_chapter;
diff --git a/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj b/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj
index 2be0883..c2fdd4e 100644
--- a/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj
+++ b/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj
@@ -1,11 +1,10 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
5 Name="intersciexe" 5 Name="intersciexe"
6 ProjectGUID="{73AA7612-4297-4339-B521-8C2870E7BEC1}" 6 ProjectGUID="{73AA7612-4297-4339-B521-8C2870E7BEC1}"
7 RootNamespace="intersciexe" 7 RootNamespace="intersciexe"
8 TargetFrameworkVersion="0"
9 > 8 >
10 <Platforms> 9 <Platforms>
11 <Platform 10 <Platform
@@ -50,7 +49,7 @@
50 AdditionalIncludeDirectories="../../../core/includes;../../../../core/includes;../../../../../libs/intl;../../../includes" 49 AdditionalIncludeDirectories="../../../core/includes;../../../../core/includes;../../../../../libs/intl;../../../includes"
51 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 50 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
52 BasicRuntimeChecks="0" 51 BasicRuntimeChecks="0"
53 RuntimeLibrary="1" 52 RuntimeLibrary="3"
54 UsePrecompiledHeader="0" 53 UsePrecompiledHeader="0"
55 PrecompiledHeaderFile="" 54 PrecompiledHeaderFile=""
56 AssemblerListingLocation="$(ConfigurationName)/" 55 AssemblerListingLocation="$(ConfigurationName)/"
@@ -74,7 +73,6 @@
74 /> 73 />
75 <Tool 74 <Tool
76 Name="VCLinkerTool" 75 Name="VCLinkerTool"
77 AdditionalOptions="/fixed:no"
78 OutputFile="../../../bin/intersci.exe" 76 OutputFile="../../../bin/intersci.exe"
79 LinkIncremental="1" 77 LinkIncremental="1"
80 SuppressStartupBanner="true" 78 SuppressStartupBanner="true"
@@ -140,7 +138,7 @@
140 AdditionalIncludeDirectories="../../../core/includes;../../../../core/includes;../../../../../libs/intl;../../../includes" 138 AdditionalIncludeDirectories="../../../core/includes;../../../../core/includes;../../../../../libs/intl;../../../includes"
141 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 139 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
142 BasicRuntimeChecks="0" 140 BasicRuntimeChecks="0"
143 RuntimeLibrary="1" 141 RuntimeLibrary="3"
144 UsePrecompiledHeader="0" 142 UsePrecompiledHeader="0"
145 PrecompiledHeaderFile="" 143 PrecompiledHeaderFile=""
146 AssemblerListingLocation="$(ConfigurationName)/" 144 AssemblerListingLocation="$(ConfigurationName)/"
@@ -164,7 +162,6 @@
164 /> 162 />
165 <Tool 163 <Tool
166 Name="VCLinkerTool" 164 Name="VCLinkerTool"
167 AdditionalOptions="/fixed:no"
168 OutputFile="../../../bin/intersci.exe" 165 OutputFile="../../../bin/intersci.exe"
169 LinkIncremental="1" 166 LinkIncremental="1"
170 SuppressStartupBanner="true" 167 SuppressStartupBanner="true"
@@ -231,7 +228,7 @@
231 AdditionalIncludeDirectories="../../../core/includes;../../../../core/includes;../../../../../libs/intl;../../../includes" 228 AdditionalIncludeDirectories="../../../core/includes;../../../../core/includes;../../../../../libs/intl;../../../includes"
232 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 229 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
233 StringPooling="true" 230 StringPooling="true"
234 RuntimeLibrary="0" 231 RuntimeLibrary="2"
235 EnableFunctionLevelLinking="true" 232 EnableFunctionLevelLinking="true"
236 EnableEnhancedInstructionSet="0" 233 EnableEnhancedInstructionSet="0"
237 UsePrecompiledHeader="0" 234 UsePrecompiledHeader="0"
@@ -322,7 +319,7 @@
322 AdditionalIncludeDirectories="../../../core/includes;../../../../core/includes;../../../../../libs/intl;../../../includes" 319 AdditionalIncludeDirectories="../../../core/includes;../../../../core/includes;../../../../../libs/intl;../../../includes"
323 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 320 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
324 StringPooling="true" 321 StringPooling="true"
325 RuntimeLibrary="0" 322 RuntimeLibrary="2"
326 EnableFunctionLevelLinking="true" 323 EnableFunctionLevelLinking="true"
327 EnableEnhancedInstructionSet="0" 324 EnableEnhancedInstructionSet="0"
328 UsePrecompiledHeader="0" 325 UsePrecompiledHeader="0"
diff --git a/scilab/modules/intersci/src/exe/interscin/interscin.vcproj b/scilab/modules/intersci/src/exe/interscin/interscin.vcproj
index 6721e03..187e8ad 100644
--- a/scilab/modules/intersci/src/exe/interscin/interscin.vcproj
+++ b/scilab/modules/intersci/src/exe/interscin/interscin.vcproj
@@ -1,10 +1,9 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
5 Name="interscin" 5 Name="interscin"
6 ProjectGUID="{53AAB5BC-2C08-4BBA-9793-C36140A404F8}" 6 ProjectGUID="{53AAB5BC-2C08-4BBA-9793-C36140A404F8}"
7 TargetFrameworkVersion="0"
8 > 7 >
9 <Platforms> 8 <Platforms>
10 <Platform 9 <Platform
@@ -49,7 +48,7 @@
49 AdditionalIncludeDirectories="../../../../core/includes;../../../includes" 48 AdditionalIncludeDirectories="../../../../core/includes;../../../includes"
50 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
51 BasicRuntimeChecks="0" 50 BasicRuntimeChecks="0"
52 RuntimeLibrary="1" 51 RuntimeLibrary="3"
53 UsePrecompiledHeader="0" 52 UsePrecompiledHeader="0"
54 PrecompiledHeaderFile="" 53 PrecompiledHeaderFile=""
55 AssemblerListingLocation="$(ConfigurationName)/" 54 AssemblerListingLocation="$(ConfigurationName)/"
@@ -73,7 +72,6 @@
73 /> 72 />
74 <Tool 73 <Tool
75 Name="VCLinkerTool" 74 Name="VCLinkerTool"
76 AdditionalOptions="/fixed:no"
77 OutputFile="../../../bin/intersci-n.exe" 75 OutputFile="../../../bin/intersci-n.exe"
78 LinkIncremental="1" 76 LinkIncremental="1"
79 SuppressStartupBanner="true" 77 SuppressStartupBanner="true"
@@ -140,7 +138,7 @@
140 AdditionalIncludeDirectories="../../../../core/includes;../../../includes" 138 AdditionalIncludeDirectories="../../../../core/includes;../../../includes"
141 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 139 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
142 BasicRuntimeChecks="0" 140 BasicRuntimeChecks="0"
143 RuntimeLibrary="1" 141 RuntimeLibrary="3"
144 UsePrecompiledHeader="0" 142 UsePrecompiledHeader="0"
145 PrecompiledHeaderFile="" 143 PrecompiledHeaderFile=""
146 AssemblerListingLocation="$(ConfigurationName)/" 144 AssemblerListingLocation="$(ConfigurationName)/"
@@ -164,7 +162,6 @@
164 /> 162 />
165 <Tool 163 <Tool
166 Name="VCLinkerTool" 164 Name="VCLinkerTool"
167 AdditionalOptions="/fixed:no"
168 OutputFile="../../../bin/intersci-n.exe" 165 OutputFile="../../../bin/intersci-n.exe"
169 LinkIncremental="1" 166 LinkIncremental="1"
170 SuppressStartupBanner="true" 167 SuppressStartupBanner="true"
@@ -232,7 +229,7 @@
232 AdditionalIncludeDirectories="../../../../core/includes;../../../includes" 229 AdditionalIncludeDirectories="../../../../core/includes;../../../includes"
233 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 230 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
234 StringPooling="true" 231 StringPooling="true"
235 RuntimeLibrary="0" 232 RuntimeLibrary="2"
236 EnableFunctionLevelLinking="true" 233 EnableFunctionLevelLinking="true"
237 EnableEnhancedInstructionSet="0" 234 EnableEnhancedInstructionSet="0"
238 UsePrecompiledHeader="0" 235 UsePrecompiledHeader="0"
@@ -324,7 +321,7 @@
324 AdditionalIncludeDirectories="../../../../core/includes;../../../includes" 321 AdditionalIncludeDirectories="../../../../core/includes;../../../includes"
325 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 322 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
326 StringPooling="true" 323 StringPooling="true"
327 RuntimeLibrary="0" 324 RuntimeLibrary="2"
328 EnableFunctionLevelLinking="true" 325 EnableFunctionLevelLinking="true"
329 EnableEnhancedInstructionSet="0" 326 EnableEnhancedInstructionSet="0"
330 UsePrecompiledHeader="0" 327 UsePrecompiledHeader="0"
diff --git a/scilab/modules/intersci/src/lib/intersci.rc b/scilab/modules/intersci/src/lib/intersci.rc
index 2c2cabd..8349a11 100644
--- a/scilab/modules/intersci/src/lib/intersci.rc
+++ b/scilab/modules/intersci/src/lib/intersci.rc
@@ -49,8 +49,8 @@ END
49// 49//
50 50
51VS_VERSION_INFO VERSIONINFO 51VS_VERSION_INFO VERSIONINFO
52 FILEVERSION 5,1,0,0 52 FILEVERSION 5,2,0,0
53 PRODUCTVERSION 5,1,0,0 53 PRODUCTVERSION 5,2,0,0
54 FILEFLAGSMASK 0x17L 54 FILEFLAGSMASK 0x17L
55#ifdef _DEBUG 55#ifdef _DEBUG
56 FILEFLAGS 0x1L 56 FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
66 BLOCK "040c04b0" 66 BLOCK "040c04b0"
67 BEGIN 67 BEGIN
68 VALUE "FileDescription", "intersci module" 68 VALUE "FileDescription", "intersci module"
69 VALUE "FileVersion", "5, 1, 0, 0" 69 VALUE "FileVersion", "5, 2, 0, 0"
70 VALUE "InternalName", "intersci module" 70 VALUE "InternalName", "intersci module"
71 VALUE "LegalCopyright", "Copyright (C) 2009" 71 VALUE "LegalCopyright", "Copyright (C) 2009"
72 VALUE "OriginalFilename", "intersci.dll" 72 VALUE "OriginalFilename", "intersci.dll"
73 VALUE "ProductName", " intersci" 73 VALUE "ProductName", " intersci"
74 VALUE "ProductVersion", "5, 1, 0, 0" 74 VALUE "ProductVersion", "5, 2, 0, 0"
75 END 75 END
76 END 76 END
77 BLOCK "VarFileInfo" 77 BLOCK "VarFileInfo"
diff --git a/scilab/modules/intersci/src/lib/intersci.vcproj b/scilab/modules/intersci/src/lib/intersci.vcproj
index 785353b..32e24d4 100644
--- a/scilab/modules/intersci/src/lib/intersci.vcproj
+++ b/scilab/modules/intersci/src/lib/intersci.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -6,7 +6,6 @@
6 ProjectGUID="{DFA0D75B-F7EF-4D02-B33F-486829405315}" 6 ProjectGUID="{DFA0D75B-F7EF-4D02-B33F-486829405315}"
7 RootNamespace="intersci" 7 RootNamespace="intersci"
8 Keyword="Win32Proj" 8 Keyword="Win32Proj"
9 TargetFrameworkVersion="0"
10 > 9 >
11 <Platforms> 10 <Platforms>
12 <Platform 11 <Platform
@@ -45,10 +44,10 @@
45 Name="VCCLCompilerTool" 44 Name="VCCLCompilerTool"
46 Optimization="0" 45 Optimization="0"
47 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 46 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
48 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS" 47 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERSCI_EXPORTS"
49 MinimalRebuild="true" 48 MinimalRebuild="true"
50 BasicRuntimeChecks="0" 49 BasicRuntimeChecks="0"
51 RuntimeLibrary="1" 50 RuntimeLibrary="3"
52 UsePrecompiledHeader="0" 51 UsePrecompiledHeader="0"
53 WarningLevel="3" 52 WarningLevel="3"
54 Detect64BitPortabilityProblems="false" 53 Detect64BitPortabilityProblems="false"
@@ -67,7 +66,6 @@
67 /> 66 />
68 <Tool 67 <Tool
69 Name="VCLinkerTool" 68 Name="VCLinkerTool"
70 AdditionalOptions="/fixed:no"
71 AdditionalDependencies="LibScilab.lib" 69 AdditionalDependencies="LibScilab.lib"
72 OutputFile="../../../../bin/$(ProjectName).dll" 70 OutputFile="../../../../bin/$(ProjectName).dll"
73 LinkIncremental="1" 71 LinkIncremental="1"
@@ -128,10 +126,10 @@
128 Name="VCCLCompilerTool" 126 Name="VCCLCompilerTool"
129 Optimization="0" 127 Optimization="0"
130 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 128 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
131 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS" 129 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERSCI_EXPORTS"
132 MinimalRebuild="true" 130 MinimalRebuild="true"
133 BasicRuntimeChecks="0" 131 BasicRuntimeChecks="0"
134 RuntimeLibrary="1" 132 RuntimeLibrary="3"
135 UsePrecompiledHeader="0" 133 UsePrecompiledHeader="0"
136 WarningLevel="3" 134 WarningLevel="3"
137 Detect64BitPortabilityProblems="false" 135 Detect64BitPortabilityProblems="false"
@@ -150,7 +148,6 @@
150 /> 148 />
151 <Tool 149 <Tool
152 Name="VCLinkerTool" 150 Name="VCLinkerTool"
153 AdditionalOptions="/fixed:no"
154 AdditionalDependencies="LibScilab.lib" 151 AdditionalDependencies="LibScilab.lib"
155 OutputFile="../../../../bin/$(ProjectName).dll" 152 OutputFile="../../../../bin/$(ProjectName).dll"
156 LinkIncremental="1" 153 LinkIncremental="1"
@@ -213,9 +210,9 @@
213 FavorSizeOrSpeed="1" 210 FavorSizeOrSpeed="1"
214 WholeProgramOptimization="false" 211 WholeProgramOptimization="false"
215 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 212 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
216 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS" 213 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;INTERSCI_EXPORTS"
217 StringPooling="true" 214 StringPooling="true"
218 RuntimeLibrary="0" 215 RuntimeLibrary="2"
219 EnableEnhancedInstructionSet="0" 216 EnableEnhancedInstructionSet="0"
220 UsePrecompiledHeader="0" 217 UsePrecompiledHeader="0"
221 WarningLevel="3" 218 WarningLevel="3"
@@ -302,9 +299,9 @@
302 FavorSizeOrSpeed="1" 299 FavorSizeOrSpeed="1"
303 WholeProgramOptimization="false" 300 WholeProgramOptimization="false"
304 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 301 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
305 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS" 302 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;INTERSCI_EXPORTS"
306 StringPooling="true" 303 StringPooling="true"
307 RuntimeLibrary="0" 304 RuntimeLibrary="2"
308 EnableEnhancedInstructionSet="0" 305 EnableEnhancedInstructionSet="0"
309 UsePrecompiledHeader="0" 306 UsePrecompiledHeader="0"
310 WarningLevel="3" 307 WarningLevel="3"
diff --git a/scilab/modules/intersci/version.xml b/scilab/modules/intersci/version.xml
index 3b6c7ac..b933e85 100644
--- a/scilab/modules/intersci/version.xml
+++ b/scilab/modules/intersci/version.xml
@@ -25,5 +25,5 @@
25--> 25-->
26<!-- =================== --> 26<!-- =================== -->
27 27
28<VERSION major="5" minor="1" maintenance="0" revision="0" string="unstable-svn" /> 28<VERSION major="5" minor="2" maintenance="0" revision="0" string="unstable-git" />
29</MODULE_VERSION> \ No newline at end of file 29</MODULE_VERSION> \ No newline at end of file