summaryrefslogtreecommitdiffstats
path: root/scilab/modules/umfpack
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/umfpack
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/umfpack')
-rw-r--r--scilab/modules/umfpack/Makefile.in4
-rw-r--r--scilab/modules/umfpack/src/c/umfpack.vcproj4
-rw-r--r--scilab/modules/umfpack/src/noumfpack/noumfpack.vcproj4
3 files changed, 8 insertions, 4 deletions
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index 231f06e..92757ff 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -189,6 +189,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
189AWK = @AWK@ 189AWK = @AWK@
190BATIK = @BATIK@ 190BATIK = @BATIK@
191BLAS_LIBS = @BLAS_LIBS@ 191BLAS_LIBS = @BLAS_LIBS@
192BSH = @BSH@
192CC = @CC@ 193CC = @CC@
193CCDEPMODE = @CCDEPMODE@ 194CCDEPMODE = @CCDEPMODE@
194CFLAGS = @CFLAGS@ 195CFLAGS = @CFLAGS@
@@ -262,6 +263,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
262JOGL = @JOGL@ 263JOGL = @JOGL@
263JROSETTA_API = @JROSETTA_API@ 264JROSETTA_API = @JROSETTA_API@
264JROSETTA_ENGINE = @JROSETTA_ENGINE@ 265JROSETTA_ENGINE = @JROSETTA_ENGINE@
266JUNIT = @JUNIT@
265LAPACK_LIBS = @LAPACK_LIBS@ 267LAPACK_LIBS = @LAPACK_LIBS@
266LD = @LD@ 268LD = @LD@
267LDFLAGS = @LDFLAGS@ 269LDFLAGS = @LDFLAGS@
@@ -318,6 +320,7 @@ PVM_ENABLE = @PVM_ENABLE@
318PVM_INCLUDE = @PVM_INCLUDE@ 320PVM_INCLUDE = @PVM_INCLUDE@
319PVM_LIB = @PVM_LIB@ 321PVM_LIB = @PVM_LIB@
320PYTHON = @PYTHON@ 322PYTHON = @PYTHON@
323QDOX = @QDOX@
321RANLIB = @RANLIB@ 324RANLIB = @RANLIB@
322RELOCATABLE = @RELOCATABLE@ 325RELOCATABLE = @RELOCATABLE@
323RT_LIB = @RT_LIB@ 326RT_LIB = @RT_LIB@
@@ -336,6 +339,7 @@ SWIG_JAVA = @SWIG_JAVA@
336SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 339SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
337TCLTK_LIBS = @TCLTK_LIBS@ 340TCLTK_LIBS = @TCLTK_LIBS@
338TCL_INC_PATH = @TCL_INC_PATH@ 341TCL_INC_PATH = @TCL_INC_PATH@
342TESTNG = @TESTNG@
339TK_INC_PATH = @TK_INC_PATH@ 343TK_INC_PATH = @TK_INC_PATH@
340UMFPACK_ENABLE = @UMFPACK_ENABLE@ 344UMFPACK_ENABLE = @UMFPACK_ENABLE@
341UMFPACK_LIB = @UMFPACK_LIB@ 345UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/umfpack/src/c/umfpack.vcproj b/scilab/modules/umfpack/src/c/umfpack.vcproj
index f250697..465d2be 100644
--- a/scilab/modules/umfpack/src/c/umfpack.vcproj
+++ b/scilab/modules/umfpack/src/c/umfpack.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;../jni;../../../../libs/MALLOC/includes;../../../../libs/UMFPACK/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes" 48 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../../libs/UMFPACK/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;UMFPACK_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;UMFPACK_EXPORTS"
@@ -212,7 +212,7 @@
212 /> 212 />
213 <Tool 213 <Tool
214 Name="VCCLCompilerTool" 214 Name="VCCLCompilerTool"
215 AdditionalOptions="/arch:IA32" 215 AdditionalOptions=""
216 InlineFunctionExpansion="1" 216 InlineFunctionExpansion="1"
217 FavorSizeOrSpeed="1" 217 FavorSizeOrSpeed="1"
218 WholeProgramOptimization="false" 218 WholeProgramOptimization="false"
diff --git a/scilab/modules/umfpack/src/noumfpack/noumfpack.vcproj b/scilab/modules/umfpack/src/noumfpack/noumfpack.vcproj
index 3d08276..86e2bc6 100644
--- a/scilab/modules/umfpack/src/noumfpack/noumfpack.vcproj
+++ b/scilab/modules/umfpack/src/noumfpack/noumfpack.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="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl;../../../api_scilab/includes" 48 AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl;../../../api_scilab/includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;UMFPACK_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;UMFPACK_EXPORTS"
@@ -210,7 +210,7 @@
210 /> 210 />
211 <Tool 211 <Tool
212 Name="VCCLCompilerTool" 212 Name="VCCLCompilerTool"
213 AdditionalOptions="/arch:IA32" 213 AdditionalOptions=""
214 InlineFunctionExpansion="1" 214 InlineFunctionExpansion="1"
215 FavorSizeOrSpeed="1" 215 FavorSizeOrSpeed="1"
216 WholeProgramOptimization="false" 216 WholeProgramOptimization="false"