summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
commit4543a005198ee3197c08e553378430c9bc590911 (patch)
treef48aacd7ed42e1a1b0f13d95fa7185fe4b6afde7 /scilab/modules/intersci
parent7262c7b88b413c8a0b09bb0a627d613cdca3f845 (diff)
parent97de4eee52d09735f550d4c632fba106d0cc1762 (diff)
downloadscilab-4543a005198ee3197c08e553378430c9bc590911.zip
scilab-4543a005198ee3197c08e553378430c9bc590911.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/Makefile.in4
-rw-r--r--scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj4
-rw-r--r--scilab/modules/intersci/src/exe/interscin/interscin.vcproj4
-rw-r--r--scilab/modules/intersci/src/lib/intersci.vcproj4
4 files changed, 10 insertions, 6 deletions
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 21c69af..18897a2 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -163,6 +163,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
163AWK = @AWK@ 163AWK = @AWK@
164BATIK = @BATIK@ 164BATIK = @BATIK@
165BLAS_LIBS = @BLAS_LIBS@ 165BLAS_LIBS = @BLAS_LIBS@
166BSH = @BSH@
166CC = @CC@ 167CC = @CC@
167CCDEPMODE = @CCDEPMODE@ 168CCDEPMODE = @CCDEPMODE@
168CFLAGS = @CFLAGS@ 169CFLAGS = @CFLAGS@
@@ -236,6 +237,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
236JOGL = @JOGL@ 237JOGL = @JOGL@
237JROSETTA_API = @JROSETTA_API@ 238JROSETTA_API = @JROSETTA_API@
238JROSETTA_ENGINE = @JROSETTA_ENGINE@ 239JROSETTA_ENGINE = @JROSETTA_ENGINE@
240JUNIT = @JUNIT@
239LAPACK_LIBS = @LAPACK_LIBS@ 241LAPACK_LIBS = @LAPACK_LIBS@
240LD = @LD@ 242LD = @LD@
241LDFLAGS = @LDFLAGS@ 243LDFLAGS = @LDFLAGS@
@@ -292,6 +294,7 @@ PVM_ENABLE = @PVM_ENABLE@
292PVM_INCLUDE = @PVM_INCLUDE@ 294PVM_INCLUDE = @PVM_INCLUDE@
293PVM_LIB = @PVM_LIB@ 295PVM_LIB = @PVM_LIB@
294PYTHON = @PYTHON@ 296PYTHON = @PYTHON@
297QDOX = @QDOX@
295RANLIB = @RANLIB@ 298RANLIB = @RANLIB@
296RELOCATABLE = @RELOCATABLE@ 299RELOCATABLE = @RELOCATABLE@
297RT_LIB = @RT_LIB@ 300RT_LIB = @RT_LIB@
@@ -310,6 +313,7 @@ SWIG_JAVA = @SWIG_JAVA@
310SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 313SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
311TCLTK_LIBS = @TCLTK_LIBS@ 314TCLTK_LIBS = @TCLTK_LIBS@
312TCL_INC_PATH = @TCL_INC_PATH@ 315TCL_INC_PATH = @TCL_INC_PATH@
316TESTNG = @TESTNG@
313TK_INC_PATH = @TK_INC_PATH@ 317TK_INC_PATH = @TK_INC_PATH@
314UMFPACK_ENABLE = @UMFPACK_ENABLE@ 318UMFPACK_ENABLE = @UMFPACK_ENABLE@
315UMFPACK_LIB = @UMFPACK_LIB@ 319UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj b/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj
index da5b065..4ef9f80 100644
--- a/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj
+++ b/scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj
@@ -46,7 +46,7 @@
46 /> 46 />
47 <Tool 47 <Tool
48 Name="VCCLCompilerTool" 48 Name="VCCLCompilerTool"
49 AdditionalOptions="/arch:IA32" 49 AdditionalOptions=""
50 Optimization="0" 50 Optimization="0"
51 AdditionalIncludeDirectories="../../../core/includes;../../../../core/includes;../../../../../libs/intl;../../../includes" 51 AdditionalIncludeDirectories="../../../core/includes;../../../../core/includes;../../../../../libs/intl;../../../includes"
52 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 52 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
@@ -224,7 +224,7 @@
224 /> 224 />
225 <Tool 225 <Tool
226 Name="VCCLCompilerTool" 226 Name="VCCLCompilerTool"
227 AdditionalOptions="/arch:IA32" 227 AdditionalOptions=""
228 Optimization="2" 228 Optimization="2"
229 InlineFunctionExpansion="1" 229 InlineFunctionExpansion="1"
230 FavorSizeOrSpeed="1" 230 FavorSizeOrSpeed="1"
diff --git a/scilab/modules/intersci/src/exe/interscin/interscin.vcproj b/scilab/modules/intersci/src/exe/interscin/interscin.vcproj
index 36b9eae..7d6f8cc 100644
--- a/scilab/modules/intersci/src/exe/interscin/interscin.vcproj
+++ b/scilab/modules/intersci/src/exe/interscin/interscin.vcproj
@@ -45,7 +45,7 @@
45 /> 45 />
46 <Tool 46 <Tool
47 Name="VCCLCompilerTool" 47 Name="VCCLCompilerTool"
48 AdditionalOptions="/arch:IA32" 48 AdditionalOptions=""
49 Optimization="0" 49 Optimization="0"
50 AdditionalIncludeDirectories="../../../../core/includes;../../../includes" 50 AdditionalIncludeDirectories="../../../../core/includes;../../../includes"
51 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE" 51 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
@@ -225,7 +225,7 @@
225 /> 225 />
226 <Tool 226 <Tool
227 Name="VCCLCompilerTool" 227 Name="VCCLCompilerTool"
228 AdditionalOptions="/arch:IA32" 228 AdditionalOptions=""
229 Optimization="2" 229 Optimization="2"
230 InlineFunctionExpansion="1" 230 InlineFunctionExpansion="1"
231 FavorSizeOrSpeed="1" 231 FavorSizeOrSpeed="1"
diff --git a/scilab/modules/intersci/src/lib/intersci.vcproj b/scilab/modules/intersci/src/lib/intersci.vcproj
index 067bd30..604c724 100644
--- a/scilab/modules/intersci/src/lib/intersci.vcproj
+++ b/scilab/modules/intersci/src/lib/intersci.vcproj
@@ -43,7 +43,7 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 48 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERSCI_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERSCI_EXPORTS"
@@ -208,7 +208,7 @@
208 /> 208 />
209 <Tool 209 <Tool
210 Name="VCCLCompilerTool" 210 Name="VCCLCompilerTool"
211 AdditionalOptions="/arch:IA32" 211 AdditionalOptions=""
212 InlineFunctionExpansion="1" 212 InlineFunctionExpansion="1"
213 FavorSizeOrSpeed="1" 213 FavorSizeOrSpeed="1"
214 WholeProgramOptimization="false" 214 WholeProgramOptimization="false"