summaryrefslogtreecommitdiffstats
path: root/scilab/modules/javasci
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/javasci
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/javasci')
-rw-r--r--scilab/modules/javasci/Javasci.vcproj4
-rw-r--r--scilab/modules/javasci/Makefile.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/scilab/modules/javasci/Javasci.vcproj b/scilab/modules/javasci/Javasci.vcproj
index 0f712d5..30ad594 100644
--- a/scilab/modules/javasci/Javasci.vcproj
+++ b/scilab/modules/javasci/Javasci.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;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes" 48 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes"
49 PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
@@ -209,7 +209,7 @@
209 /> 209 />
210 <Tool 210 <Tool
211 Name="VCCLCompilerTool" 211 Name="VCCLCompilerTool"
212 AdditionalOptions="/arch:IA32" 212 AdditionalOptions=""
213 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes" 213 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../api_scilab/includes;../output_stream/includes;../windows_tools/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes"
214 PreprocessorDefinitions="NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 214 PreprocessorDefinitions="NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
215 RuntimeLibrary="2" 215 RuntimeLibrary="2"
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index 1f89e54c4..32ff5fd 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -175,6 +175,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
175AWK = @AWK@ 175AWK = @AWK@
176BATIK = @BATIK@ 176BATIK = @BATIK@
177BLAS_LIBS = @BLAS_LIBS@ 177BLAS_LIBS = @BLAS_LIBS@
178BSH = @BSH@
178CC = @CC@ 179CC = @CC@
179CCDEPMODE = @CCDEPMODE@ 180CCDEPMODE = @CCDEPMODE@
180CFLAGS = @CFLAGS@ 181CFLAGS = @CFLAGS@
@@ -248,6 +249,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
248JOGL = @JOGL@ 249JOGL = @JOGL@
249JROSETTA_API = @JROSETTA_API@ 250JROSETTA_API = @JROSETTA_API@
250JROSETTA_ENGINE = @JROSETTA_ENGINE@ 251JROSETTA_ENGINE = @JROSETTA_ENGINE@
252JUNIT = @JUNIT@
251LAPACK_LIBS = @LAPACK_LIBS@ 253LAPACK_LIBS = @LAPACK_LIBS@
252LD = @LD@ 254LD = @LD@
253LDFLAGS = @LDFLAGS@ 255LDFLAGS = @LDFLAGS@
@@ -304,6 +306,7 @@ PVM_ENABLE = @PVM_ENABLE@
304PVM_INCLUDE = @PVM_INCLUDE@ 306PVM_INCLUDE = @PVM_INCLUDE@
305PVM_LIB = @PVM_LIB@ 307PVM_LIB = @PVM_LIB@
306PYTHON = @PYTHON@ 308PYTHON = @PYTHON@
309QDOX = @QDOX@
307RANLIB = @RANLIB@ 310RANLIB = @RANLIB@
308RELOCATABLE = @RELOCATABLE@ 311RELOCATABLE = @RELOCATABLE@
309RT_LIB = @RT_LIB@ 312RT_LIB = @RT_LIB@
@@ -322,6 +325,7 @@ SWIG_JAVA = @SWIG_JAVA@
322SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 325SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
323TCLTK_LIBS = @TCLTK_LIBS@ 326TCLTK_LIBS = @TCLTK_LIBS@
324TCL_INC_PATH = @TCL_INC_PATH@ 327TCL_INC_PATH = @TCL_INC_PATH@
328TESTNG = @TESTNG@
325TK_INC_PATH = @TK_INC_PATH@ 329TK_INC_PATH = @TK_INC_PATH@
326UMFPACK_ENABLE = @UMFPACK_ENABLE@ 330UMFPACK_ENABLE = @UMFPACK_ENABLE@
327UMFPACK_LIB = @UMFPACK_LIB@ 331UMFPACK_LIB = @UMFPACK_LIB@