summaryrefslogtreecommitdiffstats
path: root/scilab/modules/spreadsheet
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/spreadsheet
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/spreadsheet')
-rw-r--r--scilab/modules/spreadsheet/Makefile.in4
-rw-r--r--scilab/modules/spreadsheet/spreadsheet.vcproj4
-rw-r--r--scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcproj4
3 files changed, 8 insertions, 4 deletions
diff --git a/scilab/modules/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index 9a482be..c38d9be 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -162,6 +162,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
162AWK = @AWK@ 162AWK = @AWK@
163BATIK = @BATIK@ 163BATIK = @BATIK@
164BLAS_LIBS = @BLAS_LIBS@ 164BLAS_LIBS = @BLAS_LIBS@
165BSH = @BSH@
165CC = @CC@ 166CC = @CC@
166CCDEPMODE = @CCDEPMODE@ 167CCDEPMODE = @CCDEPMODE@
167CFLAGS = @CFLAGS@ 168CFLAGS = @CFLAGS@
@@ -235,6 +236,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
235JOGL = @JOGL@ 236JOGL = @JOGL@
236JROSETTA_API = @JROSETTA_API@ 237JROSETTA_API = @JROSETTA_API@
237JROSETTA_ENGINE = @JROSETTA_ENGINE@ 238JROSETTA_ENGINE = @JROSETTA_ENGINE@
239JUNIT = @JUNIT@
238LAPACK_LIBS = @LAPACK_LIBS@ 240LAPACK_LIBS = @LAPACK_LIBS@
239LD = @LD@ 241LD = @LD@
240LDFLAGS = @LDFLAGS@ 242LDFLAGS = @LDFLAGS@
@@ -291,6 +293,7 @@ PVM_ENABLE = @PVM_ENABLE@
291PVM_INCLUDE = @PVM_INCLUDE@ 293PVM_INCLUDE = @PVM_INCLUDE@
292PVM_LIB = @PVM_LIB@ 294PVM_LIB = @PVM_LIB@
293PYTHON = @PYTHON@ 295PYTHON = @PYTHON@
296QDOX = @QDOX@
294RANLIB = @RANLIB@ 297RANLIB = @RANLIB@
295RELOCATABLE = @RELOCATABLE@ 298RELOCATABLE = @RELOCATABLE@
296RT_LIB = @RT_LIB@ 299RT_LIB = @RT_LIB@
@@ -309,6 +312,7 @@ SWIG_JAVA = @SWIG_JAVA@
309SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 312SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
310TCLTK_LIBS = @TCLTK_LIBS@ 313TCLTK_LIBS = @TCLTK_LIBS@
311TCL_INC_PATH = @TCL_INC_PATH@ 314TCL_INC_PATH = @TCL_INC_PATH@
315TESTNG = @TESTNG@
312TK_INC_PATH = @TK_INC_PATH@ 316TK_INC_PATH = @TK_INC_PATH@
313UMFPACK_ENABLE = @UMFPACK_ENABLE@ 317UMFPACK_ENABLE = @UMFPACK_ENABLE@
314UMFPACK_LIB = @UMFPACK_LIB@ 318UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/spreadsheet/spreadsheet.vcproj b/scilab/modules/spreadsheet/spreadsheet.vcproj
index 4873f8b..28ab8f9 100644
--- a/scilab/modules/spreadsheet/spreadsheet.vcproj
+++ b/scilab/modules/spreadsheet/spreadsheet.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;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes" 48 AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes"
49 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
@@ -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"
diff --git a/scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcproj b/scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcproj
index 1a24d6c..28c3f6d 100644
--- a/scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcproj
+++ b/scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.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;../../../../libs/intl;../../../api_scilab/includes;../../includes" 48 AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes;../../includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_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"