summaryrefslogtreecommitdiffstats
path: root/scilab/modules/shell
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/shell
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/shell')
-rw-r--r--scilab/modules/shell/Makefile.in4
-rw-r--r--scilab/modules/shell/src/c/shell.vcproj4
2 files changed, 6 insertions, 2 deletions
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index ee4c218..ac0be7e 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -177,6 +177,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
177AWK = @AWK@ 177AWK = @AWK@
178BATIK = @BATIK@ 178BATIK = @BATIK@
179BLAS_LIBS = @BLAS_LIBS@ 179BLAS_LIBS = @BLAS_LIBS@
180BSH = @BSH@
180CC = @CC@ 181CC = @CC@
181CCDEPMODE = @CCDEPMODE@ 182CCDEPMODE = @CCDEPMODE@
182CFLAGS = @CFLAGS@ 183CFLAGS = @CFLAGS@
@@ -250,6 +251,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
250JOGL = @JOGL@ 251JOGL = @JOGL@
251JROSETTA_API = @JROSETTA_API@ 252JROSETTA_API = @JROSETTA_API@
252JROSETTA_ENGINE = @JROSETTA_ENGINE@ 253JROSETTA_ENGINE = @JROSETTA_ENGINE@
254JUNIT = @JUNIT@
253LAPACK_LIBS = @LAPACK_LIBS@ 255LAPACK_LIBS = @LAPACK_LIBS@
254LD = @LD@ 256LD = @LD@
255LDFLAGS = @LDFLAGS@ 257LDFLAGS = @LDFLAGS@
@@ -306,6 +308,7 @@ PVM_ENABLE = @PVM_ENABLE@
306PVM_INCLUDE = @PVM_INCLUDE@ 308PVM_INCLUDE = @PVM_INCLUDE@
307PVM_LIB = @PVM_LIB@ 309PVM_LIB = @PVM_LIB@
308PYTHON = @PYTHON@ 310PYTHON = @PYTHON@
311QDOX = @QDOX@
309RANLIB = @RANLIB@ 312RANLIB = @RANLIB@
310RELOCATABLE = @RELOCATABLE@ 313RELOCATABLE = @RELOCATABLE@
311RT_LIB = @RT_LIB@ 314RT_LIB = @RT_LIB@
@@ -324,6 +327,7 @@ SWIG_JAVA = @SWIG_JAVA@
324SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 327SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
325TCLTK_LIBS = @TCLTK_LIBS@ 328TCLTK_LIBS = @TCLTK_LIBS@
326TCL_INC_PATH = @TCL_INC_PATH@ 329TCL_INC_PATH = @TCL_INC_PATH@
330TESTNG = @TESTNG@
327TK_INC_PATH = @TK_INC_PATH@ 331TK_INC_PATH = @TK_INC_PATH@
328UMFPACK_ENABLE = @UMFPACK_ENABLE@ 332UMFPACK_ENABLE = @UMFPACK_ENABLE@
329UMFPACK_LIB = @UMFPACK_LIB@ 333UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/shell/src/c/shell.vcproj b/scilab/modules/shell/src/c/shell.vcproj
index 5a4a7bd..6c80974 100644
--- a/scilab/modules/shell/src/c/shell.vcproj
+++ b/scilab/modules/shell/src/c/shell.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=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes" 48 AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCISHELL_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCISHELL_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"