summaryrefslogtreecommitdiffstats
path: root/scilab/modules/call_scilab
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/call_scilab
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/call_scilab')
-rw-r--r--scilab/modules/call_scilab/Makefile.in4
-rw-r--r--scilab/modules/call_scilab/call_scilab.vcproj4
2 files changed, 6 insertions, 2 deletions
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 1d76392..b8ab386 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -159,6 +159,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
159AWK = @AWK@ 159AWK = @AWK@
160BATIK = @BATIK@ 160BATIK = @BATIK@
161BLAS_LIBS = @BLAS_LIBS@ 161BLAS_LIBS = @BLAS_LIBS@
162BSH = @BSH@
162CC = @CC@ 163CC = @CC@
163CCDEPMODE = @CCDEPMODE@ 164CCDEPMODE = @CCDEPMODE@
164CFLAGS = @CFLAGS@ 165CFLAGS = @CFLAGS@
@@ -232,6 +233,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
232JOGL = @JOGL@ 233JOGL = @JOGL@
233JROSETTA_API = @JROSETTA_API@ 234JROSETTA_API = @JROSETTA_API@
234JROSETTA_ENGINE = @JROSETTA_ENGINE@ 235JROSETTA_ENGINE = @JROSETTA_ENGINE@
236JUNIT = @JUNIT@
235LAPACK_LIBS = @LAPACK_LIBS@ 237LAPACK_LIBS = @LAPACK_LIBS@
236LD = @LD@ 238LD = @LD@
237LDFLAGS = @LDFLAGS@ 239LDFLAGS = @LDFLAGS@
@@ -288,6 +290,7 @@ PVM_ENABLE = @PVM_ENABLE@
288PVM_INCLUDE = @PVM_INCLUDE@ 290PVM_INCLUDE = @PVM_INCLUDE@
289PVM_LIB = @PVM_LIB@ 291PVM_LIB = @PVM_LIB@
290PYTHON = @PYTHON@ 292PYTHON = @PYTHON@
293QDOX = @QDOX@
291RANLIB = @RANLIB@ 294RANLIB = @RANLIB@
292RELOCATABLE = @RELOCATABLE@ 295RELOCATABLE = @RELOCATABLE@
293RT_LIB = @RT_LIB@ 296RT_LIB = @RT_LIB@
@@ -306,6 +309,7 @@ SWIG_JAVA = @SWIG_JAVA@
306SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 309SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
307TCLTK_LIBS = @TCLTK_LIBS@ 310TCLTK_LIBS = @TCLTK_LIBS@
308TCL_INC_PATH = @TCL_INC_PATH@ 311TCL_INC_PATH = @TCL_INC_PATH@
312TESTNG = @TESTNG@
309TK_INC_PATH = @TK_INC_PATH@ 313TK_INC_PATH = @TK_INC_PATH@
310UMFPACK_ENABLE = @UMFPACK_ENABLE@ 314UMFPACK_ENABLE = @UMFPACK_ENABLE@
311UMFPACK_LIB = @UMFPACK_LIB@ 315UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/call_scilab/call_scilab.vcproj b/scilab/modules/call_scilab/call_scilab.vcproj
index f9257fb..75911dc 100644
--- a/scilab/modules/call_scilab/call_scilab.vcproj
+++ b/scilab/modules/call_scilab/call_scilab.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;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes" 48 AdditionalIncludeDirectories="includes;src/c;../core/includes;../api_scilab/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes"
49 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;CALL_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
@@ -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"